Merge branch 'release'
Conflicts: common/lib/xmodule/xmodule/modulestore/mongo/draft.py lms/djangoapps/courseware/tests/modulestore_config.py
No related branches found
Showing
- cms/djangoapps/contentstore/tests/test_contentstore.py 5 additions, 7 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- common/lib/xmodule/xmodule/modulestore/mongo/draft.py 2 additions, 2 deletionscommon/lib/xmodule/xmodule/modulestore/mongo/draft.py
- common/lib/xmodule/xmodule/modulestore/store_utilities.py 2 additions, 10 deletionscommon/lib/xmodule/xmodule/modulestore/store_utilities.py
- common/lib/xmodule/xmodule/modulestore/xml_importer.py 2 additions, 10 deletionscommon/lib/xmodule/xmodule/modulestore/xml_importer.py
- common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py 6 additions, 6 deletions...module/open_ended_grading_classes/peer_grading_service.py
- common/lib/xmodule/xmodule/peer_grading_module.py 30 additions, 10 deletionscommon/lib/xmodule/xmodule/peer_grading_module.py
- common/lib/xmodule/xmodule/tests/test_peer_grading.py 80 additions, 0 deletionscommon/lib/xmodule/xmodule/tests/test_peer_grading.py
- common/lib/xmodule/xmodule/x_module.py 14 additions, 0 deletionscommon/lib/xmodule/xmodule/x_module.py
- common/templates/course_modes/choose.html 1 addition, 1 deletioncommon/templates/course_modes/choose.html
- common/test/data/open_ended/course/2012_Fall.xml 1 addition, 0 deletionscommon/test/data/open_ended/course/2012_Fall.xml
- common/test/data/open_ended/peergrading/PeerGradingLinked.xml 1 addition, 0 deletions...on/test/data/open_ended/peergrading/PeerGradingLinked.xml
- common/test/data/open_ended_nopath/README.md 1 addition, 0 deletionscommon/test/data/open_ended_nopath/README.md
- common/test/data/open_ended_nopath/course.xml 1 addition, 0 deletionscommon/test/data/open_ended_nopath/course.xml
- common/test/data/open_ended_nopath/course/2012_Fall.xml 4 additions, 0 deletionscommon/test/data/open_ended_nopath/course/2012_Fall.xml
- common/test/data/open_ended_nopath/peergrading/PeerGradingNoPath.xml 1 addition, 0 deletions.../data/open_ended_nopath/peergrading/PeerGradingNoPath.xml
- common/test/data/open_ended_nopath/policies/2012_Fall.json 11 additions, 0 deletionscommon/test/data/open_ended_nopath/policies/2012_Fall.json
- lms/djangoapps/courseware/tests/modulestore_config.py 2 additions, 1 deletionlms/djangoapps/courseware/tests/modulestore_config.py
- lms/djangoapps/open_ended_grading/tests.py 19 additions, 0 deletionslms/djangoapps/open_ended_grading/tests.py
- lms/djangoapps/open_ended_grading/views.py 16 additions, 9 deletionslms/djangoapps/open_ended_grading/views.py
- lms/djangoapps/verify_student/models.py 3 additions, 3 deletionslms/djangoapps/verify_student/models.py
Loading
Please register or sign in to comment