Ned Batchelder 1cbc171616 Merge master in prep for merging back the hotfix changes.

2013-12-05 15:48:49 -05:00

..

instructor_dashboard_2

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

hint_manager_inner.html

Fixed tests for removing hash access to hints. Fixed instructor view for same.

2013-08-26 09:40:04 -04:00

hint_manager.html

LMS: corrects indentation issue in hint_manager.html template

2013-10-16 12:29:49 -04:00

staff_grading.html

removes temporary error messages

2013-12-05 12:08:39 -05:00