Merge pull request #18902 from cpennington/fix-educator-3262-v3 (5b71d440) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

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

Snippets Groups Projects

Admin message

code.vt.edu will be down for maintenance from 0530-0630 EDT Wednesday, March 26th

5b71d440

Unverified Commit 5b71d440 authored 6 years ago by

Calen Pennington Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #18902 from cpennington/fix-educator-3262-v3

Load all webpack chunks into fragments as correctly-typed resources

parents 3c654234 461f3525

Branches

Tags

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

cms/conftest.py 4 additions, 0 deletions

cms/conftest.py
cms/djangoapps/contentstore/views/preview.py 3 additions, 4 deletions

cms/djangoapps/contentstore/views/preview.py
cms/static/js/views/paged_container.js 14 additions, 8 deletions

cms/static/js/views/paged_container.js
cms/static/js/views/xblock.js 6 additions, 1 deletion

cms/static/js/views/xblock.js
common/lib/conftest.py 4 additions, 0 deletions

common/lib/conftest.py
common/lib/xmodule/xmodule/js/src/conditional/display.js 3 additions, 6 deletions

common/lib/xmodule/xmodule/js/src/conditional/display.js
common/lib/xmodule/xmodule/util/xmodule_django.py 12 additions, 0 deletions

common/lib/xmodule/xmodule/util/xmodule_django.py
common/lib/xmodule/xmodule/vertical_block.py 2 additions, 2 deletions

common/lib/xmodule/xmodule/vertical_block.py
common/lib/xmodule/xmodule/x_module.py 2 additions, 2 deletions

common/lib/xmodule/xmodule/x_module.py
conftest.py 4 additions, 0 deletions

conftest.py
openedx/core/lib/xblock_utils/__init__.py 2 additions, 2 deletions

openedx/core/lib/xblock_utils/__init__.py
webpack.common.config.js 4 additions, 1 deletion

webpack.common.config.js

with 60 additions and 26 deletions

0% 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