Merge remote-tracking branch 'origin/master' into samuel/fix-unescaped-selector
Showing
- .github/CODEOWNERS 22 additions, 22 deletions.github/CODEOWNERS
- Makefile 3 additions, 3 deletionsMakefile
- cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py 2 additions, 2 deletions...entstore/management/commands/tests/test_cleanup_assets.py
- cms/djangoapps/contentstore/tests/test_course_settings.py 42 additions, 0 deletionscms/djangoapps/contentstore/tests/test_course_settings.py
- cms/djangoapps/contentstore/views/item.py 38 additions, 4 deletionscms/djangoapps/contentstore/views/item.py
- cms/djangoapps/contentstore/views/tests/test_import_export.py 40 additions, 19 deletions...djangoapps/contentstore/views/tests/test_import_export.py
- cms/djangoapps/contentstore/views/tests/test_item.py 124 additions, 23 deletionscms/djangoapps/contentstore/views/tests/test_item.py
- cms/djangoapps/contentstore/views/tests/test_preview.py 5 additions, 5 deletionscms/djangoapps/contentstore/views/tests/test_preview.py
- cms/djangoapps/contentstore/views/tests/test_transcript_settings.py 0 additions, 55 deletions...apps/contentstore/views/tests/test_transcript_settings.py
- cms/djangoapps/contentstore/views/tests/test_videos.py 43 additions, 17 deletionscms/djangoapps/contentstore/views/tests/test_videos.py
- cms/djangoapps/contentstore/views/transcript_settings.py 5 additions, 14 deletionscms/djangoapps/contentstore/views/transcript_settings.py
- cms/djangoapps/contentstore/views/videos.py 18 additions, 15 deletionscms/djangoapps/contentstore/views/videos.py
- cms/djangoapps/models/settings/course_metadata.py 16 additions, 0 deletionscms/djangoapps/models/settings/course_metadata.py
- cms/envs/common.py 8 additions, 17 deletionscms/envs/common.py
- cms/envs/production.py 3 additions, 3 deletionscms/envs/production.py
- cms/static/js/i18n/de-de/djangojs.js 1 addition, 16 deletionscms/static/js/i18n/de-de/djangojs.js
- cms/static/js/i18n/en@lolcat/djangojs.js 0 additions, 36 deletionscms/static/js/i18n/en@lolcat/djangojs.js
- cms/static/js/i18n/en@pirate/djangojs.js 0 additions, 36 deletionscms/static/js/i18n/en@pirate/djangojs.js
- cms/static/js/i18n/eo/djangojs.js 20 additions, 16 deletionscms/static/js/i18n/eo/djangojs.js
- cms/static/js/i18n/es-419/djangojs.js 106 additions, 16 deletionscms/static/js/i18n/es-419/djangojs.js
Loading
Please register or sign in to comment