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

..

client_templates

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

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

coffee

Grading mostly working

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

css

Remove old pre-compiled css

2012-06-21 10:59:46 -04:00

img

update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save

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

js

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

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

sass

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

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