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

..

_modal_editname.html

Fixed all instances of "occured" typo

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

_reverification_support.html

re-verification dashboard styles

2014-01-31 21:48:35 +00:00

_verification_header.html

re-verification dashboard styles

2014-01-31 21:48:35 +00:00

_verification_support.html

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

2014-05-07 12:49:55 -04:00

face_upload.html

Fixed all instances of "occured" typo

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

final_verification.html

Bare bones outline of ID verification templates

2013-08-21 16:21:52 -04:00

midcourse_photo_reverification.html

Removed extraneous title block that was replacing the breadcrumbs

2014-02-03 15:22:25 -05:00

midcourse_reverification_confirmation.html

Clarify strings for i18n

2014-05-09 10:23:46 -04:00

midcourse_reverify_dash.html

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

2014-05-07 12:49:55 -04:00

photo_reverification.html

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00

photo_verification.html

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

2014-05-07 12:49:55 -04:00

prompt_midcourse_reverify.html

Midcourse reverification: i18n fixes

2014-01-31 22:20:33 +00:00

reverification_confirmation.html

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00

reverification_window_expired.html

Removed extraneous title block that was replacing the breadcrumbs

2014-02-03 15:22:25 -05:00

show_requirements.html

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

2014-05-07 12:49:55 -04:00

verified.html

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

2014-05-07 12:49:55 -04:00