Diana Huang
|
37d906e4db
|
Add the ability to set expiration dates on course modes.
|
2013-09-25 16:15:42 -04:00 |
|
Diana Huang
|
b597cdfdae
|
If user has previously selected a price, show it on the choose page
|
2013-09-10 14:35:57 -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 |
|
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 |
|
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
|
0dd5819683
|
basic flow from enroll mode selection to verify screen
|
2013-08-22 13:56:23 -04:00 |
|
David Ormsbee
|
1676fc31a5
|
Halfway state for course enrollment by mode
|
2013-08-21 16:21:53 -04:00 |
|
Diana Huang
|
bd4cc448af
|
Clean up models, add some error handling
|
2013-08-21 15:55:30 -04:00 |
|
Jason Bau
|
efbb439cb5
|
Adding migration to store purchased mode in PaidCourseRegistration
|
2013-08-21 13:14:22 -04:00 |
|
Jason Bau
|
65f2814d73
|
make PaidCourseRegistration mode aware
|
2013-08-21 13:14:22 -04:00 |
|
Diana Huang
|
70e1c70e4f
|
Move course modes to common and enable in Studio
|
2013-08-21 09:59:15 -04:00 |
|