cahrens 87d904cb35 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/templates/base.html

2013-05-24 16:10:34 -04:00

..

features

Merge branch 'master' into feature/christina/metadata-ui

2013-05-24 16:10:34 -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' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-20 10:22:36 -04:00

views

Merge branch 'master' into feature/christina/metadata-ui

2013-05-24 16:10:34 -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

kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules."

2013-05-07 17:27:06 -04:00