Brian Wilson d6a74a644d Merge branch 'master' into release ...

Conflicts:
	cms/static/js/views/modals/edit_xblock.js

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

..

contentstore

Consolidate course_id triple parsing

2014-02-24 11:45:59 -05: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 pull request #3464 from mitocw/cg/course_image_fixes

2014-05-13 09:19:07 -04:00

open_ended_grading_classes

Use the correct response when using login.

2014-04-08 11:18:55 -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

add max-attempts to inheritance.py (LMS-2130)

2014-05-12 15:55:15 -04:00

util

Move date_utils to common/djangoapps/util

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

video_module

Remove unicode character inserted into video_xfields

2014-05-09 15:25:56 -04:00

__init__.py

…

abtest_module.py

…

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

…

capa_base.py

Merge pull request #1499 from edx/nick/shuffle-question

2014-04-14 22:02:14 -07: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

Converting collapsible module to JavaScript.

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

course_module.py

Certificates: URL endpoint for cert gen

2014-05-02 14:34:21 -07:00

crowdsource_hinter.py

…

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

…

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

…

foldit_module.py

…

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

Tests for raw editor and minor wording changes.

2014-04-24 14:18:13 -04:00

lti_2_util.py

lti 2.0 result service rest endpoint

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

lti_module.py

lti 2.0 result service rest endpoint

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

mako_module.py

…

peer_grading_module.py

Make GradingServices always return dictionaries, rather than sometimes returning strings

2014-04-01 14:04:16 -04:00

poll_module.py

…

progress.py

…

randomize_module.py

…

raw_module.py

…

seq_module.py

Remove coursename from page H1, and slightly improve sequence navigation

2014-03-13 13:49:14 -04:00

split_test_module.py

Do not show "View in Studio" links for child verticals of verticals.

2014-05-02 13:36:44 -04:00

static_content.py

…

stringify.py

…

tabs.py

Support for "View Live" on Pages page.

2014-03-28 05:41:32 -04:00

template_module.py

…

templates.py

…

textannotation_module.py

Fixes from @singingwolfboy in PR #3466

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

timeinfo.py

…

vertical_module.py

Merge pull request #3229 from edx/christina/container-dnd

2014-05-06 11:09:29 -04:00

videoannotation_module.py

Fixes from @singingwolfboy in PR #3466

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

word_cloud_module.py

…

wrapper_module.py

…

x_module.py

lti 2.0 result service rest endpoint

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

xml_module.py

…