Merge branch 'master' into diana/fix-self-assessment-test
Showing
- common/lib/xmodule/xmodule/combined_open_ended_module.py 2 additions, 14 deletionscommon/lib/xmodule/xmodule/combined_open_ended_module.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/__init__.py 1 addition, 0 deletions...ib/xmodule/xmodule/open_ended_grading_classes/__init__.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py 25 additions, 57 deletions...pen_ended_grading_classes/combined_open_ended_modulev1.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py 0 additions, 0 deletions.../open_ended_grading_classes/combined_open_ended_rubric.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py 1 addition, 3 deletions...dule/open_ended_grading_classes/grading_service_module.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py 3 additions, 8 deletions...open_ended_grading_classes/open_ended_image_submission.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py 7 additions, 21 deletions...e/xmodule/open_ended_grading_classes/open_ended_module.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py 10 additions, 10 deletions...dule/xmodule/open_ended_grading_classes/openendedchild.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py 3 additions, 34 deletions...module/open_ended_grading_classes/peer_grading_service.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py 6 additions, 22 deletions...dule/open_ended_grading_classes/self_assessment_module.py
- common/lib/xmodule/xmodule/peer_grading_module.py 84 additions, 29 deletionscommon/lib/xmodule/xmodule/peer_grading_module.py
- common/lib/xmodule/xmodule/tests/test_combined_open_ended.py 15 additions, 4 deletionscommon/lib/xmodule/xmodule/tests/test_combined_open_ended.py
- common/lib/xmodule/xmodule/tests/test_self_assessment.py 6 additions, 2 deletionscommon/lib/xmodule/xmodule/tests/test_self_assessment.py
- common/lib/xmodule/xmodule/tests/test_util_open_ended.py 14 additions, 0 deletionscommon/lib/xmodule/xmodule/tests/test_util_open_ended.py
- common/lib/xmodule/xmodule/timeinfo.py 39 additions, 0 deletionscommon/lib/xmodule/xmodule/timeinfo.py
- common/lib/xmodule/xmodule/x_module.py 5 additions, 1 deletioncommon/lib/xmodule/xmodule/x_module.py
- lms/djangoapps/courseware/module_render.py 26 additions, 0 deletionslms/djangoapps/courseware/module_render.py
- lms/djangoapps/open_ended_grading/controller_query_service.py 3 additions, 7 deletions...djangoapps/open_ended_grading/controller_query_service.py
- lms/djangoapps/open_ended_grading/open_ended_notifications.py 4 additions, 7 deletions...djangoapps/open_ended_grading/open_ended_notifications.py
- lms/djangoapps/open_ended_grading/open_ended_util.py 0 additions, 13 deletionslms/djangoapps/open_ended_grading/open_ended_util.py
Loading
Please register or sign in to comment