Sarina Canelake 2aea261d48 Merge branch 'release' ...

Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py

2014-06-10 16:59:23 -04:00

..

djangoapps

Merge branch 'release'

2014-06-10 16:59:23 -04:00

envs

removes qualaroo from studio (STUD-1684)

2014-05-30 10:05:35 -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

making system status notifications flexible based on content

2014-06-09 14:08:20 -04:00

templates

Implement a custom editor for the split_module.

2014-06-05 12:16:16 -04:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.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

Serve ORA2 JavaScript i18n strings

2014-06-09 11:35:09 -04:00

wsgi.py

Centralize startup code, and execute in all contexts

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