aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix: when the seek input is focused and the video is playing, the space key ↵cky2018-06-061-0/+6
| | | | can't make the video pause, because after 'keyup', it always make the video play
* fix: https://github.com/sampotts/plyr/issues/1006cky2018-06-061-1/+4
|
* Update controls.md (fixes #996)Sam Potts2018-06-021-5/+3
|
* Merge branch 'master' of github.com:sampotts/plyrSam Potts2018-05-3126-1888/+598
|\ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.css # dist/plyr.css # dist/plyr.js.map # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map
| * Merge pull request #993 from sampotts/developSam Potts2018-05-3126-1926/+614
| |\ | | | | | | v3.3.10
| | * Fixed incorrect BEM formatting, fixed buffer alignmentSam Potts2018-05-3114-1581/+299
| | |
| | * Merge pull request #988 from kim-company/translate-qualitiesSam Potts2018-05-3114-273/+243
| | |\ | | | | | | | | Translate quality badges and quality names
| | | * Rename qualityName to labelPhilip Giuliani2018-05-311-3/+3
| | | |
| | | * Refactor getDeep methodPhilip Giuliani2018-05-301-1/+1
| | | |
| | | * Return undefined when the key is not present.Philip Giuliani2018-05-309-14/+14
| | | |
| | | * RebuildPhilip Giuliani2018-05-308-172/+149
| | | |
| | | * RebuildPhilip Giuliani2018-05-304-6/+12
| | | |
| | | * Add getDeep method to utilsPhilip Giuliani2018-05-302-1/+6
| | | |
| | | * RebuildPhilip Giuliani2018-05-308-87/+71
| | | |
| | | * Implement translation support for qualityName and qualityBadgePhilip Giuliani2018-05-302-23/+16
| | | |
| | | * Allow nested translationsPhilip Giuliani2018-05-301-2/+6
| | | |
| | | * Accept quality 0Philip Giuliani2018-05-301-1/+1
| | | |
| | | * ESLint tweakSam Potts2018-05-301-0/+1
| | | |
| | * | Merge pull request #990 from friday/travisSam Potts2018-05-313-1/+15
| | |\ \ | | | | | | | | | | Travis integration
| | | * | Lint and build in travisAlbin Larsson2018-05-301-0/+7
| | | | |
| | | * | Add npm scripts for linting and buildingAlbin Larsson2018-05-301-0/+2
| | | | |
| | | * | Gulp: Add option to build onlyAlbin Larsson2018-05-301-1/+6
| | | |/
| | * | Merge pull request #992 from philipgiuliani/quality-resume-timeSam Potts2018-05-311-3/+7
| | |\ \ | | | | | | | | | | Wait for the metadata to be loaded before setting the currentTime
| | | * | Wait for the metadata to be loaded before setting the currentTimePhilip Giuliani2018-05-311-3/+7
| | |/ /
| | * | Merge pull request #989 from friday/pr-templateSam Potts2018-05-311-5/+5
| | |\ \ | | | |/ | | |/| Proposed changes to PR template
| | | * Proposed changes to PR template (develop as base branch, exclude build and ↵Albin Larsson2018-05-301-5/+5
| | |/ | | | | | | | | | typo fix)
| | * Merge pull request #981 from friday/hls-captionsSam Potts2018-05-306-78/+55
| | |\ | | | | | | | | Improve captions handling for streaming
| | | * Update readme.mdSam Potts2018-05-301-1/+1
| | | |
| | | * Defer initial captions update to next tick, to avoid event being triggered ↵Albin Larsson2018-05-281-2/+2
| | | | | | | | | | | | | | | | to early
| | | * Change to using addtrack and removetrack listeners since 'change' didn't ↵Albin Larsson2018-05-281-1/+1
| | | | | | | | | | | | | | | | trigger in firefox for embedded captions (may also be a hls.js issue)
| | | * Replace browser language detection in defaults.js with explicit 'auto' optionAlbin Larsson2018-05-283-3/+7
| | | |
| | | * Fix typoAlbin Larsson2018-05-281-1/+1
| | | |
| | | * Ensure language is set in case the track is added after initialization, and ↵Albin Larsson2018-05-282-17/+9
| | | | | | | | | | | | | | | | trigger languagechange event when language is initially set
| | | * Add option to watch caption track changes and update language optionsAlbin Larsson2018-05-283-1/+9
| | | |
| | | * Optimize captions code reused and ensure captionsenabled/captionsdisabledAlbin Larsson2018-05-283-59/+32
| | | | | | | | | | | | | | | | will be sent on initial setup
| | * | Merge pull request #986 from friday/701Sam Potts2018-05-301-0/+6
| | |\ \ | | | | | | | | | | Call duration update method manually if user config has duration
| | | * | Call duration update method manually if user config has durationAlbin Larsson2018-05-291-0/+6
| | |/ /
* | / / v3.3.10Sam Potts2018-05-3116-59/+45
|/ / /
* | | Merge branch 'develop'Sam Potts2018-05-2816-68/+63
|\| |
| * | v3.3.9Sam Potts2018-05-2814-51/+51
| |/
| * Merge pull request #979 from friday/respect-storageSam Potts2018-05-281-1/+1
| |\ | | | | | | Respect storage being disabled for storage getter
| | * If storage is disabled, disable get as well, not just setAlbin Larsson2018-05-281-1/+1
| | |
| * | Merge pull request #977 from friday/utils.is.icue-ie11Sam Potts2018-05-281-1/+1
| |\ \ | | | | | | | | Restore utils.is.cue()
| | * | Restore utils.is.cue()Albin Larsson2018-05-271-1/+1
| | |/
| * | Merge pull request #978 from friday/ie-issuesSam Potts2018-05-281-15/+10
| |\ \ | | |/ | |/| Fix InvalidStateError and IE11 issues
| | * Simplify currentTime setter and bail when media hasn't loadedAlbin Larsson2018-05-281-11/+6
| | |
| | * Avoid duration getter returning NaN before element has loadedAlbin Larsson2018-05-281-4/+4
| |/
* | ESLint tweakSam Potts2018-05-281-0/+1
| |
* | Merge pull request #975 from sampotts/developSam Potts2018-05-2630-921/+1562
|\| | | | | v3.3.8
| * v3.3.8Sam Potts2018-05-2622-625/+1254
| |