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

..

management

Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi

2013-08-28 10:56:07 -04:00

migrations

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

tests

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

__init__.py

Move student app from lms to common

2012-07-13 11:51:32 -04:00

admin.py

Limit the rate of logins.

2013-08-02 11:23:59 -04:00

forms.py

Tests + Now subclass PasswordResetForm instead of copy

2013-06-24 11:54:31 -07:00

models.py

fix error logging for unenrolling if enrollment not found

2013-08-26 09:39:16 -04:00

views.py

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -04:00