Vik Paruchuri 915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-07-18 11:55:37 -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

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

Add test for incrementing student attempts

2013-06-28 14:10:17 -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

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_start_date

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

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

toy

remove the video from the toy course for now as the import-export-import isn't totally equivalence.

2013-07-18 10:35:50 -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

CMS now refactored to use world dictionary

2013-07-12 10:32:48 -04:00

word_cloud

removes unnecesary images

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