aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into a11y-improvementsSam Potts2018-06-1114-17/+17
|\ | | | | | | | | | | | | | | | | | | # Conflicts: # 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
| * v3.3.12Sam Potts2018-06-1114-17/+17
| |
* | MergeSam Potts2018-06-111-15/+40
| |
* | Merge branch 'develop' into a11y-improvementsSam Potts2018-06-1129-1167/+1479
|\| | | | | | | | | | | | | | | | | | | | | | | | | # 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 # src/js/captions.js
| * Merge branch 'master' into developSam Potts2018-06-1116-434/+489
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # 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
| | * v3.3.11Sam Potts2018-06-1119-441/+531
| | |
| | * Merge pull request #1009 from friday/contributingSam Potts2018-06-082-11/+56
| | |\ | | | | | | | | Contributing document and codepen demo updates
| | | * Clarifications due to recent non-constructive comments in #1001Albin Larsson2018-06-071-0/+6
| | | |
| | | * Add contributing documentAlbin Larsson2018-06-071-0/+46
| | | |
| | | * Readme: Replace streaming section with codepen templates for all supported ↵Albin Larsson2018-06-071-11/+4
| | | | | | | | | | | | | | | | formats and libraries (and updated code)
| * | | MergeSam Potts2018-06-1114-508/+734
| | | |
| * | | Merge pull request #1024 from friday/event-bubble-detailSam Potts2018-06-111-1/+1
| |\ \ \ | | | | | | | | | | Event "detail" is lost in the synthetic event bubble/proxy
| | * | | Fix synthetic event bubble/proxy loses detailAlbin Larsson2018-06-111-1/+1
| |/ / /
| * | | Merge pull request #1023 from friday/make-utils-staticSam Potts2018-06-112-27/+28
| |\ \ \ | | | | | | | | | | Make utils static
| | * | | Remove wrapper function around utils.is.element in Plyr.setup() (no lnger ↵Albin Larsson2018-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | needed)
| | * | | Avoid using this to refer to utils or utils.is, since that means methods ↵Albin Larsson2018-06-111-17/+17
| | | | | | | | | | | | | | | | | | | | can't be used statically
| | * | | Move utils.is.getConstructor() to utils.getConstructor()Albin Larsson2018-06-111-9/+10
| |/ / /
| * | | Merge pull request #1015 from friday/captions-fixes-againSam Potts2018-06-119-199/+214
| |\ \ \ | | | | | | | | | | Captions rewrite (use index internally to support missing or duplicate languages)
| | * | | TypoAlbin Larsson2018-06-101-2/+2
| | | | |
| | * | | Fix #1017, fix #980, fix #1014: Captions rewrite (use index internally)Albin Larsson2018-06-105-137/+159
| | | | |
| | * | | controls.createMenuItem: Change input to object (too many params made it ↵Albin Larsson2018-06-101-13/+21
| | | | | | | | | | | | | | | | | | | | hard to read)
| | * | | Avoid condition in getTracksAlbin Larsson2018-06-101-7/+4
| | | | |
| | * | | Change debug warn 'Unsupported language option' to log 'Language option ↵Albin Larsson2018-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | doesn't yet exist' since it doesn't have to be an error
| | * | | Fix #1003: Formatted captions issueAlbin Larsson2018-06-103-2/+3
| | | | |
| | * | | Merge captions setText and setCue into updateCues (fixes #998 and vimeo ↵Albin Larsson2018-06-084-57/+44
| | | | | | | | | | | | | | | | | | | | cuechange event)
| * | | | Merge pull request #1020 from friday/1016Sam Potts2018-06-111-0/+8
| |\ \ \ \ | | | | | | | | | | | | Vimeo: Update playback state and assure events are triggered on load
| | * | | | Vimeo: Assure state is updated with autoplay (fixes #1016)Albin Larsson2018-06-111-0/+8
| | | | | |
| * | | | | Merge pull request #1021 from friday/vimeo-seek-while-playingSam Potts2018-06-112-4/+11
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix for YouTube and Vimeo pausing after seek
| | * | | | Fix problem with YouTube and Vimeo seeking while playingAlbin Larsson2018-06-112-4/+11
| |/ / / /
* | | | | WIPSam Potts2018-06-119-59/+112
| | | | |
* | | | | Merge branch 'develop' into a11y-improvementsSam Potts2018-06-0932-2102/+770
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # src/js/captions.js # src/js/plyr.js
| * | | | Restore defaultSam Potts2018-06-099-9/+8
| | | | |
| * | | | Fix Sprite issueSam Potts2018-06-0914-51/+58
| |/ / /
| * | | Merge pull request #1007 from cky917/masterSam Potts2018-06-0816-25/+40
| |\ \ \ | | |_|/ | |/| | fix: After clicking on the progress bar, keyboard operations will not work.
| | * | 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
| | | | |