edx-platform

Files

Vik Paruchuri 19a80c6268 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 17:12:53 -05:00

__init__.py

2013-02-11 18:43:47 -05:00

combined_open_ended_modulev1.py

2013-02-20 17:12:53 -05:00

combined_open_ended_rubric.py

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

controller_query_service.py

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

grading_service_module.py

2013-02-13 16:13:34 -05:00

open_ended_image_submission.py

2013-02-13 16:30:34 -05:00

open_ended_module.py

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

openendedchild.py

2013-02-20 16:36:40 -05:00

peer_grading_service.py

2013-02-20 16:49:59 -05:00

self_assessment_module.py

2013-02-13 19:28:30 -05:00