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

..

djangoapps

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

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

envs

Revert pull request #3466

2014-05-14 13:55:26 -04:00

lib

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

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

static

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

2014-05-13 15:30:56 -04:00

templates

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

2014-05-12 11:35:03 -04:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

startup.py

Remove obselete cms startup code

2014-01-24 16:42:38 -05:00

urls_dev.py

Add the ability to view templates in a browser in development mode

2014-02-07 14:56:35 -05:00

urls.py

Fix ssl redirection test

2014-05-13 14:13:45 -04:00

wsgi.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00