Chris Dodge 6b5b6342d2 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import ...

Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py

2012-10-11 12:11:48 -04:00

..

djangoapps

refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page.

2012-10-03 09:07:09 -04:00

lib

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import

2012-10-11 12:11:48 -04:00

static

wip - trigger display message when release data is different than parent release date

2012-10-08 10:43:46 -04:00

templates

Separate unit page from vertical implementation for editing

2012-10-01 15:19:35 -04:00

test

Removed accidental symlink.

2012-09-20 17:41:02 -04:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00