Diana Huang
fc52fab231
Go skip verification step if student is already verified.
2013-08-29 17:07:53 -04:00
Brian Talbot
992b36e771
Verified: adds initial registration choice error styling
2013-08-29 16:57:54 -04:00
Brian Talbot
db8a810009
Verified: cleans up extraneous reg selection markup and expandable UI
2013-08-29 16:45:23 -04:00
Vik Paruchuri
a06226aad6
Address review comments
2013-08-29 16:34:17 -04:00
David Ormsbee
8c107569e9
Fix cart submission
2013-08-29 16:30:53 -04:00
David Ormsbee
70a594597c
re-enable link to audit
2013-08-29 15:32:53 -04:00
David Ormsbee
d2292738d6
Update contribution partial template with new style changes.
2013-08-29 14:47:03 -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
cahrens
a061c7ece7
Rewriting of links for Course Updates and Course Handouts.
...
STUD-669.
2013-08-29 14:35:16 -04:00
David Ormsbee
5202bdf85a
Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3
...
Conflicts:
common/templates/course_modes/choose.html
lms/templates/verify_student/photo_verification.html
2013-08-29 14:34:52 -04:00
Brian Talbot
81a56a35ab
Verified: revising template UI, styling, and infrastructure
2013-08-29 14:07:51 -04:00
Brian Talbot
638fb79a16
Verification: adding in more Sass variable/mixin/extend scaffolding
2013-08-29 13:44:48 -04: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
David Ormsbee
a8d7b99743
Move verify-specific JS out of site level
2013-08-29 10:13:28 -04:00
Julian Arni
e0ab75fb84
Add support for multiple file uploads
2013-08-29 09:55:40 -04:00
Will Daly
23805ca52f
Studio JS fixture files no longer need individual symlinks
2013-08-29 07:50: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
db0af8a863
Enabled honor certificates
2013-08-28 19:21:18 -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
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
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
Adam
14708aa30b
Merge pull request #816 from edx/hotfix/xml-parsing
...
Hotfix/xml parsing
2013-08-28 09:52:48 -07:00
jkarni
fbb6dc078f
Merge pull request #819 from edx/jkarni/hotfix/gzip-mimetype
...
Check extension rather than mimetype
2013-08-28 09:52:36 -07:00
David Ormsbee
1255ea79c9
forgot to add partial template
2013-08-28 11:29:08 -04:00
David Ormsbee
48484ef9e0
move suggested price listing to common include template
2013-08-28 11:28:44 -04:00
Julian Arni
6cb2e0b206
Check extension rather than mimetype
2013-08-28 11:13:20 -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
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
Ned Batchelder
e88e04d3a6
A test that our XML-comments fix works.
2013-08-28 10:15:59 -04:00
