Calen Pennington 531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py

2013-03-13 12:18:04 -04:00

..

features

Updated Selenium test, deleted dead code related to Advanced Settings.

2013-03-11 16:56:24 -04:00

management

Merge pull request #1586 from MITx/feature/cdodge/make-update-templates-django-admin-util

2013-03-04 13:11:46 -08:00

tests

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-13 12:18:04 -04:00

__init__.py

move call to update_templates on service startup into a django-admin command

2013-03-04 08:06:58 -05:00

course_info_model.py

Fix tests

2013-02-15 15:44:11 -05:00

module_info_model.py

Iterate over metadata items when setting module info

2013-03-11 14:32:56 -04:00

utils.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

views.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-13 12:18:04 -04:00