Calen Pennington aff44b1f11 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-10-02 12:12:55 -04:00

..

management

Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS

2012-09-25 10:10:44 -04:00

tests

minor formatting tweaks

2012-07-27 16:08:24 -04:00

__init__.py

Initial port of templates into filesystem based storage

2012-09-25 10:10:44 -04:00

utils.py

support some simple authorization scheme to view/edit courses

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

views.py

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

2012-10-02 12:12:55 -04:00