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

..

__init__.py

Moved UserPreferences to common

2014-02-14 10:32:11 -05:00

factories.py

Fix PEP8: E302 expected 2 blank lines, found 1

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

test_account_api.py

Fix PEP8: W293 blank line contains whitespace

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

test_constants.py

Clean up pep8 and pylint violations

2014-11-12 12:55:56 -05:00

test_course_tag_api.py

Move user_service into user_api/api

2014-10-14 07:38:10 -04:00

test_helpers.py

Merge pull request #5905 from edx/renzo/pep8-pylint-cleanup

2014-11-12 14:34:03 -05:00

test_middleware.py

Catch InvalidKeyError in UserTagsEventContextMiddleware.

2014-08-07 15:41:07 +05:00

test_models.py

Fix acceptance tests

2014-02-14 22:35:14 +00:00

test_profile_api.py

Fix broken profile API test

2014-10-16 10:24:00 -04:00

test_views.py

Clean up pep8 and pylint violations

2014-11-12 12:55:56 -05:00