Chris Dodge 03fbacd4e1 Merge branch 'cdodge/meta-data-cms-editing' of github.com:MITx/mitx into cdodge/meta-data-cms-editing ...

Conflicts:
	cms/static/coffee/src/models/module.coffee

2012-09-21 15:24:09 -04:00

..

djangoapps

Merge branch 'cdodge/meta-data-cms-editing' of github.com:MITx/mitx into cdodge/meta-data-cms-editing

2012-09-21 15:24:09 -04:00

envs

add ENABLE_DISCUSSION_SERVICE: "False" to cms config

2012-09-06 17:28:12 -04:00

static

work-in-progress: As a problem author, I would like to be able to edit module metadata

2012-09-21 14:29:19 -04:00

templates

Support editing of metadata on Sequences

2012-09-21 14:29:19 -04:00

__init__.py

Get the cms up to the point of rendering a template

2012-06-21 10:59:36 -04:00

manage.py

Fix string layout for readability

2012-06-21 10:59:45 -04:00

urls.py

Upgrading to django 1.4.

2012-08-08 11:57:15 -04:00