Nimisha Asthagiri 8855b12b76 Update tests to allow LMS tests to use published branch setting. ...

Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py

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

..

contentstore

Allow to_deprecated_string to do its magic

2014-07-07 17:48:46 -04:00

css

Add Studio handling for changes to group configurations

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

js

Fix saving error of video editor in non-english translation

2014-06-27 14:08:44 +08:00

modulestore

Update tests to allow LMS tests to use published branch setting.

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

open_ended_grading_classes

Move to OpaqueKey implementations from the external library

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

partitions

Bugfix for split test on sequential save

2014-03-11 10:51:39 -04:00

public/js

Add Studio handling for changes to group configurations

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

templates

Fixes spelling of Michigan in template.

2014-06-05 14:07:03 -04:00

tests

Merge pull request #4206 from edx/oleg/lti-xmlns-test

2014-06-27 11:28:27 +03:00

util

Move date_utils to common/djangoapps/util

2014-02-18 17:35:56 -05:00

video_module

Fix all modulestore calls to pass in user ids.

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

__init__.py

…

abtest_module.py

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

2014-05-08 20:28:53 -04:00

annotatable_module.py

i18n: More extractable & localizable strings in xmodules

2014-05-26 15:30:01 +08:00

annotator_mixin.py

Annotation Tool: PR #4019

2014-06-11 10:21:08 -04:00

annotator_token.py

Image Annotation Tool: Add linkback functionality to image thumbnails

2014-05-23 14:59:31 -04:00

backcompat_module.py

Use XBlock xml serialization and deserialization

2014-01-14 13:28:47 -05:00

capa_base.py

Do not print exception message below stacktrace

2014-06-19 12:19:21 +03:00

capa_module.py

Temporarily disable CAPA problem "Check" button.

2014-04-07 13:17:43 -04:00

combined_open_ended_module.py

i18n: More extractable & localizable strings in xmodules

2014-05-26 15:30:01 +08:00

conditional_module.py

Introduce constants for studio_view, student_view, and author_view.

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

course_module.py

Missing "_()" in course_module.py

2014-07-03 10:55:00 +08:00

crowdsource_hinter.py

Introduce constants for studio_view, student_view, and author_view.

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

discussion_module.py

i18n: Make static strings in xmodule files extractable

2014-05-23 01:58:19 +08:00

editing_module.py

…

error_module.py

Enable Mixed Modulestore STUD-1540

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

errortracker.py

…

exceptions.py

Refactor heartbeat to delegate to the modulestores and sql

2014-06-16 13:16:32 -04:00

fields.py

Persist student progress in video.

2014-02-11 13:53:24 +00:00

foldit_module.py

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

2014-05-08 20:28:53 -04:00

graders.py

Increases precision of percentages shown in 'Total' bar on the progress page.

2014-03-03 19:03:47 +05:00

gst_module.py

…

hidden_module.py

…

html_checker.py

…

html_module.py

i18n: More extractable & localizable strings in xmodules

2014-05-26 15:30:01 +08:00

imageannotation_module.py

Merge branch 'release'

2014-06-11 21:30:05 -04:00

lti_2_util.py

Add argument.

2014-06-11 11:41:03 +03:00

lti_module.py

Merge remote-tracking branch 'edx/master' into ok-merge-from-master

2014-05-23 10:05:56 -04:00

mako_module.py

…

peer_grading_module.py

i18n: More extractable & localizable strings in xmodules

2014-05-26 15:30:01 +08:00

poll_module.py

…

progress.py

…

randomize_module.py

Introduce constants for studio_view, student_view, and author_view.

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

raw_module.py

…

seq_module.py

Display names, help text, and "deprecated" for Advanced Settings.

2014-06-26 16:54:22 -04:00

split_test_module.py

Fix all modulestore calls to pass in user ids.

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

static_content.py

…

stringify.py

…

studio_editable.py

Introduce constants for studio_view, student_view, and author_view.

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

tabs.py

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

2014-05-08 20:28:53 -04:00

template_module.py

…

templates.py

…

textannotation_module.py

Merge branch 'release'

2014-06-11 21:30:05 -04:00

timeinfo.py

…

vertical_module.py

Introduce constants for studio_view, student_view, and author_view.

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

videoannotation_module.py

Annotations Tools: i18n Make stati strings extractable

2014-06-11 10:23:45 -04:00

word_cloud_module.py

i18n: Make static strings in xmodule files extractable

2014-05-23 01:58:19 +08:00

wrapper_module.py

Allow editing of container xblocks/xmodules

2014-05-29 14:02:45 -04:00

x_module.py

Redirect Chinese students to a Chinese CDN for video.

2014-06-24 18:39:52 +03:00

xml_module.py

Enable Mixed Modulestore STUD-1540

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