Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/default transcripts #4

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
31a1f3f
Add basic VideoXBlock structure and dummy backend
z4y4ts Nov 30, 2016
09439a7
Add youtube video backend
z4y4ts Nov 30, 2016
eea8bc8
Add Wistia backend
z4y4ts Nov 30, 2016
6438574
Add Brightcove backend
z4y4ts Nov 30, 2016
d0ae425
Add different playback rates support
z4y4ts Nov 30, 2016
5737755
Add video playback state save and load
z4y4ts Nov 30, 2016
c9a1723
Progress bar markup bugfix
Dec 1, 2016
d2838f9
Add resolution switcher
dorosh Dec 6, 2016
283fcd4
Merge pull request #15 from raccoongang/bugfix/progress_bar_markup
Dec 6, 2016
7a5c6d5
Merge pull request #19 from raccoongang/feature/videojs_resolution_sw…
dorosh Dec 6, 2016
57c3024
add style for right focus pleyer elements
Dec 7, 2016
b47497e
Download and upload handout file on MongoDB
Dec 7, 2016
e6429a7
Merge pull request #20 from raccoongang/feature/handout_upload_mongo_…
sendr Dec 7, 2016
12416bb
Merge pull request #22 from raccoongang/keyboard-access
madeira Dec 8, 2016
18a02cc
Brightcove player id analytics
Dec 7, 2016
ab6eca6
Merge branches 'dev' and 'feature/brightcove_player_id' of https://gi…
Dec 8, 2016
e54ee82
Merge pull request #21 from raccoongang/feature/brightcove_player_id
Dec 8, 2016
1d15528
Emit analytic events (#24)
Dec 13, 2016
b7054f1
Add transcripts upload feature in the studio
sendr Dec 13, 2016
90dc772
Merge pull request #25 from raccoongang/feature/transcript_upload_new
sendr Dec 13, 2016
8c64b03
Interactive transcripts display
dorosh Dec 14, 2016
33b335e
Merge pull request #27 from raccoongang/feature/transcrip_display
dorosh Dec 16, 2016
40d318e
Video offset (#26)
Dec 16, 2016
3fa7c32
Fixed bugs
sendr Dec 16, 2016
0ac6924
add responsive for player, fix progres bar width
Dec 15, 2016
de653a0
remarks correction 1
sendr Dec 16, 2016
7336300
Merge pull request #28 from raccoongang/feature/player-width
madeira Dec 19, 2016
fe95d2f
remarks correction 2
sendr Dec 19, 2016
37c18e6
Merge pull request #29 from raccoongang/bugfix/upload-download-handout
sendr Dec 19, 2016
0750091
Add validation of upload transcripts
sendr Dec 19, 2016
4843e49
Merge pull request #30 from raccoongang/feature/transcript-upload-val…
sendr Dec 19, 2016
364acfb
Player rate label bugfix for youtube and wistia (#31)
Dec 20, 2016
42acf9f
Add order tabindex
dorosh Dec 21, 2016
7b5fa32
Merge pull request #34 from raccoongang/feature/order-tabIndex
dorosh Dec 21, 2016
ed84603
Feature/bugfix offset (#32)
Dec 21, 2016
212f34a
Add context menu
OPersian Dec 20, 2016
5e7a5cb
Merge pull request #33 from raccoongang/feature/context-menu
OPersian Dec 21, 2016
89ee47a
Refactor context menu
OPersian Dec 21, 2016
8d0bf4b
Merge pull request #35 from raccoongang/feature/context-menu
OPersian Dec 22, 2016
1858deb
Refactor context menu
OPersian Dec 21, 2016
53821d2
Add text "Speed" on large viewports
OPersian Dec 26, 2016
b24069c
Merge pull request #38 from raccoongang/feature/speed-label
OPersian Dec 26, 2016
574814f
Save state on next button clicking (#39)
Dec 27, 2016
12b7dc0
Feature/player id validation (#37)
Dec 27, 2016
4e5971c
Refactor context menu
OPersian Dec 21, 2016
8ed25e2
Replace videojs playback rate control with custom
OPersian Dec 30, 2016
0f50f20
Merge pull request #45 from raccoongang/bugfix/playback_rate_label
OPersian Jan 3, 2017
396aa13
Buttons for videojs player
dorosh Jan 3, 2017
8f13eb5
Merge pull request #46 from raccoongang/feature/captions_transcripts_…
dorosh Jan 3, 2017
3f3ee16
Add download transcript button for students
Jan 3, 2017
7d67dc6
Optimized submenu creation (#41)
OPersian Jan 3, 2017
ac6f434
Enabling/disabling of interactive transcripts
sendr Jan 3, 2017
8de712f
Merge branch 'dev' of github.com:raccoongang/xblock-video into featur…
sendr Jan 3, 2017
6af5f50
Merge pull request #47 from raccoongang/feature/interactive_transcrip…
sendr Jan 3, 2017
5f81265
Add caption for video
dorosh Jan 4, 2017
4d3c455
Merge pull request #48 from raccoongang/feature/caption_display
dorosh Jan 4, 2017
c87c596
Refactor of including javascript content to brightcove player
sendr Jan 4, 2017
8f32dae
Merge pull request #49 from raccoongang/brightcove_player_refactor
sendr Jan 4, 2017
f4c6870
Not include videojs-transcripts.js to page if no transcripts (#50)
sendr Jan 4, 2017
a5a82c1
Add language select
dorosh Jan 4, 2017
0c6a14f
Merge branch 'dev' into feature/language_swither
dorosh Jan 4, 2017
8065131
Merge pull request #51 from raccoongang/feature/language_swither
dorosh Jan 4, 2017
1ebd118
Disable .srt uploads for transcripts as this format not supported by …
z4y4ts Jan 4, 2017
be925b6
Merge Sprint #2 code into master branch
z4y4ts Jan 4, 2017
3d66d99
Remove unused static assets
z4y4ts Jan 5, 2017
ba62ffc
Fixed Speed label for Brightcove
Jan 5, 2017
3e8c79d
Enable popup submenu in Edge
OPersian Jan 6, 2017
12ad1ae
Add support for .srt transcripts
z4y4ts Jan 6, 2017
1164ed1
Reduce code duplication and add docstrings
sendr Jan 6, 2017
8f377f0
Fix pycaption dependency specification in requirements.txt
z4y4ts Jan 6, 2017
76b729a
Wrap transcripts in route_transcript() for on-the-fly convertion
z4y4ts Jan 6, 2017
7408d86
Fix typo in install_requires section in setup.py
z4y4ts Jan 10, 2017
75c786d
Add display captions
dorosh Jan 11, 2017
ffa456a
Remove unused styles (#66)
sendr Jan 12, 2017
3ff2db6
Make transcripts download link follow selected transcript language (#64)
sendr Jan 12, 2017
b51dfb5
fix "get_transcript_download_link" function (#67)
sendr Jan 12, 2017
eab67c8
Downloading transcripts with correct filename (#68)
sendr Jan 13, 2017
bfabc59
Fixed bug with replacing existing language after uploading transcript…
sendr Jan 16, 2017
d6a1eda
Minor JavaScript optimization in studio_edit.js
valera-rozuvan Jan 16, 2017
b341b38
Fix indentation in player-context-menu.js, use dot notation when poss…
valera-rozuvan Jan 16, 2017
2b4c333
Add pylint integration with TravisCI and pylintrc config
z4y4ts Jan 16, 2017
41ed7d4
Save slider position after slider drag over to rearward (#77)
Jan 23, 2017
d103b09
Add eslint to TravisCI and JavaScript code style improvements (#81)
sendr Jan 23, 2017
87b6757
Fix style for captions, transcripts and speed in control bar
dorosh Jan 24, 2017
de235fb
Merge pull request #80 from raccoongang/bug/style_fix_captions_and_tr…
dorosh Jan 24, 2017
92b7af0
Resolve className fail
dorosh Jan 24, 2017
ab65204
Feature/travis python tests (#82)
Jan 24, 2017
5e672c3
Merge pull request #85 from raccoongang/bug/fail-className-var
dorosh Jan 24, 2017
4887701
Add coveralls.io integration to track test coverage
Jan 24, 2017
0c46e61
Captions and transcripts delivery remarks corrections (#78)
sendr Jan 25, 2017
c169a19
Add CodeClimate config file
z4y4ts Jan 25, 2017
bbf8643
Add save state
dorosh Jan 26, 2017
922946b
Merge branch 'dev' into bug/save-transcript-state
dorosh Jan 26, 2017
9a39862
Fix autoplay
dorosh Jan 26, 2017
99919fa
Merge pull request #88 from raccoongang/bug/save-transcript-state
dorosh Jan 26, 2017
f65f554
Merge pull request #91 from raccoongang/bug/save-state-progress_bar
dorosh Jan 26, 2017
5b93ea1
Speed up Travis builds and add more build targets
z4y4ts Jan 26, 2017
4bb3e92
Order tabindex in progressbar (#94)
dorosh Feb 1, 2017
f4850d7
Feature/transcripts autoupload (#79)
OPersian Feb 1, 2017
b9c97ed
Add TravisCI and Coveralls.io badges to README.md
z4y4ts Feb 1, 2017
9fc6c91
Add Makefile with common tasks and switch TravisCI to use it
z4y4ts Feb 2, 2017
2f73c53
Fix pep 8 violations (#97)
TamoshaytisV Feb 2, 2017
3f00d86
Feature/vimeo (#98)
dorosh Feb 3, 2017
89f7265
Reduce target python versions to latest and the one used by Eucalyptus
z4y4ts Feb 3, 2017
2e9daa5
Run pep8 before pylint and keep make quality running even if they fail
z4y4ts Feb 3, 2017
065c3cb
Move bower.json to root directory, add .bowerrc, add make deps target…
z4y4ts Feb 6, 2017
c15a1bd
Fix saving playback progress by correctly reading it from localStorag…
z4y4ts Feb 6, 2017
d934373
Bug/settings page studio (#103)
dorosh Feb 6, 2017
66d0a1a
Add Default transcripts upload and Brightcove HLSe (#104)
z4y4ts Feb 7, 2017
fa80e7c
Add comments into .editorconfig with a link to download page
z4y4ts Feb 8, 2017
90c002d
added statuses constants (#111)
TamoshaytisV Feb 8, 2017
176880e
Refactoring of exceptions (#114)
TamoshaytisV Feb 9, 2017
6eca5e1
Tweak .travis.yml for faster build times and bump XBlock dependency (…
z4y4ts Feb 9, 2017
4a40cc4
Add markdownlint to .codeclimate.yml and fix minor README.md issues (…
z4y4ts Feb 9, 2017
93a44ad
Extract resource_string() and render_resource() to utils.py (#112)
z4y4ts Feb 10, 2017
c328045
Fixed relative paths in backends (#115)
OPersian Feb 10, 2017
8f8fe9f
Clean special characters from the captions text
OPersian Feb 10, 2017
23fefaa
Merge branch 'dev' of https://github.com/raccoongang/xblock-video int…
OPersian Feb 10, 2017
29e0650
Fix label of enabled transcripts
OPersian Feb 11, 2017
62971ab
Add transcript to uploaded transcripts and assign external url to href
OPersian Feb 11, 2017
75c9cf8
Fix display of available transcripts label
OPersian Feb 11, 2017
cdad88b
Add status messages display
OPersian Feb 13, 2017
2f07795
Fix status message display
OPersian Feb 13, 2017
457e302
Affect default transcripts on a manual transcript upload
OPersian Feb 13, 2017
1723b52
Affect default transcripts on a manual transcript removal
OPersian Feb 13, 2017
523a998
Refactor creation of a default transcript
OPersian Feb 13, 2017
c25083f
Update status messages on manual transcript removal
OPersian Feb 14, 2017
3728205
Get rif of unnecessary comments
OPersian Feb 14, 2017
f061cfc
Delete multiple spaces after ','
OPersian Feb 14, 2017
1f6a046
Fix import order per travis requirements
OPersian Feb 14, 2017
bd69c80
Fix import order per pylint
OPersian Feb 14, 2017
b79cfc5
Bug/relocate django vars (#117)
dorosh Feb 13, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"directory": "video_xblock/static/bower_components",
"scripts": {
"preinstall": "",
"postinstall": "",
"preuninstall": ""
}
}
29 changes: 29 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Serves for configuration of CodeClimate (automated code review for test coverage, complexity, duplication, etc.)
engines:
csslint:
enabled: true
duplication:
enabled: true
config:
languages:
- javascript
- python
exclude_fingerprints:
- ffaa02171edd2e7b1184b6eacdbed97f
eslint:
# Disabled since CodeClimate doesn't yet support eslint-config-edx plugin
enabled: false
channel: "eslint-3"
fixme:
enabled: true
markdownlint:
enabled: true
radon:
enabled: true
ratings:
paths:
- "**.css"
- "**.js"
- "**.md"
- "**.py"
exclude_paths: []
1 change: 1 addition & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
repo_token: St0myP2WKubt2SrFuyQDZI7Y1gsxDIiiX
20 changes: 20 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# EditorConfig helps developers define and maintain
# consistent coding styles between different editors and IDEs.
#
# Grab a plugin for your editor of choice here http://editorconfig.org/#download

root=true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.yml]
indent_size = 2

[Makefile]
indent_style = tab
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
video_xblock/static/js/player_state.js
22 changes: 22 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"extends": "eslint-config-edx",
"globals": {
"videojs": true,
"domReady": true
},
"rules": {
"no-underscore-dangle": [
"error", {"allow": [
// VideoJS components' attributes
"childNameIndex_", "el_", "kind_", "labelEl_", "options_", "player_", "tracks_"
]}
],
"require-jsdoc": ["error", {
"require": {
"FunctionDeclaration": true,
"MethodDefinition": true,
"ClassDeclaration": true
}
}]
}
}
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,9 @@ ENV/

# Rope project settings
.ropeproject

# Bower components
bower_components/

#Pycharm
.idea/
33 changes: 33 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
language: python
sudo: false
python:
- "2.7.10"
- "2.7.13"

addons:
apt:
packages:
# Install binary package for lxml to speed up build
- python-lxml

cache:
pip: true
directories:
- node_modules # NPM packages

before_install:
# Install latest stable NodeJS version. Required for eslint.
- nvm install stable

before_script:
- make deps-test
# Install eslint, eslint-config-edx and their dependencies
- make tools

script:
- make quality-py
- make quality-js
- make test-py

after_success:
- coveralls
33 changes: 33 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.PHONY=all,quality,test

all: quality test

clean:
-rm -rf node_modules/

test: test-py

test-py:
nosetests video_xblock --with-coverage --cover-package=video_xblock

quality: quality-py quality-js

quality-py:
pep8 . --format=pylint --max-line-length=120
pylint -f colorized video_xblock

quality-js:
eslint video_xblock/static/js/

deps:
pip install -r requirements.txt
bower install

deps-test:
pip install -r test_requirements.txt

tools:
npm install "eslint@^2.12.0" eslint-config-edx "[email protected]" "eslint-plugin-import@^1.9.2"

package:
echo "Here be static dependencies packaging"
63 changes: 63 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
[![Build Status](https://travis-ci.org/raccoongang/xblock-video.svg?branch=dev)](https://travis-ci.org/raccoongang/xblock-video)
[![Coverage Status](https://coveralls.io/repos/github/raccoongang/xblock-video/badge.svg?branch=dev)](https://coveralls.io/github/raccoongang/xblock-video?branch=dev)

# xblock-video

XBlock to embed videos hosted on different video platform into your courses.

## Installation

```shell
sudo -sHu edxapp
source ~/edxapp_env
# Clone and install xblock
git clone https://github.com/raccoongang/xblock-video.git
cd xblock-video
pip install -e .
# Install Python and JavaScript dependencies
make deps
```

## Enabling in Studio

You can enable the Wistia xblock in studio through the advanced
settings:

1. From the main page of a specific course, click on *Settings*,
*Advanced Settings* in the top menu.
1. Check for the *Advanced Module List* policy key, and add
`"video_xblock"` in the policy value list.
![Advanced Module List](doc/img/advanced_settings.png)

1. Click on the *Save changes* button.

## Usage

TODO

## Development

Install dependencies and development tools:

```shell
> make deps deps-test tools
```

Run quality checks:

```shell
> make quality
```

Run tests:

```shell
> make test
```

## License

The code in this repository is licensed under the GPL v3 licence unless
otherwise noted.

Please see `LICENSE` file for details.
16 changes: 16 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "xblock-video",
"version": "0.2-dev",
"dependencies": {
"video-js": "5.13.1",
"videojs-youtube": "raccoongang/videojs-youtube#playback-rate-fix",
"videojs-wistia": "raccoongang/videojs-wistia#playback-toggle-fix",
"videojs-transcript": "0.8.0",
"videojs-resolution-switcher": "videojs-resolution-switcher#85f1e51",
"videojs-offset": "raccoongang/videojs-offset#master",
"videojs-contextmenu": "brightcove/videojs-contextmenu",
"videojs-contextmenu-ui": "brightcove/videojs-contextmenu-ui",
"videojs-vimeo": "raccoongang/videojs-vimeo#bug/clean-player-code"
},
"private": true
}
Binary file added doc/img/advanced_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading