Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

0b90c60b

Commit 0b90c60b authored 7 years ago by Andy Armstrong Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #15301 from edx/andya/webpack-jquery

Handle issues with JQuery in Studio and LMS

parents 626f015a 4ed9776a

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

cms/envs/common.py 32 additions, 15 deletions

cms/envs/common.py
cms/static/cms/js/build.js 20 additions, 22 deletions

cms/static/cms/js/build.js
cms/static/cms/js/require-config.js 72 additions, 16 deletions

cms/static/cms/js/require-config.js
cms/templates/base.html 24 additions, 22 deletions

cms/templates/base.html
common/static/common/js/common_libraries.js 0 additions, 22 deletions

common/static/common/js/common_libraries.js
lms/envs/common.py 0 additions, 15 deletions

lms/envs/common.py
lms/static/lms/js/require-config.js 1 addition, 1 deletion

lms/static/lms/js/require-config.js
webpack.config.js 6 additions, 1 deletion

webpack.config.js

with 155 additions and 114 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment