Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

10211 Commits

Author SHA1 Message Date
David Ormsbee
aecaff2097 Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3 
Conflicts:
	lms/templates/verify_student/photo_verification.html
 2013-09-02 22:39:52 -04:00
Brian Talbot
4af4b2a022 Verification: add in I8TN support for new templates 2013-09-02 22:38:08 -04:00
David Ormsbee
a643e25591 Image capture support for non WebRTC compliant browsers, via Flash. 2013-09-02 22:16:51 -04:00
Brian Talbot
c77deeecff Verification: removes physical sizes from HTML templates and adds placeholder hooks 2013-09-02 21:42:51 -04:00
Brian Talbot
39d7534246 Verification: adds in progress styling support based on body classes 2013-09-02 21:20:02 -04:00
Will Daly
1f2f0bf348 Skip acceptance test DB migrations if the DB already exists and running fasttest_acceptance 2013-09-02 09:58:08 -04:00
Jason Bau
b0f9fd0df5 Add link in lms legacy instructor dashboard to cms course_index 
A one-click way of getting to editing the course
 2013-08-31 01:07:34 -07:00
Sarina Canelake
6defd7baf1 Merge pull request #790 from edx/unanswered-on-input 
Unanswered on input
 2013-08-30 14:25:21 -07:00
Peter Baratta
fe47dcb122 Acceptance tests for visual correctness reset feature 2013-08-30 17:24:33 -04:00
Jason Bau
b7e8af65be Merge pull request #841 from edx/jbau/bulk-email-faster-tests 
Jbau/bulk email faster tests
 2013-08-30 14:12:12 -07:00
Jason Bau
4f9e5109f0 remove vestigal references to fake_smtp_server 2013-08-30 13:46:04 -07:00
Jason Bau
ca33a1dcf5 using mocks to make test_err_handling.py faster 2013-08-30 13:43:42 -07:00
Brian Talbot
1f60d018a6 Verified: resolves requirements page layout regression 2013-08-30 16:16:27 -04:00
Calen Pennington
ea36b834c7 Merge pull request #811 from cpennington/initialize-mitxmako-at-startup 
Move mitxmako initialization to a startup module
 2013-08-30 13:10:09 -07:00
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
Brian Talbot
e9a0755e5d revises and transfers verification-only typography Sass extends 2013-08-30 14:27:44 -04:00
Diana Huang
cd479caa78 Make sure users are logged in on the verified cert path 2013-08-30 13:58:36 -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
Will Daly
f15f4fde27 Merge pull request #831 from edx/will/statsd-bulk-email 
Instrument course email for DataDog
 2013-08-30 10:15:21 -07:00
Diana Huang
c96a29d77a Move course_id into the urls. 2013-08-30 12:56:47 -04:00
dcadams
1d1fc0df98 Merge pull request #834 from edx/dcadams/fix_email_registration_template 
Small change to email registration template
 2013-08-30 09:30:39 -07:00
Will Daly
1400271b0b Instrumented course email for DataDog 2013-08-30 11:56:15 -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
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
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
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
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
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