Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge pull request #510 from platformpurple/feature/loop-events | Sam Potts | 2017-03-25 | 3 | -5/+61 | |
| |\ \ \ \ | | | | | | | | | | | | | Added key bindings for loop | |||||
| | * \ \ \ | Merge branch 'develop' into feature/loop-events | Sam Potts | 2017-03-25 | 5 | -72/+108 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Add looping key bindings to allowed array | Chrysa Papadopoulou | 2017-02-14 | 2 | -1/+4 | |
| | | | | | | ||||||
| | * | | | | Removed console | Chrysa Papadopoulou | 2017-02-14 | 2 | -3/+2 | |
| | | | | | | ||||||
| | * | | | | Added key bindings for loop | Chrysa Papadopoulou | 2017-02-14 | 3 | -5/+63 | |
| | | |_|/ | | |/| | | ||||||
* | | | | | Code formatting | Sam Potts | 2017-03-25 | 1 | -8/+8 | |
| | | | | | ||||||
* | | | | | Manual merge of #543 PR | Sam Potts | 2017-03-25 | 4 | -26/+23 | |
|/ / / / | ||||||
* | | | | Merge pull request #514 from platformpurple/improvement/loop-color-area | Sam Potts | 2017-03-25 | 2 | -4/+23 | |
|\ \ \ \ | | | | | | | | | | | Improvement/loop color area | |||||
| * \ \ \ | Merge branch 'develop' into improvement/loop-color-area | Sam Potts | 2017-03-25 | 5 | -71/+87 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 2 | -5/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| * \ \ \ \ | Merge pull request #511 from platformpurple/develop | Sam Potts | 2017-03-25 | 2 | -4/+4 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Fix on typo | |||||
* / | | | | | Loop variable naming | Sam Potts | 2017-03-25 | 5 | -60/+81 | |
|/ / / / / | ||||||
| | * / / | Colored strip indicating looped area | Chrysa Papadopoulou | 2017-02-15 | 2 | -3/+27 | |
| |/ / / | ||||||
| * | | | Fix on typo and gulp | Chrysa Papadopoulou | 2017-02-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix on typo | Chrysa Papadopoulou | 2017-02-14 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-02-05 | 4 | -21/+165 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | |||||
| * \ \ | Merge pull request #490 from platformpurple/develop | Sam Potts | 2017-02-05 | 4 | -20/+165 | |
| |\ \ \ | | | |/ | | |/| | Playback speed and looping controls | |||||
| | * | | Removed not needed functions + reverted demo.js to previous | Chrysa Papadopoulou | 2017-02-03 | 3 | -62/+3 | |
| | | | | ||||||
| | * | | Refactored loop event buttons + on 'No Loop' cleared displayed timing | Chrysa Papadopoulou | 2017-02-02 | 3 | -32/+16 | |
| | | | | ||||||
| | * | | Loop functionality | Chrysa Papadopoulou | 2017-02-01 | 4 | -10/+203 | |
| | | | | ||||||
| | * | | Playback speed control settings | Chrysa Papadopoulou | 2017-01-31 | 4 | -15/+42 | |
| |/ / | ||||||
* / / | Menu work | Sam Potts | 2017-02-05 | 3 | -36/+37 | |
|/ / | ||||||
* | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-01-11 | 0 | -0/+0 | |
|\ \ | ||||||
| * \ | Merge branch 'develop' of github.com:Selz/plyr into develop | Sam Potts | 2017-01-10 | 2 | -873/+892 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | |||||
| * | | | JsBeautifier | Sam Potts | 2017-01-10 | 3 | -1158/+1296 | |
| | | | | ||||||
* | | | | ToDo notes, code tidy up | Sam Potts | 2017-01-11 | 6 | -709/+827 | |
| |/ / |/| | | ||||||
* | | | JsBeautifier in use, syntax tweaks | Sam Potts | 2017-01-10 | 3 | -464/+620 | |
| | | | ||||||
* | | | 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 | |
| |/ / | ||||||
* | | | Merge pull request #458 from amowu/patch-4 | Sam Potts | 2017-01-04 | 1 | -2/+6 | |
|\ \ \ | |/ / |/| | | fix: parse webVTT time NaN | |||||
| * | | fix: parse webVTT time NaN | Amo Wu | 2016-12-16 | 1 | -2/+6 | |
|/ / | ||||||
* | | Merge pull request #427 from amowu/patch-2 | Sam Potts | 2016-11-27 | 1 | -0/+3 | |
|\ \ | | | | | | | Fix cannot scroll after destroyed | |||||
| * | | 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` | |||||
* | | Merge pull request #419 from amowu/patch-1 | Sam Potts | 2016-11-18 | 1 | -0/+1 | |
|\ \ | | | | | | | refactor: miss prefix | |||||
| * | | refactor: miss prefix | Amo Wu | 2016-11-10 | 1 | -0/+1 | |
|/ / | | | | | fix _fullscreen.prefix can't work | |||||
* | | Quality WIP | Sam Potts | 2016-11-06 | 4 | -144/+217 | |
| | | ||||||
* | | Merge branch 'master' into develop | Sam Potts | 2016-11-06 | 5 | -22/+83 | |
|\| | | | | | | | | | | | # Conflicts: # demo/index.html # dist/plyr.js | |||||
| * | Update readme.md | Sam Potts | 2016-11-02 | 1 | -4/+5 | |
| | | ||||||
| * | Cache bust | Sam Potts | 2016-11-02 | 1 | -1/+1 | |
| | | ||||||
| * | v2.0.10 | Sam Potts | 2016-11-02 | 4 | -6/+10 | |
| | | | | | | | | | | - Added seek event fixes for Vimeo and YouTube (fixes #409) - Added support for embed URLs rather than ID only (fixes #345) | |||||
| * | Added seek event fixes (fixes #409), Added support for URLs (fixes #345) | Sam Potts | 2016-11-02 | 5 | -37/+74 | |
| | | ||||||
| * | Merge pull request #408 from gurupras/urlparser | Sam Potts | 2016-11-02 | 1 | -0/+19 | |
| |\ | | | | | | | Added logic to parse youtube video id | |||||
| | * | Added logic to parse youtube video id | Guru Prasad Srinivasa | 2016-10-30 | 1 | -0/+19 | |
| |/ | | | | | | | | | | | | | | | | | This commit is targetted at solving issue#345 and adds functionality to parse youtube video IDs from various types of youtube video URLs. Other embed types like vimeo/soundcloud can be extended by following a similar structure as implemented in this commit. | |||||
* | | PiP | Sam Potts | 2016-11-01 | 7 | -25/+37 | |
| | | ||||||
* | | Fullscreen fix, styling | Sam | 2016-10-24 | 6 | -22/+27 | |
| | | ||||||
* | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam | 2016-10-23 | 7 | -37/+96 | |
|\ \ | ||||||
| * | | Work on PiP | Sam Potts | 2016-10-23 | 7 | -37/+96 | |
| | | | ||||||
* | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam | 2016-10-23 | 16 | -53/+123 | |
|\| | | | | | | | | | | | | | | # Conflicts: # src/js/plyr.js | |||||
| * | | Merge branch 'master' into develop | Sam Potts | 2016-10-23 | 14 | -33/+104 | |
| |\| | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # dist/plyr.css # dist/plyr.js | |||||
| | * | v2.0.9 | Sam Potts | 2016-10-23 | 4 | -6/+9 | |
| | | | | | | | | | | | | - Temporary patch for the YouTube API issues with `getDuration()` (relates to #374) |