Merge branch 'master' into jnater/courseware_tests
Conflicts: lms/djangoapps/courseware/tests/tests.py lms/djangoapps/instructor/tests/test_enrollment.py
Showing
- CHANGELOG.rst 13 additions, 0 deletionsCHANGELOG.rst
- cms/djangoapps/auth/authz.py 83 additions, 14 deletionscms/djangoapps/auth/authz.py
- cms/djangoapps/auth/tests/test_authz.py 176 additions, 0 deletionscms/djangoapps/auth/tests/test_authz.py
- cms/djangoapps/contentstore/features/video-editor.py 1 addition, 1 deletioncms/djangoapps/contentstore/features/video-editor.py
- cms/djangoapps/contentstore/module_info_model.py 1 addition, 4 deletionscms/djangoapps/contentstore/module_info_model.py
- cms/djangoapps/contentstore/tests/test_contentstore.py 85 additions, 34 deletionscms/djangoapps/contentstore/tests/test_contentstore.py
- cms/djangoapps/contentstore/utils.py 1 addition, 1 deletioncms/djangoapps/contentstore/utils.py
- cms/djangoapps/contentstore/views/assets.py 4 additions, 4 deletionscms/djangoapps/contentstore/views/assets.py
- cms/djangoapps/contentstore/views/course.py 2 additions, 2 deletionscms/djangoapps/contentstore/views/course.py
- cms/djangoapps/contentstore/views/session_kv_store.py 6 additions, 6 deletionscms/djangoapps/contentstore/views/session_kv_store.py
- cms/envs/acceptance.py 16 additions, 1 deletioncms/envs/acceptance.py
- cms/envs/dev.py 1 addition, 1 deletioncms/envs/dev.py
- cms/envs/test.py 2 additions, 2 deletionscms/envs/test.py
- cms/static/coffee/spec/views/feedback_spec.coffee 39 additions, 0 deletionscms/static/coffee/spec/views/feedback_spec.coffee
- cms/static/js/views/feedback.js 12 additions, 2 deletionscms/static/js/views/feedback.js
- cms/static/sass/_variables.scss 17 additions, 17 deletionscms/static/sass/_variables.scss
- cms/templates/emails/activation_email_subject.txt 1 addition, 1 deletioncms/templates/emails/activation_email_subject.txt
- cms/templates/new_item.html 0 additions, 19 deletionscms/templates/new_item.html
- cms/templates/overview.html 2 additions, 1 deletioncms/templates/overview.html
- common/djangoapps/student/forms.py 21 additions, 0 deletionscommon/djangoapps/student/forms.py
Loading
Please register or sign in to comment