Merge pull request #1069 from edx/christina/lock-assets (42f286b3) · 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
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

42f286b3

Commit 42f286b3 authored 11 years ago by Christina Roberts

Downloads
- Plain Diff

Merge pull request #1069 from edx/christina/lock-assets

Add asset locking to the Studio asset page.

parents 190b4183 2cbdaaee

No related branches found

Tags release-2020-03-16-08.06

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 2 additions, 0 deletions

CHANGELOG.rst
cms/djangoapps/contentstore/features/common.py 45 additions, 0 deletions

cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/course-team.py 6 additions, 48 deletions

cms/djangoapps/contentstore/features/course-team.py
cms/djangoapps/contentstore/features/upload.feature 58 additions, 0 deletions

cms/djangoapps/contentstore/features/upload.feature
cms/djangoapps/contentstore/features/upload.py 80 additions, 14 deletions

cms/djangoapps/contentstore/features/upload.py
cms/djangoapps/contentstore/tests/test_assets.py 45 additions, 2 deletions

cms/djangoapps/contentstore/tests/test_assets.py
cms/djangoapps/contentstore/views/assets.py 57 additions, 39 deletions

cms/djangoapps/contentstore/views/assets.py
cms/static/coffee/spec/views/assets_spec.coffee 33 additions, 6 deletions

cms/static/coffee/spec/views/assets_spec.coffee
cms/static/img/bg-micro-stripes.png 0 additions, 0 deletions

cms/static/img/bg-micro-stripes.png
cms/static/js/models/asset.js 1 addition, 1 deletion

cms/static/js/models/asset.js
cms/static/js/views/asset_view.js 39 additions, 3 deletions

cms/static/js/views/asset_view.js
cms/static/sass/views/_assets.scss 251 additions, 124 deletions

cms/static/sass/views/_assets.scss
cms/templates/asset_index.html 81 additions, 75 deletions

cms/templates/asset_index.html
cms/templates/js/asset.underscore 12 additions, 4 deletions

cms/templates/js/asset.underscore

with 710 additions and 316 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