Adam Palay c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt

2016-01-26 11:25:41 -05:00

..

management

Merge pull request #11279 from edx/remove-old-mgmnt-commands

2016-01-26 09:23:25 -05:00

migrations

Add migrations due to field default changes from #10802.

2015-12-08 10:54:49 -05:00

tests

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-01-26 11:25:41 -05:00

__init__.py

…

admin.py

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

auth.py

Refactor auth.has_access to auth.user_has_role

2015-07-19 20:42:29 -04:00

cookies.py

Fix login/logout errors caused by unicode cookie names

2015-06-29 09:23:15 -07:00

forms.py

Allow each instance to configure restrictions on allowed email addresses

2016-01-20 11:03:30 -08:00

helpers.py

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

middleware.py

Fix PEP8: E126 continuation line over-indented

2014-11-24 20:46:44 -05:00

models.py

Update isActive column in mailchimp upon activation

2016-01-04 13:00:31 -05:00

roles.py

Fix pylint C7630 (literal used as attribute) violations

2015-11-23 15:32:54 -05:00

views.py

Revert "Merge pull request #11241 from edx/feature/credentials-phase-1"

2016-01-25 12:46:57 -05:00