Vik Paruchuri 687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html

2013-08-08 19:03:46 -04:00

..

__init__.py

Refactor existing grading logic into a new app.

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

open_ended_notifications.py

Remove annoying rubric parsing error, redo how notifications work

2013-08-08 13:16:32 -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

Fix test

2013-08-08 08:34:39 -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