Andy Armstrong 7b26e85478 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:10 -04:00

..

contentstore

Asset urls must start w/ slash

2014-08-21 12:11:27 -04:00

css

STUD-2021: Fix Multiple Choice Options in Studio.

2014-08-07 12:27:23 -04:00

js

Avoid use of Array/Object constructors

2014-08-22 15:25:25 -07:00

modulestore

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

2014-08-29 16:50:10 -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 a request-token to identify which xblock html was rendered as part of the current request

2014-08-15 11:04:52 -04:00

templates

Merge pull request #4292 from terman/jsinput

2014-07-30 16:56:45 +02:00

tests

Add bulk operations to split modulestore

2014-08-27 16:29:46 -04:00

util

Move date_utils to common/djangoapps/util

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

video_module

Merge pull request #4527 from edx/oleg/xml-course-transcripts-fix

2014-07-31 10:35:44 +03: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

Minor i18n fixes prompted by translators

2014-08-14 14:58:26 -04:00

capa_module.py

Use field scopes to compute which metadata to strip from the definition during XML import of XMLModule subclasses

2014-07-17 10:35:37 -04:00

combined_open_ended_module.py

Fix small i18n typos

2014-07-22 09:38:32 -04: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

Merge pull request #4764 from edx/diana/show-cert-without-end-date

2014-08-08 15:36:39 -04: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

Fix inconsistent ui issues on discussion during blackout period

2014-08-07 19:33:40 +05:00

editing_module.py

…

error_module.py

Fix test_import and unicode issues.

2014-07-11 15:40:08 -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

Make enforce_type an optional flag, to avoid conflicts

2014-08-08 09:14:10 -07: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

Support non-ascii chars as arguments to format.

2013-12-20 14:55:07 -05:00

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

Annotation Tools: Adding Annotator to CMS

2014-08-13 21:35:37 -04:00

lti_2_util.py

Add argument.

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

lti_module.py

Fix for empty imsx_messageIdentifier

2014-08-12 08:30:33 -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

Merge pull request #2018 from edx/christina/export-bug

2013-12-27 08:34:49 -08:00

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

XML export maps keys into xml expected format

2014-08-15 16:02:48 -04:00

seq_module.py

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

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

split_test_module.py

Unflag Group Configurations, Render only existing children in staff view of split_test.

2014-08-22 16:43:54 -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

Enable pure XBlocks, but behind a feature flag

2014-01-10 11:40:03 -05:00

textannotation_module.py

Annotation Tools: Adding Annotator to CMS

2014-08-13 21:35:37 -04:00

timeinfo.py

…

vertical_module.py

Sync children vertical names with group names in split test module.

2014-08-15 19:34:55 +03:00

videoannotation_module.py

Annotation Tools: Adding Annotator to CMS

2014-08-13 21:35:37 -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

Fix test_import and unicode issues.

2014-07-11 15:40:08 -04:00

xml_module.py

XML export maps keys into xml expected format

2014-08-15 16:02:48 -04:00