Calen Pennington 240fcc1d5a Fix merge conflicts

2014-05-22 16:24:02 -04:00

..

management

fixup! Fix management commands

2014-05-21 16:20:46 -04:00

migrations

Migration for role_coursenum deprecated roles

2014-05-21 12:03:09 -04:00

tests

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

2014-05-22 10:52:00 -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

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

2014-05-22 10:52:00 -04:00

roles.py

Don't use Empty directly, let the manager handle it

2014-05-21 14:38:16 -04:00

views.py

Fix merge conflicts

2014-05-22 16:24:02 -04:00