Don Mitchell 3885e6cf78 Merge branch 'release' ...

Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html

2014-01-16 12:51:22 -05:00

..

management

Merge pull request #2041 from edx/feanil/transfer_students

2014-01-13 08:30:51 -08:00

migrations

Merge master in prep for merging back the hotfix changes.

2013-12-05 15:48:49 -05:00

tests

Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase

2014-01-15 12:18:47 -08: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

Replace authz fns with roles.py ones

2014-01-14 17:04:44 -05:00

forms.py

Tests + Now subclass PasswordResetForm instead of copy

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

middleware.py

add functionality to disable users

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

models.py

Response to CR 1-14

2014-01-15 00:27:14 +00:00

roles.py

Replace authz fns with roles.py ones

2014-01-14 17:04:44 -05:00

views.py

Merge branch 'release'

2014-01-16 12:51:22 -05:00