Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | WIP on new controls creation | Sam Potts | 2017-03-26 | 1 | -465/+637 |
| | |||||
* | Merge branch 'develop' into feature/subtitles | Sam Potts | 2017-03-25 | 3 | -102/+189 |
|\ | |||||
| * | Merge branch 'master' into develop | Sam Potts | 2017-03-25 | 3 | -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.12 | Sam Potts | 2017-03-25 | 1 | -2/+2 |
| | | | |||||
| | * | Merge pull request #468 from jronallo/captions-listener | Sam Potts | 2017-03-25 | 1 | -1/+1 |
| | |\ | | | | | | | | | allow for setting additional listener for captions | ||||
| | | * | allow for setting additional listener for captions | Jason Ronallo | 2016-12-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Allow configuration of the blank.mp4 URL | Samuel Hodge | 2017-02-11 | 1 | -1/+2 |
| | | | | | | | | | | | | This is useful for people behind firewalls who need to host a blank mp4 themselves. | ||||
| | * | | Fixed typo | Morten Vestergaard Hansen | 2016-11-30 | 1 | -1/+1 |
| | |/ | |||||
| | * | v2.0.11 | Sam Potts | 2016-11-27 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/Selz/plyr | Sam Potts | 2016-11-27 | 1 | -1/+3 |
| | |\ | |||||
| | | * | fixes bug where cleanUp would be called twice | Sebastian Carlsson | 2016-11-17 | 1 | -49/+51 |
| | | | | |||||
| | * | | Fix for iPad and YouTube issues | Sam Potts | 2016-11-27 | 3 | -87/+117 |
| | |/ | |||||
| * | | Manual merge of #509 | Sam Potts | 2017-03-25 | 2 | -0/+4 |
| | | | |||||
| * | | Clean up | Sam Potts | 2017-03-25 | 1 | -51/+39 |
| | | | |||||
| * | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 1 | -3/+39 |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | ||||
| | * \ | Merge branch 'develop' into feature/loop-events | Sam Potts | 2017-03-25 | 1 | -66/+100 |
| | |\ \ | |||||
| | * | | | Add looping key bindings to allowed array | Chrysa Papadopoulou | 2017-02-14 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Removed console | Chrysa Papadopoulou | 2017-02-14 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Added key bindings for loop | Chrysa Papadopoulou | 2017-02-14 | 1 | -2/+40 |
| | | | | | |||||
| * | | | | Code formatting | Sam Potts | 2017-03-25 | 1 | -8/+8 |
| | | | | | |||||
| * | | | | Manual merge of #543 PR | Sam Potts | 2017-03-25 | 2 | -23/+20 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'develop' into improvement/loop-color-area | Sam Potts | 2017-03-25 | 1 | -65/+79 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 1 | -3/+3 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | ||||
| | * | | | | Loop variable naming | Sam Potts | 2017-03-25 | 1 | -54/+73 |
| | | |/ / | | |/| | | |||||
| * | | | | Colored strip indicating looped area | Chrysa Papadopoulou | 2017-02-15 | 1 | -1/+25 |
| | |/ / | |/| | | |||||
| * | | | Fix on typo | Chrysa Papadopoulou | 2017-02-14 | 1 | -3/+3 |
| |/ / | |||||
* | | | remove commented out code | Marios Tasos | 2017-03-24 | 1 | -7/+2 |
| | | | |||||
* | | | toggle quality options | Marios Tasos | 2017-03-24 | 1 | -4/+13 |
| | | | |||||
* | | | make config.captions.selectedIndex number | Marios Tasos | 2017-03-22 | 1 | -2/+2 |
| | | | |||||
* | | | set captionExists to true if selectedIndex is bigger than capt source | Marios Tasos | 2017-03-22 | 1 | -1/+1 |
| | | | |||||
* | | | fix data typo in language button | Marios Tasos | 2017-03-18 | 1 | -1/+1 |
| | | | |||||
* | | | check if captions exists | Marios Tasos | 2017-03-15 | 1 | -13/+16 |
| | | | |||||
* | | | Conflicts and tracks array on config | Chrysa Papadopoulou | 2017-02-24 | 2 | -65/+66 |
|\| | | |||||
| * | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-02-05 | 1 | -18/+153 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | ||||
| * | | | Menu work | Sam Potts | 2017-02-05 | 2 | -34/+35 |
| | | | | |||||
* | | | | Subtitles tracks | Chrysa Papadopoulou | 2017-02-24 | 1 | -11/+57 |
| |/ / |/| | | |||||
* | | | Removed not needed functions + reverted demo.js to previous | Chrysa Papadopoulou | 2017-02-03 | 1 | -60/+1 |
| | | | |||||
* | | | Refactored loop event buttons + on 'No Loop' cleared displayed timing | Chrysa Papadopoulou | 2017-02-02 | 1 | -29/+13 |
| | | | |||||
* | | | Loop functionality | Chrysa Papadopoulou | 2017-02-01 | 1 | -6/+193 |
| | | | |||||
* | | | Playback speed control settings | Chrysa Papadopoulou | 2017-01-31 | 1 | -12/+36 |
|/ / | |||||
* | | ToDo notes, code tidy up | Sam Potts | 2017-01-11 | 1 | -647/+741 |
| | | |||||
* | | JsBeautifier in use, syntax tweaks | Sam Potts | 2017-01-10 | 1 | -461/+596 |
| | | |||||
* | | Merge pull request #457 from amowu/patch-3 | Sam Potts | 2017-01-04 | 1 | -8/+5 |
|\ \ | | | | | | | fix: Firefox can not display captions | ||||
| * | | fix: Firefox can not display captions | Amo Wu | 2016-12-15 | 1 | -8/+5 |
| | | | |||||
* | | | fix: parse webVTT time NaN | Amo Wu | 2016-12-16 | 1 | -2/+6 |
|/ / | |||||
* | | Fix cannot scroll after destroyed | Amo Wu | 2016-11-24 | 1 | -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 prefix | Amo Wu | 2016-11-10 | 1 | -0/+1 |
| | | | | | | fix _fullscreen.prefix can't work | ||||
* | | Quality WIP | Sam Potts | 2016-11-06 | 2 | -141/+214 |
| | | |||||
* | | Merge branch 'master' into develop | Sam Potts | 2016-11-06 | 1 | -6/+46 |
|\| | | | | | | | | | | | # Conflicts: # demo/index.html # dist/plyr.js | ||||
| * | v2.0.10 | Sam Potts | 2016-11-02 | 1 | -2/+2 |
| | | | | | | | | | | - Added seek event fixes for Vimeo and YouTube (fixes #409) - Added support for embed URLs rather than ID only (fixes #345) |