Andy Armstrong 0ed3a95d3a Merge branch 'release' ...

Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py

2014-09-25 16:25:45 -04:00

..

features

StaffFactories accept course_keys, not courses. Make that clear in the interface.

2014-05-24 19:36:18 -04:00

management

Fix unicode issue

2014-07-21 16:43:51 +02:00

tests

Course admin should be able to de-admin dicussion admins

2014-09-24 22:26:31 +05:00

views

Merge branch 'release'

2014-09-25 16:25:45 -04:00

__init__.py

move instructor dashboard into its own lms djangoapp; add new

2012-09-02 19:05:34 -04:00

access.py

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

2014-05-08 12:09:23 -04:00

enrollment.py

fix shib reg from course about page

2014-07-17 10:51:32 -04:00

hint_manager.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

offline_gradecalc.py

Opaque-keys: fix pylint violations

2014-05-24 19:36:09 -04:00

utils.py

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

2014-05-08 12:09:23 -04:00