Diana Huang 47ce9082e4 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py

2013-09-13 17:15:44 -04:00

..

conditional

cleaned up conditional module a bit; add test for conditional module

2013-02-03 20:59:05 -05:00

conditional_and_poll

fix test_conditional, add new conditional to "conditional_and_poll" test course

2013-03-06 19:52:18 +02:00

due_date

Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format.

2013-09-12 14:30:00 -04:00

embedded_python

Computed answers are run through safe_exec.

2013-05-06 10:55:04 -04:00

graded

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

graphic_slider_tool

Remove traling commas to make json valid

2013-06-25 22:34:36 -04:00

open_ended

Fix linking problem for peer grading, add in a test

2013-09-13 11:09:06 -04:00

open_ended_nopath

Address review comments

2013-09-13 11:06:40 -04:00

self_assessment

Remove traling commas to make json valid

2013-06-25 22:34:36 -04:00

simple

fix up some of the test courses which had hardcoded that quot; escaping

2013-07-12 11:33:46 -04:00

simple_with_draft

add new test data with draft content

2013-08-22 08:57:10 -04:00

splitmongo_json

xblock fields persist w/o breaking by scope

2013-08-16 10:42:52 -04:00

test_about_blob_end_date

On course about page, display course end date if no about page HTML blog (end_date.html) exists.

2013-04-04 15:30:34 -04:00

test_end

On course about page, display course end date if no about page HTML blog (end_date.html) exists.

2013-04-04 15:30:34 -04:00

test_exam_registration

fix up some of the test courses which had hardcoded that quot; escaping

2013-07-12 11:33:46 -04:00

test_import_course

add sample tabs to test_import_course

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

test_start_date

fix up some of the test courses which had hardcoded that quot; escaping

2013-07-12 11:33:46 -04:00

toy

Add a checklist example to test course for import/export roundtrip.

2013-09-12 09:58:07 -04:00

two_toys

fix up some of the test courses which had hardcoded that quot; escaping

2013-07-12 11:33:46 -04:00

uploads

Updated acceptance tests to match new behavior in video captions.

2013-08-30 16:17:01 -04:00

word_cloud

removes unnecesary images

2013-05-13 14:44:10 +03:00