edx-platform

contentstore

fixed asset search query.

2014-05-09 10:28:34 -04:00

css

Merge pull request #3562 from caesar2164/giulio/zoom-image-firefox-bugfix

2014-05-02 09:10:21 -07:00

js

Merge branch 'master' into release

2014-05-13 11:10:48 -04:00

modulestore

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

2014-05-15 10:25:08 -04:00

open_ended_grading_classes

More missing ORA fixes.

2014-05-13 17:47:26 -04:00

partitions

Bugfix for split test on sequential save

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

public/js

Add tests and clean up A/B testing

2014-03-05 13:46:03 -05:00

templates

Merge branch 'master' into release

2014-05-13 11:10:48 -04:00

tests

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

2014-05-13 15:30:56 -04:00

util

Move date_utils to common/djangoapps/util

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

video_module

Fix merge conflicts

2014-05-15 10:25:20 -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

Converting collapsible module to JavaScript.

2014-03-11 11:28:46 +00:00

annotator_token.py

Fix comment formatting and Timezone explanation

2014-04-29 13:23:53 -04:00

backcompat_module.py

Use XBlock xml serialization and deserialization

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

capa_base.py

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

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

capa_module.py

Temporarily disable CAPA problem "Check" button.

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

combined_open_ended_module.py

Changed wording for setting up ORA question.

2014-04-01 11:12:24 +05:00

conditional_module.py

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

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

course_module.py

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

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

crowdsource_hinter.py

Enable (and test) xml export of pure XBlocks

2014-02-05 13:02:40 -05:00

discussion_module.py

in Studio, render compact placeholders for inline discussions.

2014-04-10 15:44:30 -04:00

editing_module.py

…

error_module.py

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

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

errortracker.py

…

exceptions.py

Requesting an xmodule field in wrong app context raises exception rather than assertion

2014-03-05 14:40:35 -05: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

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

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

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

lti_2_util.py

lti 2.0 result service rest endpoint

2014-04-29 12:01:12 -07:00

lti_module.py

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

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

mako_module.py

…

peer_grading_module.py

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

2014-05-08 20:28:53 -04: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

Enable (and test) xml export of pure XBlocks

2014-02-05 13:02:40 -05:00

raw_module.py

Support non-ascii chars as arguments to format.

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

seq_module.py

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

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

split_test_module.py

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

2014-05-14 10:00:16 -04:00

static_content.py

BLD-502: Add improvements to Video player.

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

stringify.py

…

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

Fixes from @singingwolfboy in PR #3466

2014-05-08 11:37:49 -04:00

timeinfo.py

…

vertical_module.py

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

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

videoannotation_module.py

Fixes from @singingwolfboy in PR #3466

2014-05-08 11:37:49 -04: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

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

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

xml_module.py

Add tests of XML exporting to test_xblock_wrappers

2014-02-07 15:50:34 -05:00