Calen Pennington 155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py

2014-05-09 15:29:32 -04:00

..

mock

Update unit test based on changes in master.

2014-05-02 15:09:25 -04:00

video

Update Video component UI text

2014-05-09 12:37:28 -04:00

advanced_entry.underscore

Load advanced_entry template on page, rather than via AJAX

2013-07-29 14:28:40 -04:00

asset-library.underscore

Internal/External Studio file URLs

2014-02-24 11:54:09 -08:00

asset.underscore

Internal/External Studio file URLs

2014-02-24 11:54:09 -08:00

basic-modal.underscore

Fix duplicate save and cancel buttons in Studio

2014-04-15 14:04:55 -04:00

checklist.underscore

Remove references to template loader JS library

2013-09-06 09:59:56 -04:00

course_grade_policy.underscore

i18n the tip text on studio grading page, and adding a missing space on the 'New Assignment' button

2013-10-16 16:26:09 -04:00

course_info_handouts.underscore

Show error on invalid html in course handout edit + Added tests

2013-11-20 17:33:07 +05:00

course_info_update.underscore

Load course info update template on page instead of via AJAX

2013-07-29 14:29:04 -04:00

edit-chapter.underscore

PDF Upload button now refers to "PDF" rather than "asset"

2013-07-22 12:54:31 -04:00

edit-textbook.underscore

changes to textbook upload buttons, success message and styling

2013-07-09 19:16:09 -04:00

edit-xblock-modal.underscore

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

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

editor-mode-button.underscore

Implement editing from the Studio container page.

2014-04-09 10:32:11 -04:00

metadata-dict-entry.underscore

BLD-658: Add view for field type Dict in Studio.

2014-02-11 14:53:57 +02:00

metadata-editor.underscore

Studio: revises visual layout/presentation of multi-value metadata fields

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

metadata-file-uploader-entry.underscore

BLD-1000: Download handout.

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

metadata-file-uploader-item.underscore

BLD-1000: Download handout.

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

metadata-list-entry.underscore

PR comment cleanup.

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

metadata-number-entry.underscore

Review feedback.

2013-05-30 14:13:10 -04:00

metadata-option-entry.underscore

Review feedback.

2013-05-30 14:13:10 -04:00

metadata-string-entry.underscore

Review feedback.

2013-05-30 14:13:10 -04:00

modal-button.underscore

Rebuild the way modals are constructed to support nesting.

2014-04-09 10:32:13 -04:00

no-textbooks.underscore

studio - revises plus icon treatment throughout new-button actions

2013-07-09 19:16:06 -04:00

paging-footer.underscore

Add pagination to Studio's Files and Uploads page

2014-01-05 23:35:12 -05:00

paging-header.underscore

Add pagination to Studio's Files and Uploads page

2014-01-05 23:35:12 -05:00

section-name-edit.underscore

Migrated internationalization text into template for section name

2013-05-22 15:55:55 -04:00

show-textbook.underscore

PDF Textbooks: implemented "View Live" link

2013-07-09 19:16:09 -04:00

system-feedback.underscore

Fix saving notification CSS.

2013-07-12 09:01:03 -04:00

upload-dialog.underscore

Rebuild the way modals are constructed to support nesting.

2014-04-09 10:32:13 -04:00