Adam Palay b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master ...

Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py

2015-03-19 16:30:46 -04:00

..

__init__.py

Fix Pylint: W0612(unused-variable)

2015-03-13 20:20:05 -07:00

factories.py

Remove 'pylint: disable=W0232' because we ignore this warning in pylintrc

2014-12-01 11:22:12 -05:00

helpers.py

Fix Pylint: W0201: attribute-defined-outside-init

2014-11-24 20:48:05 -05:00

test_about.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_access.py

Fix Pylint: W0613(unused-argument)

2015-02-19 19:56:51 -08:00

test_course_info.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_course_survey.py

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

test_courses.py

Remove TEST_DATA_MOCK_MODULESTORE

2015-03-17 17:21:52 -04:00

test_draft_modulestore.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_entrance_exam.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_favicon.py

tests for PR 3769

2014-06-26 10:37:58 -04:00

test_footer.py

Add missing import of override_settings to fix a broken test in courseware

2015-03-17 16:43:29 -04:00

test_grades.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_group_access.py

Fix or remove tearDown methods that don't use super.

2015-03-17 15:14:52 -04:00

test_i18n.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_lti_integration.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_masquerade.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_microsites.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_middleware.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_model_data.py

Decrease the number of inserts and updates needed by DjangoKeyValueStore

2015-03-17 10:57:13 -04:00

test_module_render.py

Make sure slashes in JSON content don't end script tags. PLAT-462

2015-03-18 21:55:36 -04:00

test_navigation.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_password_history.py

Use ngettext rather than "word(s)" for plural phrases

2014-06-17 13:25:46 -04:00

test_recommender.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_split_module.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_submitting_problems.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_tabs.py

Cleaned up milestones API references

2015-03-12 15:58:21 -04:00

test_video_handlers.py

Fix or remove tearDown methods that don't use super.

2015-03-17 15:14:52 -04:00

test_video_mongo.py

Created performance logging endpoint, changed CDN experiment to point to it.

2015-03-19 07:53:01 -04:00

test_video_xml.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_view_authentication.py

Remove unused imports

2015-03-17 07:10:31 -04:00

test_views.py

Merge pull request #7219 from edx/mjames/SOL-289

2015-03-19 09:51:36 -04:00

test_word_cloud.py

Fixing pep8 issues

2014-12-11 13:04:49 -05:00

tests.py

Remove unused imports

2015-03-17 07:10:31 -04:00