Don Mitchell a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings ...

Conflicts:
	cms/djangoapps/contentstore/views.py

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

..

full

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

graded

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

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

self_assessment

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

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

simple

Make the simple course pass roundtrip test:

2012-08-07 11:06:47 -04:00

test_start_date

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

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

toy

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

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

two_toys

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

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