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
David Ormsbee
a8d7b99743
Move verify-specific JS out of site level
2013-08-29 10:13:28 -04:00
David Ormsbee
634d207762
Make it so that auto-filling of selected price works again on confirmation screen before submitting credit card info.
2013-08-28 22:25:14 -04:00
David Ormsbee
b2141ee7c0
Add verified cert marketing link
2013-08-28 17:48:28 -04:00
Diana Huang
e7a3847e48
More validation to the free-form price text box and allow for decimal places
2013-08-28 17:43:10 -04:00
David Ormsbee
3efa803321
Fix bug where we don't re-disable a button if they uncheck that the verification pictures look good.
2013-08-28 17:27:34 -04:00
David Ormsbee
6fd86904f1
Fix bug where resetting second picture would remove the first
2013-08-28 17:21:49 -04:00
Diana Huang
6c647d7630
Return the correct data to the backend.
2013-08-28 17:06:52 -04:00
Diana Huang
4471079f71
Clean up validation of price selection. Add error messaging.
2013-08-28 16:43:09 -04:00
David Ormsbee
7af4accc50
Preserve purchase amount choice and redisplay on final verification page.
2013-08-28 15:06:58 -04:00
Brian Talbot
2f3ff4b3eb
Verification: revising markup for views
2013-08-28 12:57:13 -04:00
David Ormsbee
48484ef9e0
move suggested price listing to common include template
2013-08-28 11:28:44 -04:00
Calen Pennington
7d79f4fe37
Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi
...
[DEVPAIN-7]
2013-08-28 10:56:07 -04:00
David Ormsbee
0d67827314
Fix simple links in verification flow.
2013-08-27 19:35:46 -04:00
David Ormsbee
ee8d28dacc
Fix webcam capture for Firefox
2013-08-27 19:01:27 -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
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
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
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
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
David Ormsbee
256c112d02
re-add full user name to verify page
2013-08-27 11:20:44 -04:00
David Ormsbee
6447e02f02
Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3
...
Conflicts:
lms/templates/verify_student/photo_verification.html
2013-08-27 11:08:38 -04:00
Frances Botsford
e6bfb887c4
more cleanup on photos for vcerts
2013-08-27 11:04:34 -04:00
Frances Botsford
28db6a2fda
cleanup on the photo page for vcerts
2013-08-27 10:55:09 -04:00
Diana Huang
40393b21f7
Add in a new HTML class that represents the enrollment mode.
2013-08-27 09:42:25 -04:00
David Ormsbee
134e09b229
Remove old commented out HTML
2013-08-27 09:41:58 -04:00
David Ormsbee
6bb9360724
Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3
2013-08-27 09:05:18 -04:00
Will Daly
fe72730969
Integrate js-test-tool into testing infrastructure
2013-08-26 20:21:18 -04:00
Brian Talbot
bae9c307ef
Verification: revised semantic classes/organization - WIP
2013-08-26 19:26:28 -04:00
Brian Talbot
af8339c72d
Verification: revised Sass organization - WIP
2013-08-26 19:25:52 -04:00
Frances Botsford
e5cede572a
fixing up some styling on vcerts
2013-08-26 18:36:56 -04:00
David Ormsbee
0712464f50
Remove mock verify enrollment link
2013-08-26 16:02:56 -04:00
David Ormsbee
d8a693fb16
Fix to make the submission from verified to payment go through again.
2013-08-26 16:01:08 -04:00
David Ormsbee
0387d76610
Fix disable/enable buttons in verification workflow.
2013-08-26 15:48:05 -04:00
David Ormsbee
dd50ec4e82
Merge design and dev JS/UI for verify student
2013-08-26 15:32:40 -04:00
Diana Huang
874c6314f5
Allow users who are not logged in to register.
2013-08-26 15:29:12 -04:00
David Ormsbee
2012bb018f
Merge branch 'ormsbee/verifyuser' into ormsbee/verify2
2013-08-26 10:05:08 -04:00
David Ormsbee
0b625a6f2a
Merge branch 'ormsbee/verifyuser' into ormsbee/verify2
...
Conflicts:
lms/static/sass/views/_verification.scss
lms/templates/verify_student/photo_id_upload.html
2013-08-26 10:04:28 -04:00
Adam Palay
935ebc4e7a
remove unused registration templates
2013-08-26 10:01:03 -04:00
Frances Botsford
770ec2dbb3
adjusting the progress bar styling for vcerts
2013-08-26 09:56:04 -04:00
Felix Sun
6e64e994f6
Fixed a test broken when the mixed modulestore was introduced.
2013-08-26 09:46:29 -04:00
