Feanil Patel 5e5c59cab2 Merge remote-tracking branch 'origin/release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.

2014-02-03 16:39:40 -05:00

..

contentstore

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

css

BLD-541: Fix video controls on iPad.

2013-12-24 14:59:20 +02:00

js

Merge pull request #2343 from edx/dstgermain/a11y-page-titles

2014-01-30 14:33:48 -08:00

modulestore

Merge remote-tracking branch 'origin/release'

2014-02-03 16:39:40 -05:00

open_ended_grading_classes

If unable to send submission to grader store it instead.

2014-01-28 17:57:16 +05:00

templates

Fix typo in the announcement template

2014-01-14 18:33:56 -05:00

tests

Merge pull request #2137 from abdoosh00/feature/unicode

2014-01-31 06:48:01 -08:00

util

Add individual due dates feature.

2014-01-14 10:19:02 -05:00

__init__.py

…

abtest_module.py

Use XBlock xml serialization and deserialization

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

annotatable_module.py

Move xmodule_runtime.xmodule_instance registration earlier

2013-11-20 10:15:09 -05:00

backcompat_module.py

Use XBlock xml serialization and deserialization

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

capa_base.py

For capa if weight is 0 don't try to create Progress objects.

2014-01-31 14:30:51 +05:00

capa_module.py

Translate strings in xmodule/capa_*.py

2014-01-17 15:01:59 -05:00

combined_open_ended_module.py

Removed ice.min.js and removed piping code

2014-01-15 14:06:19 -08:00

conditional_module.py

Fix pylint violations from #2129

2014-01-15 11:05:56 -05:00

course_module.py

i18n xmodule/course_module.py

2014-01-23 15:05:05 -05:00

crowdsource_hinter.py

Use XBlock xml serialization and deserialization

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

discussion_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

editing_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

error_module.py

Clean up strings in the ErrorModule

2014-02-03 11:56:10 -05:00

errortracker.py

…

exceptions.py

Revert "Add custom LTI exception."

2013-09-09 19:30:44 +03:00

fields.py

Fix typos.

2013-10-23 13:06:13 +03:00

foldit_module.py

Add individual due dates feature.

2014-01-14 10:19:02 -05:00

graders.py

Update logging.getLogger() calls to use edx instead of mitx

2013-12-04 15:18:15 -05:00

gst_module.py

Support non-ascii chars as arguments to format.

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

hidden_module.py

hidden-module-unicode: Return unicode string to pass assertion

2013-11-14 13:57:08 +01:00

html_checker.py

…

html_module.py

Detached categories don't access control on date

2014-01-17 17:53:14 -05:00

lti_module.py

Add role parameter to LTI. BLD-583.

2014-01-30 14:37:33 +02:00

mako_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

peer_grading_module.py

Really large posts to ORA like peer grading feedback fixed.

2014-01-28 15:50:16 +05:00

poll_module.py

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

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

progress.py

Blank common and advanced problems now display an inline score of '0 points' upon creation.

2013-07-24 16:44:22 -04:00

randomize_module.py

Update logging.getLogger() calls to use edx instead of mitx

2013-12-04 15:18:15 -05:00

raw_module.py

Support non-ascii chars as arguments to format.

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

seq_module.py

Use XBlock xml serialization and deserialization

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

static_content.py

BLD-502: Add improvements to Video player.

2013-11-15 18:12:51 +02:00

stringify.py

…

template_module.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00

templates.py

Enable pure XBlocks, but behind a feature flag

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

textannotation_module.py

annotation tools

2014-01-27 13:47:58 -05:00

timeinfo.py

fix crash in peer eval xmodule

2013-07-31 13:31:25 -07:00

vertical_module.py

Move xmodule_runtime.xmodule_instance registration earlier

2013-11-20 10:15:09 -05:00

video_module.py

Fix speed persistence per video.

2014-01-29 16:49:39 +02:00

videoannotation_module.py

annotation tools

2014-01-27 13:47:58 -05:00

word_cloud_module.py

Removed logme module. Using console.log() instead.

2013-12-20 16:25:44 +02:00

wrapper_module.py

…

x_module.py

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

xml_module.py

Fix pylint violations from #2129

2014-01-15 11:05:56 -05:00