Adam Palay d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2014-07-07 13:54:03 -04:00

..

management

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

migrations

ModulestoreEnum class.

2014-06-27 14:37:35 -04:00

tests

Merge branch 'rc/2014-07-02' into testmergemaster

2014-07-07 13:54:03 -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

auth.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

forms.py

Moved reverification windows into common

2014-01-31 22:08:08 +00:00

middleware.py

add functionality to disable users

2013-10-16 16:57:11 -04:00

models.py

Do not refund student if a certificate entry already exists for them.

2014-07-01 16:29:07 +05:00

roles.py

Don't create model objects to check the roles cache

2014-06-09 15:13:31 -04:00

views.py

Merge pull request #4171 from edx/adam/fix-lms-2773

2014-07-01 10:38:50 -04:00