Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ |/| | |||||
* | | 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 |
|/ | |||||
* | 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 | ||||
| * | 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 |
| | | |||||
* | | Menu work | Sam Potts | 2017-02-05 | 1 | -8/+11 |
|/ | |||||
* | 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 | 1 | -32/+96 |
| | |||||
* | 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) | ||||
| * | Added seek event fixes (fixes #409), Added support for URLs (fixes #345) | Sam Potts | 2016-11-02 | 1 | -23/+44 |
| | | |||||
| * | 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 | 1 | -15/+23 |
| | | |||||
* | | Fullscreen fix, styling | Sam | 2016-10-24 | 1 | -12/+17 |
| | | |||||
* | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam | 2016-10-23 | 1 | -32/+77 |
|\ \ | |||||
| * | | Work on PiP | Sam Potts | 2016-10-23 | 1 | -32/+77 |
| | | | |||||
* | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam | 2016-10-23 | 1 | -20/+28 |
|\| | | | | | | | | | | | | | | # Conflicts: # src/js/plyr.js | ||||
| * | | Merge branch 'master' into develop | Sam Potts | 2016-10-23 | 1 | -3/+12 |
| |\| | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # dist/plyr.css # dist/plyr.js | ||||
| | * | v2.0.9 | Sam Potts | 2016-10-23 | 1 | -2/+2 |
| | | | | | | | | | | | | - Temporary patch for the YouTube API issues with `getDuration()` (relates to #374) | ||||
| | * | Temporary patch for the YouTube API issues with `getDuration()` (relates to ↵ | Sam Potts | 2016-10-23 | 1 | -0/+8 |
| | | | | | | | | | | | | #374) | ||||
| | * | v2.0.8 | Sam Potts | 2016-10-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added `isPaused()` API method (thanks to @darrena092) - Allowed `.on()` API method to be chainable (thanks to @gurupras) (fixes #357) - Improved the "awful" rendering of captions on small screens in fullscreen mode (fixes #390) - Fix for Firefox VTT compatibility (thanks to @magourex) - Fix for Firefox Developer Edition blank video due to `-webkit-mask-image` issue (fixes #392) - Added Issue and PR templates with the aim of reducing duplicate or duff issues | ||||
| | * | Manually merged #395 | Sam Potts | 2016-10-23 | 1 | -1/+1 |
| | | | |||||
| | * | Added .isPaused to API | Darren Anderson | 2016-10-06 | 1 | -0/+1 |
| | | | |||||
| * | | Fixed for array passed to _on and _off | Sam Potts | 2016-10-03 | 1 | -19/+18 |
| | | | |||||
* | | | Tweaks | Sam | 2016-10-23 | 1 | -14/+11 |
|/ / | |||||
* | | Merge branch 'master' into develop | Sam | 2016-10-01 | 1 | -3/+14 |
|\| | |||||
| * | Update plyr.js | Thomas LM | 2016-09-27 | 1 | -3/+14 |
| | | |||||
* | | Code style | Sam | 2016-10-01 | 1 | -7/+5 |
| | | |||||
* | | Manually merged #385 | Sam | 2016-10-01 | 1 | -18/+63 |
| | | |||||
* | | Menu animation | Sam | 2016-09-26 | 1 | -84/+116 |
| | | |||||
* | | Menu | Sam | 2016-09-25 | 1 | -2/+2 |
| | | |||||
* | | More menu work | Sam Potts | 2016-09-25 | 1 | -30/+112 |
| | | |||||
* | | Started on PIP support | Sam | 2016-09-13 | 1 | -107/+114 |
| | |