Vik Paruchuri 01cdc6e7f8 Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes ...

Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee

2013-01-31 16:50:10 -05:00

..

__init__.py

Refactor existing grading logic into a new app.

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

controller_query_service.py

Fix templating

2013-01-29 19:31:03 -05:00

grading_service.py

Fix rubric rendering

2013-01-29 21:51:48 -05:00

open_ended_notifications.py

Fix notifications to work with cache (sync timings)

2013-01-29 21:24:04 -05:00

open_ended_util.py

Pass proper parameters, fix templating

2013-01-29 19:31:03 -05:00

peer_grading_service.py

Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests

2013-01-28 14:58:50 -05:00

staff_grading_service.py

Address code review feedback

2013-01-28 10:57:06 -05:00

staff_grading.py

Refactor existing grading logic into a new app.

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

tests.py

Update tests to handle rubric scores

2013-01-28 08:41:39 -05:00

views.py

Do some better error checking for items.

2013-01-29 21:24:04 -05:00