Calen Pennington c72b0bb293 Resolve merge conflicts relative to master

2014-05-09 15:31:20 -04:00

..

__init__.py

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

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

factories.py

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

2014-05-06 10:08:32 -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

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

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

test_access.py

Don't fetch the course just to find out if the user has access to it.

2014-05-09 10:12:21 -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

Validate the args to SSCK

2014-05-09 10:26:06 -04:00

test_draft_modulestore.py

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

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

test_grades.py

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

2014-05-06 10:08:32 -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

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

test_masquerade.py

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

2014-05-06 10:08:32 -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

Resolve merge conflicts relative to master

2014-05-09 15:31:20 -04:00

test_navigation.py

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

2014-05-06 10:08:32 -04: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

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

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

test_video_handlers.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

test_video_mongo.py

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

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

test_video_xml.py

BLD-642: Allow multiple transcripts with video.

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

test_view_authentication.py

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

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

test_views.py

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

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

test_word_cloud.py

BLD-642: Allow multiple transcripts with video.

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

tests.py

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

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