ichuang
00710f75d2
add CAS authentication via django_cas and mods to external_auth
2013-09-04 10:56:45 -04:00
Will Daly
e94515df80
Fix for acceptance test static file issue
2013-09-03 11:36:23 -04:00
Will Daly
a52ca3639b
Initial BDD spec for certificates workflow
2013-09-03 10:46:32 -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
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
Diana Huang
fc52fab231
Go skip verification step if student is already verified.
2013-08-29 17:07:53 -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
65f7b098dd
Bulk Email: Add design styling
...
Switch to using decorators; refactor and cleanup tests.
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
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
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
David Ormsbee
7af4accc50
Preserve purchase amount choice and redisplay on final verification page.
2013-08-28 15:06:58 -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
ichuang
aedb570e9e
make edit link use static_asset_path in xmodule_modifiers.py
2013-08-27 21:39:10 -04: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
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
Diana Huang
40393b21f7
Add in a new HTML class that represents the enrollment mode.
2013-08-27 09:42:25 -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
Adam Palay
d347390c24
fix error logging for unenrolling if enrollment not found
2013-08-26 09:39:16 -04:00
Will Daly
c680dfdd40
Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests
...
Will/use mixed modulestore in tests
2013-08-23 08:38:09 -07:00
David Ormsbee
cbb259eb1f
Allow amounts specified to actually work for purchasing certificates
2013-08-23 11:07:06 -04:00
David Ormsbee
52d33c0dee
Merge branch 'master' into ormsbee/verifyuser_func
2013-08-22 17:33:20 -04:00
Diana Huang
dee127360b
Clean up models, add some error handling
2013-08-22 15:39:56 -04:00
Jason Bau
6f70c9b9ce
Adding migration to store purchased mode in PaidCourseRegistration
2013-08-22 15:39:55 -04:00
Jason Bau
5fbb12cb61
make PaidCourseRegistration mode aware
2013-08-22 15:39:55 -04:00
Jason Bau
3f9c52cd1c
Move shopping cart from session into model/db
2013-08-22 15:39:54 -04:00
Jason Bau
988a7a1fba
initial commit of shopping cart and cybersource integration
2013-08-22 15:39:54 -04:00
David Ormsbee
91fab4579b
Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func
...
Conflicts:
common/djangoapps/course_modes/models.py
lms/envs/common.py
lms/envs/dev.py
2013-08-22 14:57:34 -04:00
David Ormsbee
5422fc94ca
very stupid initial photo verification attempt save just so we can stuff into a cart
2013-08-22 14:54:29 -04:00
Will Daly
736b3e0ecd
Common djangoapps no longer access courseware; other cleanup
2013-08-22 14:08:35 -04:00
chrisndodge
0191ae9417
Merge pull request #652 from edx/feature/ichuang/import-with-no-static
...
Enable mongodb to be used as back-end for git-based authoring workflow
2013-08-22 11:05:02 -07:00
David Ormsbee
0dd5819683
basic flow from enroll mode selection to verify screen
2013-08-22 13:56:23 -04:00
JonahStanley
d96595318a
Stylistic changes
...
CMS tests should now run on IE
CMS tests will now run on Safari
Rebased wrong
Forgot to update the test_acceptance.sh
Changed way of string splitting
2013-08-22 10:08:35 -04:00
Will Daly
8165a033b1
Pep8/pylint fixes
...
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
2013-08-21 19:42:59 -04:00
Will Daly
151782acf0
LMS acceptance tests use mixed modulestore
2013-08-21 16:23:48 -04:00
David Ormsbee
1676fc31a5
Halfway state for course enrollment by mode
2013-08-21 16:21:53 -04:00
JonahStanley
21f75ff250
Various stylistic and pylint fixes / changes
...
Version numbers have very different ranges for different browsers so not having a dictionary of those.
Fixed a whitespace issue
Fixed pylint/pep8 violations
Don't need django_url
Spacing issues
Changed how commenting works
Forgot one
Used wrong name
Changed around importing
Remove django_url
Fixed function orderingn
Made logic nicer for getting a new browser
Modifying tests to run in opera
Needed to increase time to account for slow sauce loading
Now safari LMS works
Forgot an assert statement
Skipping a few tests for opera
2013-08-21 16:05:52 -04:00
JonahStanley
22b3f2b161
Factored out Sauce related things to one file
...
LMS was arbitrarily chosen for now.
Fixed up pylint and pep8 errors
Fixed up pylint and pep8 errors
Changed naming to be better
Changed Sauce Info to obtaining a JSON string
2013-08-21 16:05:03 -04:00
JonahStanley
35e5f4cab5
Moved global things in browser.py to functions
2013-08-21 16:05:02 -04:00
JonahStanley
0b6e62984e
Using requests instead of a HTTPConnect
2013-08-21 16:05:02 -04:00
JonahStanley
58bb6e1ea3
Changed tags to be lowercase to prevent preprocessing
...
Changed to have a default for device since it isn't always needed
Tags are more clear
Fixed stylistic issues
2013-08-21 16:05:02 -04:00
JonahStanley
ee23b9d161
Changed method of obtaining feature flags to environment variables
...
Conflicts:
common/djangoapps/terrain/browser.py
2013-08-21 16:05:02 -04:00
JonahStanley
9fb0529036
Sauce can only connect on certain ports
2013-08-21 16:05:02 -04:00
JonahStanley
3cf8083717
Upgraded selenium version for sauce
2013-08-21 16:05:01 -04:00
JonahStanley
2812b9cd5c
Fixed how config was obtained
...
Added comment about the feature
2013-08-21 16:05:01 -04:00
