Don Mitchell 3885e6cf78 Merge branch 'release' ...

Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html

2014-01-16 12:51:22 -05:00

..

contentstore

Add sorting to Studio's Files & Uploads page

2014-01-08 10:35:40 -05:00

css

BLD-541: Fix video controls on iPad.

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

js

BLD-434: Add fix for negative exponents.

2014-01-15 13:17:05 +02:00

modulestore

Encode periods and $ in block_id map

2014-01-14 14:43:31 -05:00

open_ended_grading_classes

JSON serialization error fixed and added test for it.

2014-01-15 19:47:45 +05:00

templates

Fix typo in the announcement template

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

tests

JSON serialization error fixed and added test for it.

2014-01-15 19:47:45 +05: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_module.py

Add individual due dates feature.

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

combined_open_ended_module.py

Add individual due dates feature.

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

conditional_module.py

Use XBlock xml serialization and deserialization

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

course_module.py

Use XBlock xml serialization and deserialization

2014-01-14 13:28:47 -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

Use XBlock xml serialization and deserialization

2014-01-14 13:28:47 -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

Change default start date for About pages

2014-01-15 14:10:55 -05:00

lti_module.py

Add better messaging, turn off SSL verification when sending grade back.

2013-12-27 09:59:21 +02:00

mako_module.py

Use XBlock 0.3

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

peer_grading_module.py

Use XBlock xml serialization and deserialization

2014-01-14 13:28:47 -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

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

Use XBlock xml serialization and deserialization

2014-01-14 13:28:47 -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

Use XBlock xml serialization and deserialization

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

xml_module.py

Use XBlock xml serialization and deserialization

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