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.

Sign up for GitHub

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

Jump to bottom

Merge videojs-contrib-hls master into http-streaming master #35

Merged
merged 7 commits into from
Feb 12, 2018
Merged

Merge videojs-contrib-hls master into http-streaming master #35

merged 7 commits into from
Feb 12, 2018

Commits on Jan 25, 2018

  1. Add nvmrc and update travis' chrome reference (videojs#1322) 

    * Update karma-chrome-launcher to ^2.2.0

* Update karma to ^1.7.1 and remove firefox from travis configuration

* enable node_modules caching on travis

* Update videojs-contrib-quality-levels to ^2.0.4

* Fix test for event handler cleanup on dispose by calling event handling methods
    @gesinger
    gesinger committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    5b21e02 View commit details
    Browse the repository at this point in the history

  2. Update karma reconnect configuration to match video.js' (videojs#1323) 

    * Increase karma's browserDisconnectTolerance to 3
    @gesinger
    gesinger committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    255f729 View commit details
    Browse the repository at this point in the history

  3. Remove IE11 section from README (videojs#1325)

    @gesinger @forbesjo
    gesinger authored and forbesjo committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    dbfc035 View commit details
    Browse the repository at this point in the history

  4. Throttler: Minor changes to make throttler work with native safari (v… 

    …ideojs#1118)
    @mrocajr @gesinger
    mrocajr authored and gesinger committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    4624a05 View commit details
    Browse the repository at this point in the history

  5. Add jsDelivr link (videojs#1274)

    @LukasDrgon @gesinger
    LukasDrgon authored and gesinger committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    fdec3dd View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. update url-toolkit to ^2.1.3 (videojs#1327)

    @tjenkinson @forbesjo
    tjenkinson authored and forbesjo committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    11987cc View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2018

  1. Merge videojs-contrib-hls master into http-streaming master

    @gesinger
    gesinger committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    7ccb2fb View commit details
    Browse the repository at this point in the history