aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bug fixesSam Potts2017-05-072-6/+4
|
* Vimeo captions workingSam Potts2017-05-072-88/+85
|
* Merge branch 'develop' of https://github.com/Selz/plyr into developSam Potts2017-05-072-1/+8
|\ | | | | | | | | # Conflicts: # dist/plyr.js
| * Merge pull request #574 from mapmelabs/youtube-loopSam Potts2017-04-282-2/+9
| |\ | | | | | | Implement loop in YouTube
| | * Implement loop in YouTubeAlejandro Iglesias2017-04-272-2/+9
| |/
* / Utils object, work on Vimeo captionsSam Potts2017-05-074-624/+641
|/
* More work on Vimeo captionsSam Potts2017-04-263-61/+89
|
* Merge branch 'develop' of github.com:Selz/plyr into developSam Potts2017-04-259-633/+389
|\
| * Started on Vimeo captionsSam Potts2017-04-254-11/+26
| |
| * TweaksSam Potts2017-04-255-29/+48
| |
| * Tidy upSam Potts2017-04-252-31/+25
| |
| * 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
| | |\ \