Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,208 Commits 1 Branch 0 Tags
65f7b098dd38775efbb5bfab64edb25bcdf2dbff
Commit Graph

17208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
65f7b098dd Bulk Email: Add design styling 
Switch to using decorators; refactor and cleanup tests.
 2013-08-29 12:40:32 -04:00
Kevin Luo
3b32d4216c Add delay to course bulk email task and use SITE_NAME for site url 
Delay for possible race condition with fetching course email object.
 Use settings.SITE_NAME for host name to generate email footer url.
 2013-08-29 12:40:32 -04:00
Kevin Luo
3ea2b24b98 Add HTML editor for authoring bulk email message (adopted from CMS) 2013-08-29 12:40:32 -04:00
Kevin Luo
907bf6e1b7 Add bulk email feature for instructors, with optout option 
Adds a new Email link to the instructor dashboard for frontend interface to send
email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this.
Creates a new djangoapp bulk_email that handles this action by getting the recipient
list and batching the emails to different celery tasks to do the actual sending.
Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by
retrying or falling through to the next email. Adds the option to opt out of course
specific emails in the user dashboard with an Email Settings link for each course.
Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL
specifies the from address for email. EMAILS_PER_TASK specifies the number of emails
each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER,
EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings.

Co-authored-by: Akshay Jagadeesh <akjags@gmail.com>
 2013-08-29 12:40:31 -04:00
Will Daly
bfca803b27 Merge pull request #818 from edx/will/cms-js-fixtures-dir 
Studio JS fixture files no longer need individual symlinks
 2013-08-29 08:37:15 -07:00
Will Daly
23805ca52f Studio JS fixture files no longer need individual symlinks 2013-08-29 07:50:28 -04:00
Ned Batchelder
547d441954 Merge pull request #821 from edx/ned/fix-the-requirements-in-the-sandbox-instructions 
Fix the requirements in the sandbox instructions
 2013-08-28 13:29:47 -07:00
Ned Batchelder
30cf0b57e6 Fix the requirements in the sandbox instructions 2013-08-28 16:04:43 -04:00
Valera Rozuvan
869d09220c Merge pull request #771 from edx/valera/fix_empty_captions_panel_no_captions 
Valera/fix empty captions panel no captions
 2013-08-28 07:24:56 -07:00
Valera Rozuvan
0a110b672d Using native Jasmine-jQuery method to check for hidden el. 2013-08-28 17:23:42 +03:00
Valera Rozuvan
33fa1e2c7f Applying code changes as suggested by Anton. 
Fixed 2 failing Jasmine tests. Removed unnecessary console.log() call.
Initializing of variables in a single var statement.
 2013-08-28 17:15:52 +03:00
Valera Rozuvan
2a4f7f61c5 Remove caption panel when anything bad happens. 
Now the captions panel will be shown with captions only after successful
retrieval of captions.
 2013-08-28 17:01:02 +03:00
Valera Rozuvan
ba954ff164 Fixing code as per suggestions on PR 771. 2013-08-28 17:01:02 +03:00
Valera Rozuvan
e788d6ce37 Added Jasmine test for bug fix. Updated comments. 2013-08-28 17:01:02 +03:00
Valera Rozuvan
4936b5044b Fix for bug BLD-277 
"There is a white panel over a non-youtube video."
When the captions file is not specified, we simply do not render the captions panel.
 2013-08-28 17:01:02 +03:00
Ned Batchelder
3194e54400 Merge pull request #805 from edx/ned/fix-allow-comments-in-capa-xml 
Keep comments in capa XML from causing failures
 2013-08-28 06:58:51 -07:00
chrisndodge
77abfbf41e Merge pull request #813 from edx/bugfix/ichuang/course-tabs-None 
bugfix: Course static_tabs importing with display_name = "None"
 2013-08-27 18:21:27 -07:00
ichuang
493d8d26e5 add sample tabs to test_import_course 2013-08-27 20:04:55 -04:00
ichuang
4a706641f2 add test for tab names importing correctly 2013-08-27 20:03:35 -04:00
ichuang
d8345b4b39 fix course tabs from being imported with display_name=None due to overwriting policy 2013-08-27 19:39:40 -04:00
Diana Huang
4fbf23b66a Merge pull request #810 from edx/diana/email-receipt 
Email Receipts and Billing Information
 2013-08-27 14:48:06 -07:00
Diana Huang
1b5fde9dae Send email on purchase success. 2013-08-27 17:24:01 -04:00
Will Daly
4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed 
Integrate js-test-tool into testing infrastructure
 2013-08-27 14:09:13 -07:00
Jay Zoldak
4e7885a2a2 Merge pull request #747 from edx/zoldak/fix-pylint-nose-tools 
Disable pylint violation E0611 when importing assert_* from nose.tools
 2013-08-27 14:00:43 -07:00
Jay Zoldak
c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools 
Cleaned up files with muliline imports

Cleaned up files that do not use these imports

Misread comment
 2013-08-27 16:21:33 -04:00
chrisndodge
e3810b7576 Merge pull request #799 from edx/fix/ichuang/inheritance-needs-videosequence 
FIX: videosequence was not inheriting metadata, eg start date
 2013-08-27 13:07:58 -07:00
Calen Pennington
42571b9319 Merge pull request #802 from cpennington/run-failed-tests 
Teach rake test tasks how to re-run failed tests
 2013-08-27 12:53:40 -07:00
Diana Huang
d7225f026a Only store certain bits of information behind a flag. 2013-08-27 15:19:58 -04:00
Calen Pennington
4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup 
One time startup centralization
 2013-08-27 12:19:42 -07:00
Will Daly
88b28ae0b6 Merge pull request #808 from edx/will/randomize-cms-mongo-collections 
Use randomized mongo collection names in Studio tests
 2013-08-27 10:58:49 -07:00
Felix Sun
b5e1d57e28 Merge pull request #442 from edx/felix/formula-hints 
Crowdsourced Hints - "0.2 release"
 2013-08-27 10:26:25 -07:00
Will Daly
e50a2414b2 Studio ModuleStoreTestCase subclasses now use randomized Mongo 
collection names
 2013-08-27 12:57:14 -04:00
Will Daly
02cb0b487d Merge pull request #795 from edx/will/silence-doc-warnings 
Silence doc test errors/warnings
 2013-08-27 09:47:20 -07:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
Ned Batchelder
2c544cb0bd A test that our XML-comments fix works. 2013-08-27 11:44:41 -04:00
Ned Batchelder
ca7c002ca9 Keep comments in capa XML from causing failures 
Comments (and processing instructions!) are handled oddly in lxml.
This change will keep them from causing failures.  They will be omitted
from the HTML generated, which is fine, since they aren't needed there.
 2013-08-27 11:08:22 -04:00
Julian Arni
cee44501f5 Merge remote-tracking branch 'origin/release' 
Contains hotfix/2013-18-21
 2013-08-27 11:05:13 -04:00
Vik Paruchuri
0e4b114278 Merge pull request #633 from edx/fix/vik/oe-state 
Fix/vik/oe state
 2013-08-27 07:01:32 -07:00
Felix Sun
444f51d6de Fixed some pep/pylint violations. 2013-08-27 09:46:02 -04:00
Calen Pennington
e7626d2d84 Teach rake test tasks how to re-run failed tests 2013-08-27 09:43:30 -04:00
polesye
7d9607f0bd Merge pull request #800 from edx/anton/replace_subtitles_with_timed_transcript 
Video Player: replace the description in the studio editing module for "subtitles" with "timed transcript"
 2013-08-27 05:42:22 -07:00
Anton Stupak
dd9b16c2cf Replace the description in the studio editing module. 2013-08-27 15:22:47 +03:00
ichuang
83f8b033ea fix common/lib/xmodule/xmodule/modulestore/mongo/base.py 2013-08-26 20:23:11 -04:00
ichuang
4d73961a44 'videosequence' and 'proctor' need to be in inheritable moduletypes in 
modulestore/mongo/base.py
 2013-08-26 20:22:25 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Adam
4cb7863074 Merge pull request #786 from edx/adam/turn-off-password-autocomplete 
Adam/turn off password autocomplete
 2013-08-26 14:42:05 -07:00
Will Daly
12cf060ba7 Silence doc test errors/warnings 2013-08-26 15:57:58 -04:00
Vik Paruchuri
3c55a44b6b Address review comments 2013-08-26 10:36:24 -04:00
Sarina Canelake
a374fceb77 Merge pull request #791 from edx/sarina/rake_coverage_combined 
Add combined coverage to `rake coverage`
 2013-08-26 07:24:46 -07:00
Sarina Canelake
269857010c Merge pull request #789 from edx/sarina/pep8_ignore_migrations 
Change `rake pep8` to ignore migrations files
 2013-08-26 07:17:52 -07:00