Andy Armstrong 4fcc59b318 Merge branch 'release' into andya/merge-hotfix-2014-08-29 ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py

2014-08-29 16:50:40 -04:00

..

__init__.py

Fix all modulestore calls to pass in user ids.

2014-07-09 21:10:12 -04:00

factories.py

Move to OpaqueKey implementations from the external library

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

helpers.py

Merge pull request #4654 from edx/db/kill-check-for-code

2014-08-07 08:28:50 -04:00

modulestore_config.py

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -04:00

test_about.py

fix shib reg from course about page

2014-07-17 10:51:32 -04:00

test_access.py

Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional

2014-07-15 16:37:00 -04: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

removing thread-local cache for branch_setting

2014-07-17 11:05:47 -04:00

test_draft_modulestore.py

get_items API: have qualifiers be a separate parameter instead of assuming kwargs.

2014-08-08 12:38:42 -04:00

test_favicon.py

tests for PR 3769

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

test_footer.py

Updating the footer for edx.org and open edx.

2014-08-25 15:33:43 +00: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

Refactor verify course id decorator and fixed tests.

2014-08-29 16:05:33 +05:00

test_masquerade.py

Move to OpaqueKey implementations from the external library

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

test_microsites.py

Separate edX / Open edX footer.

2014-07-10 14:15:37 -04: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

Merge branch 'release' into andya/merge-hotfix-2014-08-29

2014-08-29 16:50:40 -04:00

test_navigation.py

Replace check_for_get_code with assert_request_status_code

2014-08-05 13:36:49 -04:00

test_password_history.py

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

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

test_progress.py

Pep8 fixes for tests

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

test_registration_extra_vars.py

adding tests for country list in different languages

2014-08-20 15:30:17 -04: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

Fix all modulestore calls to pass in user ids.

2014-07-09 21:10:12 -04:00

test_tabs.py

Catch InvalidKeyError in static_tab view.

2014-08-07 15:41:07 +05:00

test_video_handlers.py

Use data dir from course.

2014-07-28 13:11:12 +03:00

test_video_mongo.py

Merge branch 'release'

2014-06-25 13:51:31 -04: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

Replace check_for_get_code with assert_request_status_code

2014-08-05 13:36:49 -04:00

test_views.py

Refactor verify course id decorator and fixed tests.

2014-08-29 16:05:33 +05:00

test_word_cloud.py

Introduce constants for studio_view, student_view, and author_view.

2014-06-20 11:41:23 -04:00

tests.py

get_items API: have qualifiers be a separate parameter instead of assuming kwargs.

2014-08-08 12:38:42 -04:00