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

..

accordion.html

Merge branch 'release'

2014-02-21 16:17:02 -05:00

course_about.html

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

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

course_navigation.html

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

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

courses.html

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

courseware-error.html

Unicode support for course names in reverification flow

2014-04-08 13:11:41 -04:00

courseware.html

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

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

error-message.html

Puts module.render() in try statements.

2014-03-19 19:30:22 +05:00

grade_summary.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

gradebook.html

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

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

info.html

Added "Edit in CMS" links throughout courseware

2014-04-04 10:23:51 -07:00

instructor_dashboard.html

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

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

mktg_coming_soon.html

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

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

mktg_course_about.html

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

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

news.html

Added more descriptive page titles.

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

progress_graph.js

Added parameters to hide grade totals and grade cutoffs in progress graph.

2012-12-19 12:37:02 -05:00

progress.html

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

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

static_tab.html

Add '' default to bodyclass in courseware templates

2014-02-01 16:18:51 +01:00

submission_history.html

Prevent XSS attack via submission_history page.

2013-07-23 17:23:59 -04:00

syllabus.html

Added more descriptive page titles.

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

welcome-back.html

Changes for viewing built-in tabs in studio

2014-03-21 13:58:01 -04:00

xqa_interface.html

Added jasmine tests and factored out javascript functions to new file

2014-04-23 14:56:32 -04:00