cahrens fae8fd3841 Merge branch 'master' into feature/christina/unify-fields ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt

2013-06-13 10:55:13 -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

full

Merge branch 'master' into feature/christina/unify-fields

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

graded

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

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

graphic_slider_tool

added gst tests for import

2013-01-15 12:55:20 +02:00

open_ended

Add test for proper saving

2013-05-09 10:05:48 -04:00

self_assessment

Start to add in some more open ended module tests

2013-05-08 12:10:49 -04:00

simple

add a simple Studio walkthough to check page loads

2013-04-08 13:55:38 -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

disable export of testcenter_exam from course module (and add test).

2013-01-15 17:54:10 -05:00

test_start_date

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

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

toy

Remove the old poll module test case

2013-03-04 09:02:59 -05:00

two_toys

Load grading policy from policy/{url_name}/grading_policy.json

2012-08-21 15:00:21 -04:00

word_cloud

removes unnecesary images

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