Merge branch 'master' into ENT-2607-2
No related branches found
No related tags found
Showing
- cms/conftest.py 6 additions, 3 deletionscms/conftest.py
- cms/djangoapps/contentstore/tests/test_course_settings.py 27 additions, 0 deletionscms/djangoapps/contentstore/tests/test_course_settings.py
- cms/djangoapps/contentstore/tests/test_request_event.py 2 additions, 2 deletionscms/djangoapps/contentstore/tests/test_request_event.py
- cms/djangoapps/contentstore/views/course.py 7 additions, 1 deletioncms/djangoapps/contentstore/views/course.py
- cms/envs/common.py 1 addition, 0 deletionscms/envs/common.py
- cms/pytest.ini 1 addition, 1 deletioncms/pytest.ini
- cms/static/sass/elements-v2/_header.scss 1 addition, 1 deletioncms/static/sass/elements-v2/_header.scss
- cms/static/sass/elements/_forms.scss 1 addition, 1 deletioncms/static/sass/elements/_forms.scss
- cms/static/sass/elements/_header.scss 1 addition, 1 deletioncms/static/sass/elements/_header.scss
- cms/static/sass/elements/_layout.scss 1 addition, 1 deletioncms/static/sass/elements/_layout.scss
- cms/static/sass/elements/_navigation.scss 29 additions, 2 deletionscms/static/sass/elements/_navigation.scss
- common/djangoapps/course_modes/api/v1/views.py 2 additions, 2 deletionscommon/djangoapps/course_modes/api/v1/views.py
- common/djangoapps/course_modes/views.py 2 additions, 0 deletionscommon/djangoapps/course_modes/views.py
- common/djangoapps/third_party_auth/api/views.py 5 additions, 5 deletionscommon/djangoapps/third_party_auth/api/views.py
- common/djangoapps/third_party_auth/management/commands/tests/test_saml.py 0 additions, 1 deletion...s/third_party_auth/management/commands/tests/test_saml.py
- common/lib/pytest.ini 1 addition, 1 deletioncommon/lib/pytest.ini
- common/lib/xmodule/xmodule/course_module.py 3 additions, 1 deletioncommon/lib/xmodule/xmodule/course_module.py
- common/lib/xmodule/xmodule/js/src/video/09_video_caption.js 30 additions, 2 deletionscommon/lib/xmodule/xmodule/js/src/video/09_video_caption.js
- common/lib/xmodule/xmodule/tests/test_course_module.py 5 additions, 2 deletionscommon/lib/xmodule/xmodule/tests/test_course_module.py
- common/test/acceptance/tests/video/test_studio_video_module.py 16 additions, 0 deletions...n/test/acceptance/tests/video/test_studio_video_module.py
Loading
Please register or sign in to comment