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

7f6c1012

Unverified Commit 7f6c1012 authored 7 years ago by Calen Pennington Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #17565 from edx/re-add-asset-index-changes

Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…

parents 6da64889 b1c9ad17

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

cms/static/cms/js/build.js 0 additions, 1 deletion

cms/static/cms/js/build.js
cms/static/js/factories/base.js 5 additions, 1 deletion

cms/static/js/factories/base.js
cms/static/js/pages/asset_index.js 7 additions, 0 deletions

cms/static/js/pages/asset_index.js
cms/static/js/pages/course.js 11 additions, 0 deletions

cms/static/js/pages/course.js
cms/static/js/pages/login.js 1 addition, 1 deletion

cms/static/js/pages/login.js
cms/static/js/sock.js 5 additions, 2 deletions

cms/static/js/sock.js
cms/templates/asset_index.html 9 additions, 9 deletions

cms/templates/asset_index.html
cms/templates/base.html 33 additions, 23 deletions

cms/templates/base.html
common/djangoapps/pipeline_mako/templates/static_content.html 13 additions, 11 deletions

...on/djangoapps/pipeline_mako/templates/static_content.html
common/djangoapps/terrain/ui_helpers.py 0 additions, 6 deletions

common/djangoapps/terrain/ui_helpers.py
webpack-config/file-lists.js 108 additions, 0 deletions

webpack-config/file-lists.js
webpack.common.config.js 70 additions, 21 deletions

webpack.common.config.js

with 262 additions and 75 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