aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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-253-102/+189
|\ \
| * | Merge branch 'master' into developSam Potts2017-03-253-3/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | # 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-273-87/+117
| | |/
| * | Manual merge of #509Sam Potts2017-03-252-0/+4
| | |
| * | 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
| | | | |
| * | | | Manual merge of #543 PRSam Potts2017-03-252-23/+20
| | |/ / | |/| |
| * | | 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-242-65/+66
|\| |
| * | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-02-051-18/+153
| |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js
| * | | Menu workSam Potts2017-02-052-34/+35
| | | |
* | | | Subtitles tracksChrysa Papadopoulou2017-02-241-11/+57
| |/ / |/| |
* | | Removed not needed functions + reverted demo.js to previousChrysa Papadopoulou2017-02-031-60/+1
| | |
* | | Refactored loop event buttons + on 'No Loop' cleared displayed timingChrysa Papadopoulou2017-02-021-29/+13
| | |
* | | Loop functionalityChrysa Papadopoulou2017-02-011-6/+193
| | |
* | | Playback speed control settingsChrysa Papadopoulou2017-01-311-12/+36
|/ /
* | ToDo notes, code tidy upSam Potts2017-01-111-647/+741
| |
* | JsBeautifier in use, syntax tweaksSam Potts2017-01-101-461/+596
| |
* | Merge pull request #457 from amowu/patch-3Sam Potts2017-01-041-8/+5
|\ \ | | | | | | fix: Firefox can not display captions
| * | fix: Firefox can not display captionsAmo Wu2016-12-151-8/+5
| | |
* | | fix: parse webVTT time NaNAmo Wu2016-12-161-2/+6
|/ /
* | Fix cannot scroll after destroyedAmo Wu2016-11-241-0/+3
| | | | | | In single page application, switch router when plyr is fullscreen mode, page cannot scroll, because `document.body.style.overflow` is `hidden`
* | refactor: miss prefixAmo Wu2016-11-101-0/+1
| | | | | | fix _fullscreen.prefix can't work
* | Quality WIPSam Potts2016-11-062-141/+214
| |