Commit Graph

6923 Commits

Author SHA1 Message Date
Brian Talbot
822caca3f7 Verified: revises styling/presentation of alerts/errors for intro state 2013-08-30 16:03:49 -04:00
Diana Huang
c9593f2094 Allow for the creation of a specialized receipt when
there is only one item in the order
2013-08-30 15:35:05 -04:00
Brian Talbot
248b5a9411 Verified: visually cleans up - UI spacing, error styling, registering for badge 2013-08-30 14:27:44 -04:00
Diana Huang
b5feb0748f Add in a hook to indicate whether or not the logged in user is active 2013-08-30 13:44:49 -04:00
Diana Huang
c96a29d77a Move course_id into the urls. 2013-08-30 12:56:47 -04:00
David Ormsbee
94def0aab5 Base assets for flash camera capture 2013-08-30 11:27:51 -04:00
David Adams
c8b2863a46 Slightly change email registration template
Added some text to guide the student to register with a particular email address.
    This is the one that was entered into the enrollment/invitation form by the instructor.
    Modified the template and associated test.
2013-08-29 15:27:30 -07:00
Diana Huang
fc52fab231 Go skip verification step if student is already verified. 2013-08-29 17:07:53 -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
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
Jason Bau
c160a189ad Bulk email - final tweaks and cleanup 2013-08-29 12:40:34 -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
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
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
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
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
1b5fde9dae Send email on purchase success. 2013-08-27 17:24:01 -04: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
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
Brian Talbot
bae9c307ef Verification: revised semantic classes/organization - WIP 2013-08-26 19:26:28 -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