Chris Dodge 87ff18dc56 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

2012-11-07 09:35:21 -05:00

..

djangoapps

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

2012-11-07 09:35:21 -05:00

lib

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

2012-11-07 09:35:21 -05:00

static

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-02 11:09:19 -04:00

templates

Separate unit page from vertical implementation for editing

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

test

add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.

2012-11-01 15:08:26 -04:00

xml_cleanup.py

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

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