Calen Pennington d4280e8529 Fix merge conflicts

2014-05-16 14:10:50 -04:00

..

features

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

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

management

Revert StudentModule.module_state_key to field rather than computed property

2014-05-09 10:41:12 -04:00

tests

Fix merge conflicts

2014-05-14 15:59:25 -04:00

views

Fix merge conflicts

2014-05-16 14:10:50 -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

Update instructor dash to support ora2 submissions API with opaque keys

2014-05-13 13:28:55 -04:00

hint_manager.py

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

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

offline_gradecalc.py

Added django commands to get statistics and repost submissions to grader for open ended problems.

2014-01-06 19:13:28 +05:00

utils.py

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

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