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

..

modals

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

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

pages

Switch the container page to use the new view

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

settings

Rebuild the way modals are constructed to support nesting.

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

video

addressing review feedback

2014-04-09 16:45:22 -04:00

abstract_editor.js

BLD-1000: Download handout.

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

asset.js

Address the next round of review comments.

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

assets.js

Address the next round of review comments.

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

baseview.js

Disable draft and edit links during ajax calls

2014-05-02 09:11:46 -04:00

checklist.js

Address the next round of review comments.

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

container.js

Fix Jasmine tests

2014-05-02 16:20:17 -04:00

course_info_edit.js

Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests

2013-12-20 18:38:24 +05:00

course_info_handout.js

Implement next round of code reviews

2014-04-09 12:15:38 -04:00

course_info_helper.js

Upgrade CodeMirror to 3.21.0 (with accessibility changes from

2014-02-28 13:44:34 -05:00

course_info_update.js

Implement next round of code reviews

2014-04-09 12:15:38 -04:00

edit_chapter.js

Switch PDF Textbooks to use portable URLs

2014-04-16 13:05:25 -04:00

edit_textbook.js

Address the next round of review comments.

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

feedback_alert.js

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

feedback_notification.js

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

feedback_prompt.js

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

feedback.js

Address the next round of review comments.

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

import.js

Fixed all instances of "occured" typo

2014-01-24 16:13:26 -08:00

list_textbooks.js

Implement next round of code reviews

2014-04-09 12:15:38 -04:00

metadata.js

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

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

overview_assignment_grader.js

Internationalize "Not Graded" on front end (STUD-989)

2014-01-27 14:16:34 -05:00

overview.js

Implement editing from the Studio container page.

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

paging_footer.js

Implement next round of code reviews

2014-04-09 12:15:38 -04:00

paging_header.js

Implement next round of code reviews

2014-04-09 12:15:38 -04:00

paging.js

Add a loading indicator to the Files & Uploads page.

2014-03-24 10:51:36 -04:00

section_edit.js

Address the next round of review comments.

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

section_show.js

Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests

2013-12-20 18:38:24 +05:00

show_textbook.js

Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests

2013-12-20 18:38:24 +05:00

uploads.js

Address the next round of review comments.

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

validation.js

Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests

2013-12-20 18:38:24 +05:00

xblock_editor.js

Fix duplicate save and cancel buttons in Studio

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

xblock.js

no need for $.when() here..

2014-04-25 11:51:08 -04:00