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

..

__init__.py

Make tests pass when running on cms

2012-06-18 13:21:06 -04:00

cache.py

Separate caches per-domain-name

2012-08-22 13:18:33 -04:00

converters.py

Grading mostly working

2012-12-10 16:32:33 -05:00

json_request.py

move the underscore tempaltes to /static/client-templates and update the references

2012-12-10 10:01:08 -05:00

memcache.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

models.py

Make tests pass when running on cms

2012-06-18 13:21:06 -04:00

tests.py

Make tests pass when running on cms

2012-06-18 13:21:06 -04:00

views.py

more info

2012-09-21 17:49:10 -04:00