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

..

migrations

Move course modes to common and enable in Studio

2013-08-21 09:59:15 -04:00

__init__.py

Move course modes to common and enable in Studio

2013-08-21 09:59:15 -04:00

admin.py

Move course modes to common and enable in Studio

2013-08-21 09:59:15 -04:00

models.py

Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func

2013-08-22 14:57:34 -04:00

tests.py

make PaidCourseRegistration mode aware

2013-08-21 13:14:22 -04:00

urls.py

basic flow from enroll mode selection to verify screen

2013-08-22 13:56:23 -04:00

views.py

very stupid initial photo verification attempt save just so we can stuff into a cart

2013-08-22 14:54:29 -04:00