Merge pull request #18385 from edx/release-mergeback-to-master
Merge release back to master
Showing
- cms/conftest.py 0 additions, 16 deletionscms/conftest.py
- cms/djangoapps/contentstore/features/advanced_settings.py 11 additions, 20 deletionscms/djangoapps/contentstore/features/advanced_settings.py
- cms/djangoapps/contentstore/features/common.py 1 addition, 0 deletionscms/djangoapps/contentstore/features/common.py
- cms/djangoapps/contentstore/features/html-editor.feature 5 additions, 0 deletionscms/djangoapps/contentstore/features/html-editor.feature
- cms/djangoapps/contentstore/features/problem-editor.feature 15 additions, 0 deletionscms/djangoapps/contentstore/features/problem-editor.feature
- cms/djangoapps/contentstore/views/preview.py 1 addition, 11 deletionscms/djangoapps/contentstore/views/preview.py
- cms/djangoapps/pipeline_js/js/xmodule.js 0 additions, 60 deletionscms/djangoapps/pipeline_js/js/xmodule.js
- cms/djangoapps/pipeline_js/templates/xmodule.js 45 additions, 0 deletionscms/djangoapps/pipeline_js/templates/xmodule.js
- cms/djangoapps/pipeline_js/urls.py 10 additions, 0 deletionscms/djangoapps/pipeline_js/urls.py
- cms/djangoapps/pipeline_js/views.py 44 additions, 0 deletionscms/djangoapps/pipeline_js/views.py
- cms/envs/acceptance.py 4 additions, 0 deletionscms/envs/acceptance.py
- cms/envs/bok_choy.py 0 additions, 3 deletionscms/envs/bok_choy.py
- cms/envs/bok_choy_docker.py 0 additions, 6 deletionscms/envs/bok_choy_docker.py
- cms/envs/test.py 2 additions, 0 deletionscms/envs/test.py
- cms/static/cms/js/build.js 6 additions, 1 deletioncms/static/cms/js/build.js
- cms/static/cms/js/main.js 79 additions, 80 deletionscms/static/cms/js/main.js
- cms/static/cms/js/spec/main.js 14 additions, 1 deletioncms/static/cms/js/spec/main.js
- cms/static/cms/js/spec/main_webpack.js 0 additions, 35 deletionscms/static/cms/js/spec/main_webpack.js
- cms/static/cms/js/spec/xblock/cms.runtime.v1_spec.js 68 additions, 69 deletionscms/static/cms/js/spec/xblock/cms.runtime.v1_spec.js
- cms/static/js/base.js 38 additions, 34 deletionscms/static/js/base.js
Please register or sign in to comment