Vik Paruchuri ad9400a0ef Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

2013-02-20 16:43:04 -05:00

..

__init__.py

Refactor existing grading logic into a new app.

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

open_ended_notifications.py

Move controller query service to xmodule side to prepare for ETA message displays

2013-02-20 16:19:17 -05:00

staff_grading_service.py

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-19 15:21:09 -05:00

staff_grading.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

tests.py

Merge branch 'master' into diana/fix-self-assessment-test

2013-02-20 13:37:42 -05:00

views.py

Render to string fix, display ETA message when student submits

2013-02-20 16:30:44 -05:00