aboutsummaryrefslogtreecommitdiffstats
path: root/src/js
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'develop' into masterSam Potts2017-04-251-1536/+2847
| |\
| * | removed vimeo id parsing because it is not necessarystormrockwell2017-04-191-11/+1
| | |
* | | More work on menus and tidy upSam Potts2017-04-251-578/+309
| |/ |/|
* | Looping menu (WIP)Sam Potts2017-04-191-13/+34
| |
* | Toggle menuSam Potts2017-04-171-55/+71
| |
* | Airplay and PiPSam Potts2017-04-171-15/+32
| |
* | ID fix and styling fixSam Potts2017-04-171-16/+14
| |
* | More work on menusSam Potts2017-04-161-40/+60
| |
* | Cleanup events and referencesSam Potts2017-04-161-104/+168
| |
* | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-04-151-3/+3
|\ \ | | | | | | | | | | | | # Conflicts: # dist/plyr.js
| * | FormattingSam Potts2017-04-151-7/+7
| | |
* | | FormattingSam Potts2017-04-151-10/+29
|/ /
* | Merge branch 'develop' of github.com:Selz/plyr into developSam Potts2017-03-291-10/+21
|\ \ | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js
| * \ Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-03-281-81/+193
| |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js
| * | | TweaksSam Potts2017-03-281-13/+21
| | | |
* | | | NamespacingSam Potts2017-03-291-564/+576
| |/ / |/| |
* | | Menu creation (WIP)Sam Potts2017-03-281-87/+196
|/ /
* | Controls rewriteSam Potts2017-03-271-311/+319
| |
* | WIP on new controls creationSam Potts2017-03-261-465/+637
| |
* | Merge branch 'develop' into feature/subtitlesSam Potts2017-03-251-77/+148
|\ \
| * | Merge branch 'master' into developSam Potts2017-03-251-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.css # dist/plyr.js # src/js/plyr.js # src/less/plyr.less # src/scss/plyr.scss
| | * Version bump to 2.0.12Sam Potts2017-03-251-2/+2
| | |
| | * Merge pull request #468 from jronallo/captions-listenerSam Potts2017-03-251-1/+1
| | |\ | | | | | | | | allow for setting additional listener for captions
| | | * allow for setting additional listener for captionsJason Ronallo2016-12-261-1/+1
| | | |
| | * | Allow configuration of the blank.mp4 URLSamuel Hodge2017-02-111-1/+2
| | | | | | | | | | | | This is useful for people behind firewalls who need to host a blank mp4 themselves.
| | * | Fixed typoMorten Vestergaard Hansen2016-11-301-1/+1
| | |/
| | * v2.0.11Sam Potts2016-11-271-2/+2
| | |
| | * Merge branch 'master' of https://github.com/Selz/plyrSam Potts2016-11-271-1/+3
| | |\
| | | * fixes bug where cleanUp would be called twiceSebastian Carlsson2016-11-171-49/+51
| | | |
| | * | Fix for iPad and YouTube issuesSam Potts2016-11-271-56/+77
| | |/
| * | Clean upSam Potts2017-03-251-51/+39
| | |
| * | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-03-251-3/+39
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js
| | * \ Merge branch 'develop' into feature/loop-eventsSam Potts2017-03-251-66/+100
| | |\ \
| | * | | Add looping key bindings to allowed arrayChrysa Papadopoulou2017-02-141-0/+3
| | | | |
| | * | | Removed consoleChrysa Papadopoulou2017-02-141-1/+0
| | | | |
| | * | | Added key bindings for loopChrysa Papadopoulou2017-02-141-2/+40
| | | | |
| * | | | Code formattingSam Potts2017-03-251-8/+8
| | |/ / | |/| |
| * | | Merge branch 'develop' into improvement/loop-color-areaSam Potts2017-03-251-65/+79
| |\ \ \
| | * \ \ Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-03-251-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js
| | * | | | Loop variable namingSam Potts2017-03-251-54/+73
| | | |/ / | | |/| |
| * | | | Colored strip indicating looped areaChrysa Papadopoulou2017-02-151-1/+25
| | |/ / | |/| |
| * | | Fix on typoChrysa Papadopoulou2017-02-141-3/+3
| |/ /
* | | remove commented out codeMarios Tasos2017-03-241-7/+2
| | |
* | | toggle quality optionsMarios Tasos2017-03-241-4/+13
| | |
* | | make config.captions.selectedIndex numberMarios Tasos2017-03-221-2/+2
| | |
* | | set captionExists to true if selectedIndex is bigger than capt sourceMarios Tasos2017-03-221-1/+1
| | |
* | | fix data typo in language buttonMarios Tasos2017-03-181-1/+1
| | |
* | | check if captions existsMarios Tasos2017-03-151-13/+16
| | |
* | | Conflicts and tracks array on configChrysa Papadopoulou2017-02-241-39/+42
|\| |
| * | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-02-051-18/+153
| |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js