Diana Huang ae65bb0332 Merge branch 'master' into feature/diana/rubric-input ...

Conflicts:
	common/lib/capa/capa/inputtypes.py

2013-01-14 13:40:45 -05:00

..

__init__.py

Refactor existing grading logic into a new app.

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

grading_service.py

Fix self.get call in peer grading service

2013-01-11 11:39:32 -05:00

peer_grading_service.py

Fix self.get call in peer grading service

2013-01-11 11:39:32 -05:00

staff_grading_service.py

Fix some minor bugs in the staff grading interface

2013-01-14 10:22:22 -05:00

staff_grading.py

Refactor existing grading logic into a new app.

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

tests.py

Update comments and remove some unnecessary code

2013-01-10 15:20:46 -05:00

views.py

Clean up names and refactor out some common logic

2013-01-10 15:33:17 -05:00