Sarina Canelake 2aea261d48 Merge branch 'release' ...

Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py

2014-06-10 16:59:23 -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

Implement a custom editor for the split_module.

2014-06-05 12:16:16 -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-10 16:59:23 -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

Merge branch 'release'

2014-06-10 16:59:23 -04:00

test_request_event.py

settings.MITX_FEATURES => settings.FEATURES

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

test_transcripts_utils.py

Fix to excess asset query

2014-06-09 15:13:23 -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

Implement a custom editor for the split_module.

2014-06-05 12:16:16 -04:00