Don Mitchell 4f32d5f34d Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor ...

Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html

2013-01-02 17:39:27 -05:00

..

models

Fixed course_info parsing bug.

2012-12-18 14:28:53 -05:00

tiny_mce

added asset button to visual editor

2012-11-20 07:19:35 -05:00

views

Generalized the grader drop down and applied to edit_subsection

2012-12-19 17:31:06 -05:00

base.js

Fix for Studio #87, plus some cleanup.

2012-12-19 16:55:39 -05:00

html-editor.js

fixed html tab; started adding upload within widget

2012-11-20 07:19:35 -05:00

main.js

Initial connection of student module with cms.

2012-07-13 11:51:32 -04:00

speed-editor.js

fixed html tab; started adding upload within widget

2012-11-20 07:19:35 -05:00

template_loader.js

add some permissions asserting

2012-12-14 16:26:15 -05:00