Will Daly a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss

2014-11-13 11:16:16 -05:00

..

management

Merge pull request #5720 from edx/sanchez/avoid_event_suppression

2014-11-12 12:46:26 -05:00

migrations

Fix PEP8: E303 too many blank lines

2014-11-10 11:00:14 -08:00

tests

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-13 11:16:16 -05:00

__init__.py

Move student app from lms to common

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

admin.py

Add new enrollment message to the dashboard

2014-10-02 12:32:35 +00:00

auth.py

Fix PEP8: W391 blank line at end of file

2014-11-10 11:00:18 -08:00

forms.py

Fix PEP8: W292 no newline at end of file

2014-11-10 10:59:44 -08:00

helpers.py

Redirect users to the track selection page or ?next page when using third party auth

2014-10-28 10:28:30 -04:00

middleware.py

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

models.py

Merge pull request #5720 from edx/sanchez/avoid_event_suppression

2014-11-12 12:46:26 -05:00

roles.py

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

views.py

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-13 11:16:16 -05:00