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

..

features

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

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

management

Filter out the template course from the mongo modulestore get_courses function

2013-05-09 16:22:23 -04:00

tests

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

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

views

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

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

violation fixes

2013-04-12 15:27:36 -04:00

module_info_model.py

Remove system_metadata_fields.

2013-04-29 16:41:07 -04:00

utils.py

Have the draft module store actively prevent non-leaf nodes from being

2013-06-07 15:40:30 -04:00