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

2628e4f1

Commit 2628e4f1 authored 11 years ago by polesye

Downloads
- Plain Diff

Merge pull request #1512 from edx/anton/video-disallow-to-use-http-protocol

Video Player: Disallow users to enter video url's in http.

parents de1955dc 6cb5c390

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 2 additions, 0 deletions

CHANGELOG.rst
cms/djangoapps/contentstore/features/transcripts.feature 49 additions, 47 deletions

cms/djangoapps/contentstore/features/transcripts.feature
cms/djangoapps/contentstore/views/item.py 13 additions, 1 deletion

cms/djangoapps/contentstore/views/item.py
cms/static/js/views/transcripts/utils.js 4 additions, 2 deletions

cms/static/js/views/transcripts/utils.js
cms/static/js_spec/transcripts/editor_spec.js 28 additions, 28 deletions

cms/static/js_spec/transcripts/editor_spec.js
cms/static/js_spec/transcripts/utils_spec.js 11 additions, 10 deletions

cms/static/js_spec/transcripts/utils_spec.js
cms/static/js_spec/transcripts/videolist_spec.js 5 additions, 5 deletions

cms/static/js_spec/transcripts/videolist_spec.js

with 112 additions and 93 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