Commit Graph

6 Commits

Author SHA1 Message Date
Ash Mishra
0580f2710f Merge branch 'master' of https://github.com/nfb-onf/react-native-video
# Conflicts:
#	ios/RCTVideoPlayerViewController.m
#	ios/Video/RCTVideo.m
2018-09-04 15:26:56 -07:00
Ash Mishra
77c48c9dfc added an onCaptionsDeviceSettings event 2018-09-04 15:19:32 -07:00
Ash Mishra
f45d6a2c3e Added fullscreen options for iOS Player 2018-09-04 15:15:30 -07:00
Laurin Quast
685133ea48 remove cache property 2018-07-31 23:47:55 +02:00
Laurin Quast
2260ae5b8c Merge remote-tracking branch 'upstream/master' into implement-ios-caching 2018-07-30 21:20:34 +02:00
Laurin Quast
4f386d2c93 make video cache feature optional 2018-07-19 02:06:09 +02:00