aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge pull request #510 from platformpurple/feature/loop-eventsSam Potts2017-03-253-5/+61
| |\ \ \ \ | | | | | | | | | | | | Added key bindings for loop
| | * \ \ \ Merge branch 'develop' into feature/loop-eventsSam Potts2017-03-255-72/+108
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add looping key bindings to allowed arrayChrysa Papadopoulou2017-02-142-1/+4
| | | | | |
| | * | | | Removed consoleChrysa Papadopoulou2017-02-142-3/+2
| | | | | |
| | * | | | Added key bindings for loopChrysa Papadopoulou2017-02-143-5/+63
| | | |_|/ | | |/| |
* | | | | Code formattingSam Potts2017-03-251-8/+8
| | | | |
* | | | | Manual merge of #543 PRSam Potts2017-03-254-26/+23
|/ / / /
* | | | Merge pull request #514 from platformpurple/improvement/loop-color-areaSam Potts2017-03-252-4/+23
|\ \ \ \ | | | | | | | | | | Improvement/loop color area
| * \ \ \ Merge branch 'develop' into improvement/loop-color-areaSam Potts2017-03-255-71/+87
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-03-252-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js
| * \ \ \ \ Merge pull request #511 from platformpurple/developSam Potts2017-03-252-4/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fix on typo
* / | | | | Loop variable namingSam Potts2017-03-255-60/+81
|/ / / / /
| | * / / Colored strip indicating looped areaChrysa Papadopoulou2017-02-152-3/+27
| |/ / /
| * | | Fix on typo and gulpChrysa Papadopoulou2017-02-141-1/+1
| | | |
| * | | Fix on typoChrysa Papadopoulou2017-02-141-3/+3
|/ / /
* | | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-02-054-21/+165
|\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js
| * \ \ Merge pull request #490 from platformpurple/developSam Potts2017-02-054-20/+165
| |\ \ \ | | | |/ | | |/| Playback speed and looping controls
| | * | Removed not needed functions + reverted demo.js to previousChrysa Papadopoulou2017-02-033-62/+3
| | | |
| | * | Refactored loop event buttons + on 'No Loop' cleared displayed timingChrysa Papadopoulou2017-02-023-32/+16
| | | |
| | * | Loop functionalityChrysa Papadopoulou2017-02-014-10/+203
| | | |
| | * | Playback speed control settingsChrysa Papadopoulou2017-01-314-15/+42
| |/ /
* / / Menu workSam Potts2017-02-053-36/+37
|/ /
* | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-01-110-0/+0
|\ \
| * \ Merge branch 'develop' of github.com:Selz/plyr into developSam Potts2017-01-102-873/+892
| |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js
| * | | JsBeautifierSam Potts2017-01-103-1158/+1296
| | | |
* | | | ToDo notes, code tidy upSam Potts2017-01-116-709/+827
| |/ / |/| |
* | | JsBeautifier in use, syntax tweaksSam Potts2017-01-103-464/+620
| | |
* | | 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
| |/ /
* | | Merge pull request #458 from amowu/patch-4Sam Potts2017-01-041-2/+6
|\ \ \ | |/ / |/| | fix: parse webVTT time NaN
| * | fix: parse webVTT time NaNAmo Wu2016-12-161-2/+6
|/ /
* | Merge pull request #427 from amowu/patch-2Sam Potts2016-11-271-0/+3
|\ \ | | | | | | Fix cannot scroll after destroyed
| * | 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`
* | Merge pull request #419 from amowu/patch-1Sam Potts2016-11-181-0/+1
|\ \ | | | | | | refactor: miss prefix
| * | refactor: miss prefixAmo Wu2016-11-101-0/+1
|/ / | | | | fix _fullscreen.prefix can't work
* | Quality WIPSam Potts2016-11-064-144/+217
| |
* | Merge branch 'master' into developSam Potts2016-11-065-22/+83
|\| | | | | | | | | | | # Conflicts: # demo/index.html # dist/plyr.js
| * Update readme.mdSam Potts2016-11-021-4/+5
| |
| * Cache bustSam Potts2016-11-021-1/+1
| |
| * v2.0.10Sam Potts2016-11-024-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 Potts2016-11-025-37/+74
| |
| * Merge pull request #408 from gurupras/urlparserSam Potts2016-11-021-0/+19
| |\ | | | | | | Added logic to parse youtube video id
| | * Added logic to parse youtube video idGuru Prasad Srinivasa2016-10-301-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.
* | PiPSam Potts2016-11-017-25/+37
| |
* | Fullscreen fix, stylingSam2016-10-246-22/+27
| |
* | Merge branch 'develop' of https://github.com/Selz/plyr into developSam2016-10-237-37/+96
|\ \
| * | Work on PiPSam Potts2016-10-237-37/+96
| | |
* | | Merge branch 'develop' of https://github.com/Selz/plyr into developSam2016-10-2316-53/+123
|\| | | | | | | | | | | | | | # Conflicts: # src/js/plyr.js
| * | Merge branch 'master' into developSam Potts2016-10-2314-33/+104
| |\| | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # dist/plyr.css # dist/plyr.js
| | * v2.0.9Sam Potts2016-10-234-6/+9
| | | | | | | | | | | | - Temporary patch for the YouTube API issues with `getDuration()` (relates to #374)