Merge branch 'master' into feature/diana/close-oe-problems
Conflicts: common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py common/lib/xmodule/xmodule/peer_grading_module.py
Showing
- apt-packages.txt 1 addition, 0 deletionsapt-packages.txt
- cms/.coveragerc 1 addition, 1 deletioncms/.coveragerc
- cms/djangoapps/contentstore/features/common.py 13 additions, 5 deletionscms/djangoapps/contentstore/features/common.py
- cms/djangoapps/contentstore/features/courses.py 3 additions, 3 deletionscms/djangoapps/contentstore/features/courses.py
- cms/djangoapps/contentstore/features/signup.feature 3 additions, 3 deletionscms/djangoapps/contentstore/features/signup.feature
- cms/djangoapps/contentstore/features/signup.py 4 additions, 3 deletionscms/djangoapps/contentstore/features/signup.py
- cms/djangoapps/contentstore/module_info_model.py 72 additions, 76 deletionscms/djangoapps/contentstore/module_info_model.py
- cms/djangoapps/contentstore/tests/test_contentstore.py 55 additions, 5 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- cms/djangoapps/contentstore/tests/test_course_settings.py 1 addition, 5 deletionscms/djangoapps/contentstore/tests/test_course_settings.py
- cms/djangoapps/contentstore/tests/tests.py 0 additions, 2 deletionscms/djangoapps/contentstore/tests/tests.py
- cms/djangoapps/contentstore/tests/utils.py 0 additions, 1 deletioncms/djangoapps/contentstore/tests/utils.py
- cms/djangoapps/contentstore/views.py 48 additions, 13 deletionscms/djangoapps/contentstore/views.py
- cms/djangoapps/models/settings/course_grading.py 4 additions, 3 deletionscms/djangoapps/models/settings/course_grading.py
- cms/envs/common.py 2 additions, 9 deletionscms/envs/common.py
- cms/static/client_templates/course_grade_policy.html 36 additions, 68 deletionscms/static/client_templates/course_grade_policy.html
- cms/static/coffee/src/views/tabs.coffee 1 addition, 2 deletionscms/static/coffee/src/views/tabs.coffee
- cms/static/img/hiw-feature1.png 0 additions, 0 deletionscms/static/img/hiw-feature1.png
- cms/static/img/hiw-feature2.png 0 additions, 0 deletionscms/static/img/hiw-feature2.png
- cms/static/img/hiw-feature3.png 0 additions, 0 deletionscms/static/img/hiw-feature3.png
- cms/static/img/html-icon.png 0 additions, 0 deletionscms/static/img/html-icon.png
Loading
Please register or sign in to comment