Calen Pennington 6c546fbf1f Fix merge conflicts

2014-05-13 15:31:40 -04:00

..

tests

Fix merge conflicts

2014-05-13 15:31:40 -04:00

__init__.py

New tab (Metrics) in instructor dashboard

2014-02-28 14:01:44 -08:00

dashboard_data.py

Revert StudentModule.module_state_key to field rather than computed property

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

views.py

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

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