Calen Pennington d4280e8529 Fix merge conflicts

2014-05-16 14:10:50 -04:00

..

__init__.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

modulestore_config.py

Studio ModuleStoreTestCase subclasses now use randomized Mongo

2013-08-27 12:57:14 -04:00

test_contentstore.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_core_caching.py

fixed asset search query.

2014-05-09 10:28:34 -04:00

test_course_listing.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_course_settings.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_crud.py

Make Locators comply with UsageKey accessors

2014-05-12 15:35:54 -04:00

test_export_git.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_i18n.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_import_draft_order.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_import_pure_xblock.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_import.py

Fix cms tests after merge from master

2014-05-13 16:33:14 -04:00

test_orphan.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_permissions.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_request_event.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

test_transcripts_utils.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_users_default_role.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_utils.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

tests.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

utils.py

Fix merge conflicts

2014-05-16 14:10:50 -04:00