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