Chris Dodge 322c4c0ba6 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html

2012-10-04 11:03:37 -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

header.html

fixed header styles

2012-10-01 16:11:04 -04:00

html-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

metadata-edit.html

Define 'system metadata' which should not be editable by the end user. When posting back metadata edits, we need to fetch a copy of the existing metadata and apply the changes.

2012-09-24 16:54:46 -04:00

module-dropdown.html

Hook up link to create modules from templates

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

navigation.html

Remove drag-and-drop handles from navigation until we actually are going to enable them

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

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

Support editing of metadata on Sequences

2012-09-21 14:29:19 -04: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

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page

2012-10-04 11:03:37 -04: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

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

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

video-box.html

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

2012-06-21 17:36:21 -04: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