Calen Pennington fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt

2012-07-10 13:39: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

header.html

Added fixes for the sidebar, made better base style for inputs and brightened colors a bit

2012-07-09 10:04:19 -04:00

html-edit.html

Added more tweeks to the calendar and unit pages

2012-07-09 10:04:20 -04:00

module-dropdown.html

Get rid of comments

2012-07-09 11:08:07 -04:00

navigation.html

Merge remote-tracking branch 'origin/master' into ps-cms-backbone

2012-07-10 08:55:45 -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

Refactored the css and fixed some smaller bugs

2012-06-25 11:21:24 -04:00

problem-new.html

Porting latest changes from ui_prototype

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

raw-edit.html

Parse XModuleDescriptors on import using from_xml

2012-06-26 11:56:21 -04:00

raw-videos.html

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

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

Merge remote-tracking branch 'origin/master' into ps-cms-backbone

2012-07-10 08:55:45 -04:00

sequnce-edit.html

Live editing of html modules implemented, but no saving to the backend

2012-06-21 15:33:52 -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

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

week-edit.html

Added more styles and markup for sequence

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

week-new.html

Added more styles and markup for sequence

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