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

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

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

factories.py

Move to OpaqueKey implementations from the external library

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

helpers.py

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

2014-05-06 10:08:32 -04:00

modulestore_config.py

Detached pages from XML courses are set to appropriate descriptor class (LMS-2094)

2014-01-30 13:52:07 -05:00

test_about.py

Move to OpaqueKey implementations from the external library

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

test_access.py

Fixed staff debug info endpoints for staff member.

2014-06-02 12:26:27 +05:00

test_course_info.py

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

2014-05-06 10:08:32 -04:00

test_courses.py

Move to OpaqueKey implementations from the external library

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

test_draft_modulestore.py

Move to OpaqueKey implementations from the external library

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

test_grades.py

Move to OpaqueKey implementations from the external library

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

test_i18n.py

Set the html language to the browser's specified language

2014-01-28 16:43:29 -05:00

test_lti_integration.py

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

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

test_masquerade.py

Move to OpaqueKey implementations from the external library

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

test_microsites.py

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

test_model_data.py

Revert StudentModule.module_state_key to field rather than computed property

2014-05-09 10:41:12 -04:00

test_module_render.py

Remove duplicates in a class list so tests aren't duplicated

2014-06-06 13:17:36 -04:00

test_navigation.py

show a friendly message for an empty course rather than an error page

2014-05-29 16:55:40 -05:00

test_password_history.py

Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets

2014-03-31 10:30:58 -04:00

test_progress.py

Pep8 fixes for tests

2013-03-05 11:53:00 -05:00

test_registration_extra_vars.py

Added validation for username and email max length.

2014-02-26 16:25:37 +05:00

test_split_module.py

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

2014-05-06 10:08:32 -04:00

test_submitting_problems.py

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

2014-05-06 10:08:32 -04:00

test_tabs.py

Move to OpaqueKey implementations from the external library

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

test_video_handlers.py

Merge branch 'release'

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

test_video_mongo.py

BLD-1049: Allow the video player to work with redirected links.

2014-06-05 09:34:54 +03:00

test_video_xml.py

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

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

test_view_authentication.py

show a friendly message for an empty course rather than an error page

2014-05-29 16:55:40 -05:00

test_views.py

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

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

test_word_cloud.py

BLD-642: Allow multiple transcripts with video.

2014-02-24 21:57:08 +02:00

tests.py

Move to OpaqueKey implementations from the external library

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