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

17223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
2ed66ce7a5 Updated acceptance tests to match new behavior in video captions. 2013-08-30 16:17:01 -04:00
Vik Paruchuri
df03b09136 Merge pull request #824 from edx/fix/vik/oe-progress 
Properly display student progress
 2013-08-29 14:39:11 -07:00
Vik Paruchuri
9b57ef0b54 Pep8 fixes 2013-08-29 17:28:14 -04:00
Vik Paruchuri
a06226aad6 Address review comments 2013-08-29 16:34:17 -04:00
Will Daly
fc5a24dfc0 Merge pull request #801 from edx/will/remove-test-network-calls 
Remove network calls in test suite
 2013-08-29 11:42:19 -07:00
Sarina Canelake
0142fafe7e Merge pull request #555 from edx/feature/kluo/bulk-email-squashed 
Course email for instructors
 2013-08-29 10:44:09 -07:00
Jason Bau
c160a189ad Bulk email - final tweaks and cleanup 2013-08-29 12:40:34 -04:00
Brian Wilson
8f93051d30 Add editable templates for bulk email 
Adds the edX Marketing-approved template as html default.
 2013-08-29 12:40:34 -04:00
Jason Bau
d341d6d26d Change optout to use user.id instead of email. 
Includes Data + Schema migrations for optout email -> user.id change.
Note that migrations should be reversible.
 2013-08-29 12:40:33 -04:00
Sarina Canelake
52d9320e62 Hide "Email Settings" from student dash if bulk email not enabled 
Some minor pep8 cleanup
 2013-08-29 12:40:33 -04:00
Sarina Canelake
e6bde93837 Change bulk email model field names and add migrations 2013-08-29 12:40:33 -04:00
Sarina Canelake
b3bc4023b0 Refactor html->plaintext conversion (for bulk email) into separate library 2013-08-29 12:40:33 -04:00
Sarina Canelake
f98d6764b2 Disable bulk email for XML-backed courses 2013-08-29 12:40:32 -04:00
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
Vik Paruchuri
940a337dd3 Properly display student progress 2013-08-29 12:14:30 -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