Vik Paruchuri 915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-07-18 11:55:37 -04:00

..

__init__.py

Refactor existing grading logic into a new app.

2012-12-28 11:29:29 -05:00

open_ended_notifications.py

Comment touched modules

2013-05-07 15:48:19 -04:00

staff_grading_service.py

Fix test

2013-06-28 14:38:13 -04:00

staff_grading.py

Remove unused imports from lms, as detected by pylint.

2013-06-19 16:56:34 -04:00

tests.py

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

utils.py

Check to see if a location is valid before displaying it for instructor grading

2013-06-13 16:00:28 -04:00

views.py

Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe

2013-06-27 16:11:24 -04:00