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

Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html

2014-05-16 14:01:20 -04:00

..

analytics.html

Clean up references to answer distribution-like things

2014-03-24 16:57:56 -04:00

course_info.html

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

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

data_download.html

Clean up references to answer distribution-like things

2014-03-24 16:57:56 -04:00

extensions.html

Clarify strings for i18n

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

instructor_dashboard_2.html

A hack to get instructor email to work in Firefox while the video

2014-05-15 16:54:15 +05:00

membership.html

Merge branch 'release'

2014-04-16 15:41:59 -04:00

metrics.html

Fixes issue with metrics tab click handlers

2014-05-15 11:45:59 -07:00

send_email.html

i18n Inst Dash Email tab

2014-03-21 17:49:13 -04:00

student_admin.html

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

2014-05-16 14:01:20 -04:00