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

Video-js and VTT.js upgrade #5349

Merged
merged 6 commits into from
Dec 1, 2016

Conversation

benjaoming
Copy link
Contributor

@benjaoming benjaoming commented Nov 30, 2016

Summary

Fixes #5347

It became a bit of an assorted fixes and improvements PR, so here's an overview:

  • Makes srt serving work with DEBUG=True and runserver
  • Removed the minimal content pack fetching from assets make target.
  • Added minimal content pack as a sort of test data content pack, we should rebuild a much smaller one though
  • Removed unused and unmaintained .travis.yml

@benjaoming benjaoming added this to the 0.17.0 milestone Nov 30, 2016
@codecov-io
Copy link

codecov-io commented Dec 1, 2016

Current coverage is 51.02% (diff: 66.66%)

Merging #5349 into develop will decrease coverage by 0.06%

@@            develop      #5349   diff @@
==========================================
  Files           142        142          
  Lines          7482       7485     +3   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
- Hits           3822       3819     -3   
- Misses         3660       3666     +6   
  Partials          0          0          

Powered by Codecov. Last update 2892094...d41f9e6

@benjaoming benjaoming changed the title [WIP] Video-js and VTT.js upgrade Video-js and VTT.js upgrade Dec 1, 2016
@benjaoming
Copy link
Contributor Author

Interestingly, this PR starts work on removing the minimal English content pack so also addresses #5318

@benjaoming
Copy link
Contributor Author

On another note, the current patched git forks of video.js + vtt.js require the build systems to be able to fetch stuff in package.json with git -- no problem on Linux, but could cause issues on Mac / Windows build systems.. I can fix this if necessary @mrpau-eduard @mrpau-richard so let me know if make assets or npm install fails in your installer scripts after this merge.

@benjaoming benjaoming merged commit 0e665f1 into learningequality:develop Dec 1, 2016
@benjaoming benjaoming removed the has PR label Dec 1, 2016
@benjaoming benjaoming deleted the videojs-upgrade branch January 17, 2017 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants