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

..

dev

Create urls/views/templates for dev-only views

2013-07-31 17:20:26 -04:00

emails

i18n: Fix typo in studio's email

2014-03-25 16:51:24 +08:00

js

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

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

registration

Miscellaneous fixes to strings found during i18n work.

2014-01-03 17:50:16 -05:00

ux/reference

Implement editing from the Studio container page.

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

widgets

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

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

404.html

fix for Studio 404 and 500 page layouts

2014-05-02 16:19:59 -04:00

500.html

fix for Studio 404 and 500 page layouts

2014-05-02 16:19:59 -04:00

activation_active.html

Use format for strings instead of %.

2013-07-25 12:21:17 -04:00

activation_complete.html

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -04:00

activation_invalid.html

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -04:00

asset_index.html

Add a loading indicator to the Files & Uploads page.

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

base.html

Tiny MCE version 4.0.20

2014-04-02 11:12:26 -04:00

checklists.html

Studio: Review all panel help copy

2013-11-19 10:35:17 -05:00

component.html

Only show drag handles in draft mode

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

container_xblock_component.html

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

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

container.html

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

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

course_info.html

Test for i4x on returned pages.

2013-11-20 12:48:24 -05:00

edit_subsection.html

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

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

edit-tabs.html

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

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

error.html

Studio i18n

2013-07-12 16:25:39 -04:00

export_git.html

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

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

export.html

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

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

howitworks.html

Convert Studio JS to use require.js

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

html_error.html

fixing alignment error on studio component error message, i18n error message

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

import.html

Minor reword to server timed out message.

2014-04-30 09:33:29 -04:00

index.html

Enable/disable unicodes in course id's

2014-03-17 20:24:59 +05:00

login.html

Convert Studio JS to use require.js

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

manage_users.html

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

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

overview.html

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

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

register.html

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

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

settings_advanced.html

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

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

settings_graders.html

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

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

settings.html

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

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

studio_vertical_wrapper.html

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

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

studio_xblock_wrapper.html

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

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

temp-course-landing.html

added edge logo; added edge temp landing page

2012-10-11 12:29:14 -04:00

textbooks.html

Rebuild the way modals are constructed to support nesting.

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

unit.html

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

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