aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | check if captions existsMarios Tasos2017-03-151-13/+16
| | | |
| | * | Conflicts and tracks array on configChrysa Papadopoulou2017-02-243-67/+68
| | |\ \
| | * | | Subtitles tracksChrysa Papadopoulou2017-02-242-13/+59
| | | | |
* | | | | NotesSam Potts2017-03-251-3/+5
|/ / / /
* | | | Merge branch 'master' into developSam Potts2017-03-2510-26/+76
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | # 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-257-11/+11
| | | |
| * | | Changelog updateSam Potts2017-03-251-0/+4
| | | |
| * | | 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
| | | | |
| * | | | Merge pull request #504 from ShimShamSam/masterSam Potts2017-03-256-6/+13
| |\ \ \ \ | | | | | | | | | | | | Add blankUrl option to set the URL for blank.mp4
| | * | | | Generated dist filesSamuel Hodge2017-02-124-5/+5
| | | | | |
| | * | | | Documented the blankUrl optionSamuel Hodge2017-02-111-0/+6
| | | | | |
| | * | | | 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.
| * | | | | Update readme.mdSam Potts2017-03-091-2/+2
| |/ / / /
| * | | | Update readme.mdSam Potts2017-02-101-0/+1
| | | | |
| * | | | Update readme.mdSam Potts2017-02-101-1/+3
| | | | |
| * | | | Update readme.mdSam Potts2017-02-091-1/+1
| | | | |
| * | | | Update readme.mdSam Potts2017-02-091-0/+6
| | | | |
| * | | | Merge pull request #437 from tv2/playgroundSam Potts2017-01-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fixed typo
| | * | | | Fixed typoMorten Vestergaard Hansen2016-11-301-1/+1
| | |/ / /
| * | | | Merge pull request #477 from iamrobert/patch-1Sam Potts2017-01-101-2/+2
| |\ \ \ \ | | | | | | | | | | | | Update index.html
| | * | | | Update index.htmlRobert Stark2017-01-101-2/+2
| |/ / / / | | | | | | | | | | Just missing the closing </li>
| * | | | Update issue_template.mdSam Potts2017-01-101-1/+1
| | | | |
| * | | | Update issue_template.mdSam Potts2017-01-101-1/+11
| |/ / /
| * | | v2.0.11Sam Potts2016-11-275-19/+23
| | | |
| * | | Merge branch 'master' of https://github.com/Selz/plyrSam Potts2016-11-272-4/+8
| |\ \ \
| | * \ \ Merge pull request #425 from sebastiancarlsson/cleanup-called-twice-bugSam Potts2016-11-181-49/+51
| | |\ \ \ | | | | | | | | | | | | fixes bug where cleanUp would be called twice
| | | * | | fixes bug where cleanUp would be called twiceSebastian Carlsson2016-11-171-49/+51
| | |/ / /
| | * | | UpdateSam Potts2016-11-161-1/+1
| | | | |
| | * | | Update readme.mdSam Potts2016-11-161-3/+5
| | | | |
| * | | | Fix for iPad and YouTube issuesSam Potts2016-11-276-91/+121
| |/ / /
* | | | Manual merge of #509Sam Potts2017-03-253-1/+5
| | | |
* | | | Clean upSam Potts2017-03-252-53/+41
| | | |
* | | | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-03-253-6/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js
| * \ \ \ 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-24 13:47:55 +0000