Calen Pennington cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html

2014-05-22 10:52:00 -04:00

..

tabs

BLD-1000: Download handout.

2014-04-22 21:44:36 +03:00

video

Add multiple transcripts editor.

2014-03-31 18:49:56 +03:00

_ui-dnd-indicator-after.html

Cleanup to drag and drop implementation.

2013-10-07 17:18:40 -04:00

_ui-dnd-indicator-before.html

Cleanup to drag and drop implementation.

2013-10-07 17:18:40 -04:00

_ui-dnd-indicator-initial.html

Cleanup to drag and drop implementation.

2013-10-07 17:18:40 -04:00

footer.html

Studio/LMS: Updates copyright notices to 2014

2014-01-13 19:59:24 -05:00

header.html

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-19 09:20:08 -04:00

html-edit.html

Add support for raw HTML editor.

2014-04-24 14:18:12 -04:00

metadata-edit.html

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

metadata-only-edit.html

make discussion module use MetadataOnlyEditingDescriptor which will not present a code edit region and only display the metadata editor

2013-03-15 22:43:20 -04:00

open-ended-edit.html

Continue merge.

2013-05-27 20:28:56 -04:00

problem-edit.html

Indicate LaTex problems with a specific class on the editor

2014-04-09 13:33:01 -04:00

qualaroo.html

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

raw-edit.html

removed extra section heading in settings DOM, placed settings after editor

2013-05-10 13:18:43 -04:00

segment-io.html

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

sequence-edit.html

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

sock.html

Updated tests for online help

2014-05-16 21:27:57 -04:00

source-edit.html

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

tabs-aggregator.html

Convert Video Alpha to metadata-only.

2013-08-06 13:23:33 -04:00

tender.html

Fix up Tender load order

2013-10-16 17:25:58 -04:00

units.html

Merge remote-tracking branch 'edx/master' into opaque-keys

2014-05-22 10:52:00 -04:00