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

6123 Commits

Author SHA1 Message Date
Frances Botsford
b2ddea7a80 updated copy for vcert flow 2013-09-04 13:46:38 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Brian Talbot
b75398b0df Verification: moves common page elements/copy into central templates w/ supportive styling 2013-09-03 17:17:13 -04:00
Will Daly
a52ca3639b Initial BDD spec for certificates workflow 2013-09-03 10:46:32 -04:00
Brian Talbot
4af4b2a022 Verification: add in I8TN support for new templates 2013-09-02 22:38:08 -04: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
Adam Palay
5b0194d9b4 bump version number on calc 2013-08-30 16:59:46 -04:00
Adam Palay
589dcfcc35 change calcfunctions -> functions 2013-08-30 16:57:44 -04:00
Adam Palay
2284f56e20 specify preview import statements to reflect new package structure 2013-08-30 16:57:27 -04:00
Adam Palay
ac90679544 restructure calc 2013-08-30 16:57:10 -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
Brian Talbot
248b5a9411 Verified: visually cleans up - UI spacing, error styling, registering for badge 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
c96a29d77a Move course_id into the urls. 2013-08-30 12:56:47 -04:00
Peter Baratta
48cb05c037 Reset 'correctness' visual indicator of a problem on new input 
Affects:
Choicegroups, option inputs, textline, and formula equation inputs
 2013-08-30 12:03:41 -04:00
Diana Huang
c21cde37a0 Fix some urls on the choose mode page 2013-08-30 10:38:48 -04:00
Christina Roberts
d893e6d440 Merge pull request #827 from edx/christina/course-info-links3 
Rewriting of links for Course Updates and Course Handouts.
 2013-08-30 07:32:01 -07: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
Diana Huang
fc52fab231 Go skip verification step if student is already verified. 2013-08-29 17:07:53 -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
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
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
65f7b098dd Bulk Email: Add design styling 
Switch to using decorators; refactor and cleanup tests.
 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
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
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
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