aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Built JSSam Potts2017-04-251-2/+2
| | |
| * | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-04-253-17/+8
| |\ \
| | * \ Merge pull request #545 from silverwind/blank-mp4Sam Potts2017-04-252-0/+1
| | |\ \ | | | | | | | | | | Add blank.mp4 to dist files
| | | * \ Merge branch 'develop' into blank-mp4Sam Potts2017-04-2523-1740/+3420
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge pull request #563 from stormrockwell/masterSam Potts2017-04-251-17/+7
| | |\ \ \ | | | | | | | | | | | | removed vimeo id parsing because it is not necessary
| | | * \ \ Merge branch 'develop' into masterSam Potts2017-04-2523-1729/+3419
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | removed vimeo id parsing because it is not necessarystormrockwell2017-04-191-11/+1
| | | | |/ | | | |/|
| | | | * Add blank.mp4 to dist filessilverwind2017-03-252-0/+1
| | | |/ | | | | | | | | | | | | | | | | For a complete "offline" experience, it's necessary to self-host the file, so include it in the dist files for that purpose.
| * | / More work on menus and tidy upSam Potts2017-04-255-585/+320
| |/ /
| * | NotesSam Potts2017-04-221-0/+2
| | |
* | | Gulp tweakSam Potts2017-04-252-3/+2
|/ /
* | NotesSam Potts2017-04-191-3/+1
| |
* | Looping menu (WIP)Sam Potts2017-04-192-15/+36
| |
* | Added notesSam Potts2017-04-191-0/+3
| |
* | Toggle menuSam Potts2017-04-175-60/+78
| |
* | Airplay and PiPSam Potts2017-04-177-28/+53
| |
* | ID fix and styling fixSam Potts2017-04-174-23/+23
| |
* | More work on menusSam Potts2017-04-162-42/+62
| |
* | Cleanup events and referencesSam Potts2017-04-163-107/+181
| |
* | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-04-152-5/+5
|\ \ | | | | | | | | | | | | # Conflicts: # dist/plyr.js
| * | FormattingSam Potts2017-04-152-9/+9
| | |
* | | FormattingSam Potts2017-04-153-22/+43
|/ /
* | Merge branch 'develop' of github.com:Selz/plyr into developSam Potts2017-03-295-15/+26
|\ \ | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js
| * \ Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-03-285-92/+199
| |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js
| * | | TweaksSam Potts2017-03-285-18/+26
| | | |
* | | | NamespacingSam Potts2017-03-292-566/+578
| |/ / |/| |
* | | Menu creation (WIP)Sam Potts2017-03-285-98/+202
|/ /
* | Controls rewriteSam Potts2017-03-272-313/+321
| |
* | WIP on new controls creationSam Potts2017-03-264-493/+661
| |
* | Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-03-252-27/+90
|\ \
| * \ Merge pull request #520 from platformpurple/feature/subtitlesSam Potts2017-03-252-27/+90
| |\ \ | | | | | | | | Feature/subtitles
| | * \ Merge branch 'develop' into feature/subtitlesSam Potts2017-03-2513-131/+275
| | |\ \ | | |/ / | |/| |
| | * | remove commented out codeMarios Tasos2017-03-241-7/+2
| | | |
| | * | toggle quality optionsMarios Tasos2017-03-241-4/+13
| | | |
| | * | make config.captions.selectedIndex numberMarios Tasos2017-03-221-2/+2
| | | |
| | * | set captionExists to true if selectedIndex is bigger than capt sourceMarios Tasos2017-03-221-1/+1
| | | |
| | * | fix data typo in language buttonMarios Tasos2017-03-181-1/+1
| | | |
| | * | 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.