Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 ...

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

2013-01-17 09:15:37 -05:00

..

full

add end_date.html file

2013-01-14 12:23:36 -05: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

self_assessment

added gst tests for export

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

simple

Make the simple course pass roundtrip test:

2012-08-07 11:06:47 -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

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

two_toys

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

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