aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'develop' of https://github.com/Selz/plyr into developSam2016-10-2316-53/+123
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/js/plyr.js
| | * | | | | | Merge branch 'master' into developSam Potts2016-10-2314-33/+104
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # dist/plyr.css # dist/plyr.js
| | * | | | | | | Fixed for array passed to _on and _offSam Potts2016-10-036-25/+24
| | | | | | | | |
| * | | | | | | | TweaksSam2016-10-231-14/+11
| |/ / / / / / /
| * | | | | | | Merge branch 'master' into developSam2016-10-011-3/+14
| |\ \ \ \ \ \ \
| * | | | | | | | Code styleSam2016-10-011-7/+5
| | | | | | | | |
| * | | | | | | | Manually merged #385Sam2016-10-018-28/+134
| | | | | | | | |
| * | | | | | | | Menu animationSam2016-09-264-87/+138
| | | | | | | | |
| * | | | | | | | MenuSam2016-09-255-10/+10
| | | | | | | | |
| * | | | | | | | More menu workSam Potts2016-09-257-63/+200
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2016-09-147-118/+128
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.css # dist/plyr.js
| | * | | | | | | | Started on PIP supportSam2016-09-135-113/+121
| | | | | | | | | |
| * | | | | | | | | ExpandedSam Potts2016-09-134-6/+6
| |/ / / / / / / /
| * | | | | | | | Added quality in menuSam Potts2016-09-076-12/+23
| | | | | | | | |
| * | | | | | | | Icon fixSam2016-09-062-13/+7
| | | | | | | | |
| * | | | | | | | Working on settings menuSam2016-09-069-98/+200
| | | | | | | | |
| * | | | | | | | Merge pull request #356 from amowu/feature/add-playback-speedSam Potts2016-09-063-5/+100
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add playback speed
| | * | | | | | | | refactor: sorting speedAmo Wu2016-09-051-2/+2
| | | | | | | | | |
| | * | | | | | | | test: add `speed-up` buttonAmo Wu2016-09-051-1/+2
| | | | | | | | | |
| | * | | | | | | | docs: update readmeAmo Wu2016-08-311-1/+7
| | | | | | | | | |
| | * | | | | | | | refactor: check config.speeds formatAmo Wu2016-08-311-0/+4
| | | | | | | | | |
| | * | | | | | | | refactor: add localStorage supportingAmo Wu2016-08-311-0/+16
| | | | | | | | | |
| | * | | | | | | | feat: add playback speed buttonAmo Wu2016-08-311-3/+71
| |/ / / / / / / /
* | | | | | | | | Merge pull request #795 from frogg/patch-1Sam Potts2018-03-101-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added link that explains Webkit's autoplay blocker
| * | | | | | | | | Added link that explains Webkit's autoplay blockerFrederik Riedel2018-02-241-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #769 from redxtech/add-vue-plyr-to-readmeSam Potts2018-02-061-0/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Add vue-plyr to readme
| * | | | | | | | Add vue-plyr to readmeGabriel Dunn2018-01-281-0/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #740 from gurinderhans/masterSam Potts2018-01-071-0/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | double click player to toggle fullscreen
| * | | | | | | add comment about no fullscreen if player type is audioGurinder Hans2017-12-231-0/+2
| | | | | | | |
| * | | | | | | add double click to make full screen supportGurinder Hans2017-12-231-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #726 from xDae/masterSam Potts2018-01-051-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added react port
| * | | | | | | | Added react portJose Miguel Bejarano2017-12-041-0/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #743 from jwpage/patch-1Sam Potts2018-01-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix `enabled` smartphone example in README
| * | | | | | | Fix `enabled` smartphone example in READMEJohnson Page2018-01-031-1/+1
|/ / / / / / /
* | | | | | | Fix for YouTube .getVideoData() issue (fixes #709)Sam Potts2017-11-146-10/+15
| | | | | | |
* | | | | | | Update readme.mdSam Potts2017-11-071-1/+1
| | | | | | |
* | | | | | | Merge pull request #696 from yuriykuzin/enable-speed-controls-on-vimeoSam Potts2017-11-061-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Enable speed controls using Vimeo API
| * \ \ \ \ \ \ Merge branch 'master' into enable-speed-controls-on-vimeoSam Potts2017-11-0616-799/+5446
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Vimeo fixes + small bug fixesSam Potts2017-11-0414-814/+5405
| | | | | | | |
* | | | | | | | Merge pull request #577 from brandon-pereira/masterSam Potts2017-11-043-5/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix for svg4everybody conflicting with plyr
| * \ \ \ \ \ \ \ Merge branch 'master' into masterSam Potts2017-11-040-0/+0
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into masterSam Potts2017-11-0417-1164/+1448
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #613 from vers-one/masterSam Potts2017-11-042-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix for handling explicitly set duration of audio
| * \ \ \ \ \ \ \ \ Merge branch 'master' into masterSam Potts2017-11-040-0/+0
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into masterSam Potts2017-11-0415-1128/+1408
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #617 from oemueller/patch-1Sam Potts2017-11-041-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [bugfix] target is null exception
| * | | | | | | | | | [bugfix] target is null exceptionOliver2017-07-121-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using 'play-large' without a 'play' button, the statement target = target[0]; caused an error. So it is necessary to check the value of target before accessing [0]
* | | | | | | | | | | Merge pull request #649 from waltercruz/masterSam Potts2017-11-046-5/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adding title to the player html template
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into masterSam Potts2017-11-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into masterSam Potts2017-11-0412-1118/+1392
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |