Don Mitchell 0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into ...

feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py

2012-12-11 10:55:10 -05:00

..

management

cleave xlint entry point in xml_importer.py to be separate from the import method

2012-11-26 11:05:57 -05:00

tests

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

2012-12-11 10:55:10 -05:00

__init__.py

Initial port of templates into filesystem based storage

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

course_info_model.py

Append screw up (naive python goof)

2012-11-30 10:41:10 -05:00

module_info_model.py

support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed

2012-12-07 09:45:12 -05:00

utils.py

Hopefully the course-info changes I had made w/o link destruction

2012-11-30 10:40:19 -05:00

views.py

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

2012-12-11 10:55:10 -05:00