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

..

features

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

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

management

Ensure all cms commands accept either deprecated or new syntax for keys

2014-05-15 17:09:12 -04:00

tests

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

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

views

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

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

__init__.py

move call to update_templates on service startup into a django-admin command

2013-03-04 08:06:58 -05:00

context_processors.py

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

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

course_info_model.py

Tweaks course update html to avoid using list tags inappropriately.

2014-02-26 13:28:00 -05:00

debug_file_uploader.py

some tweeks to the negative testing

2013-07-09 19:16:00 -04:00

git_export_utils.py

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

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

utils.py

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

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