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

iOS Side loading for captions and offline support #1109

Merged
merged 10 commits into from
Jul 11, 2018
Merged

iOS Side loading for captions and offline support #1109

merged 10 commits into from
Jul 11, 2018

Commits on Jul 5, 2018

  1. iOS Sidecar loading for captions and offline support (isAsset). Android 

    fix to respect User settings for captions.
    @ashnfb
    ashnfb committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    3e2e16e View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. Merge remote-tracking branch 'upstream/master' 

    # Conflicts:
#	ios/RCTVideo.m
#	package.json
    @ashnfb
    ashnfb committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    05d4be2 View commit details
    Browse the repository at this point in the history

  2. Fix for textTracks not being set before selectedTextTrack (bug found … 

    …on iOS 9.3)
    @ashnfb
    ashnfb committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    fa63a9e View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. PR fixes for iOS sideloaded captions

    @ashnfb
    ashnfb committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    c9b7524 View commit details
    Browse the repository at this point in the history

  2. Android device locale support for captions

    @ashnfb
    ashnfb committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    572c11a View commit details
    Browse the repository at this point in the history

  3. isPaused reverted 

    clearSelectionOverride is still required for "default" and "disabled" case as it otherwise continues to show a selected track if it was previously selected
    @ashnfb
    ashnfb committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    6339b9a View commit details
    Browse the repository at this point in the history

  4. Support loading multiple sideloaded text tracks

    @cobarx
    cobarx committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    93ce4d6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'nfb-onf-master'

    @ashnfb
    ashnfb committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    ea7bc15 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

  1. Merged, but text sideloading is not working

    @ashnfb
    ashnfb committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    0d32a31 View commit details
    Browse the repository at this point in the history

  2. Fix default sideload text track for system caption setting

    @cobarx
    cobarx committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    fe26f54 View commit details
    Browse the repository at this point in the history