Greg Price 0d37b4b254 Merge branch 'release' ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py

2014-06-02 15:29:40 -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

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

test_core_caching.py

Change Location, CourseLocator, etc to reference opaque-keys library

2014-05-30 20:32:38 +00:00

test_course_listing.py

Merge branch 'release'

2014-06-02 15:29:40 -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

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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

Change Location, CourseLocator, etc to reference opaque-keys library

2014-05-30 20:32:38 +00:00

test_utils.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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