cahrens 49ee903eda Merge branch 'master' into feature/btalbot/studio-checklists ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/template_loader.js

2013-03-18 15:30:19 -04:00

..

captions.html

Added new styles for html editing and removed a bunch of unused templates

2012-06-21 17:36:21 -04:00

footer.html

studio - nav and soft landing various QA fixes

2013-02-12 17:03:48 -05:00

header.html

Merge branch 'master' into feature/btalbot/studio-checklists

2013-03-18 15:30:19 -04:00

html-edit.html

Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly.

2013-01-17 13:11:47 -05:00

import-course.html

allow importing of .tar.gz packages of courseware

2012-10-12 10:33:31 -04:00

metadata-edit.html

Stop using .definition and .metadata directly

2013-01-02 15:06:43 -05:00

module-dropdown.html

Hook up link to create modules from templates

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

new-module.html

Added more styels to the section view and default section view

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

notes.html

added more style for unit page, hovers, and buttons

2012-07-03 16:19:19 -04:00

problem-edit.html

resolving merge conflict and missing Sass mixin

2013-02-15 14:10:52 -05:00

raw-edit.html

work-in-progress: As a problem author, I would like to be able to edit module metadata

2012-09-21 14:29:19 -04:00

save-captions.html

Added new styles for html editing and removed a bunch of unused templates

2012-06-21 17:36:21 -04:00

sequence-edit.html

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

source-edit.html

address Christina's comments re js in latex2edx source-edit.html

2013-02-28 04:21:43 +00:00

speed-tooltip.html

Added new styles for html editing and removed a bunch of unused templates

2012-06-21 17:36:21 -04:00

units.html

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

upload_assets.html

shimmy around the upload_asset widget to at least not mess up the edit unit rendering. Now it'll always be at the bottom

2012-09-28 11:42:11 -04:00

video-box-unused.html

bug - removed placeholdit image references in template HTML

2012-12-13 15:48:39 -05:00

video-box.html

bug - removed placeholdit image references in template HTML

2012-12-13 15:48:39 -05:00

video-edit.html

Porting latest changes from ui_prototype

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

video-new.html

Porting latest changes from ui_prototype

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