Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-04-25 | 3 | -17/+8 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | Merge pull request #545 from silverwind/blank-mp4 | Sam Potts | 2017-04-25 | 2 | -0/+1 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Add blank.mp4 to dist files | |||||
| | | | * \ \ \ | Merge branch 'develop' into blank-mp4 | Sam Potts | 2017-04-25 | 23 | -1740/+3420 | |
| | | | |\ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | | * | | | | | Merge pull request #563 from stormrockwell/master | Sam Potts | 2017-04-25 | 1 | -17/+7 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | removed vimeo id parsing because it is not necessary | |||||
| | | | * \ \ \ \ | Merge branch 'develop' into master | Sam Potts | 2017-04-25 | 23 | -1729/+3419 | |
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | ||||||
| | | | * | | | | | removed vimeo id parsing because it is not necessary | stormrockwell | 2017-04-19 | 1 | -11/+1 | |
| | | | | | | | | | ||||||
| | | | | * | | | | Add blank.mp4 to dist files | silverwind | 2017-03-25 | 2 | -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 up | Sam Potts | 2017-04-25 | 5 | -585/+320 | |
| | |/ / / / / | ||||||
| | * | | | | | Notes | Sam Potts | 2017-04-22 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Gulp tweak | Sam Potts | 2017-04-25 | 2 | -3/+2 | |
| |/ / / / / | ||||||
| * | | | | | Notes | Sam Potts | 2017-04-19 | 1 | -3/+1 | |
| | | | | | | ||||||
| * | | | | | Looping menu (WIP) | Sam Potts | 2017-04-19 | 2 | -15/+36 | |
| | | | | | | ||||||
| * | | | | | Added notes | Sam Potts | 2017-04-19 | 1 | -0/+3 | |
| | | | | | | ||||||
| * | | | | | Toggle menu | Sam Potts | 2017-04-17 | 5 | -60/+78 | |
| | | | | | | ||||||
| * | | | | | Airplay and PiP | Sam Potts | 2017-04-17 | 7 | -28/+53 | |
| | | | | | | ||||||
| * | | | | | ID fix and styling fix | Sam Potts | 2017-04-17 | 4 | -23/+23 | |
| | | | | | | ||||||
| * | | | | | More work on menus | Sam Potts | 2017-04-16 | 2 | -42/+62 | |
| | | | | | | ||||||
| * | | | | | Cleanup events and references | Sam Potts | 2017-04-16 | 3 | -107/+181 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-04-15 | 2 | -5/+5 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| | * | | | | | Formatting | Sam Potts | 2017-04-15 | 2 | -9/+9 | |
| | | | | | | | ||||||
| * | | | | | | Formatting | Sam Potts | 2017-04-15 | 3 | -22/+43 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch 'develop' of github.com:Selz/plyr into develop | Sam Potts | 2017-03-29 | 5 | -15/+26 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | |||||
| | * \ \ \ \ | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-28 | 5 | -92/+199 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | |||||
| | * | | | | | | Tweaks | Sam Potts | 2017-03-28 | 5 | -18/+26 | |
| | | | | | | | | ||||||
| * | | | | | | | Namespacing | Sam Potts | 2017-03-29 | 2 | -566/+578 | |
| | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Menu creation (WIP) | Sam Potts | 2017-03-28 | 5 | -98/+202 | |
| |/ / / / / | ||||||
| * | | | | | Controls rewrite | Sam Potts | 2017-03-27 | 2 | -313/+321 | |
| | | | | | | ||||||
| * | | | | | WIP on new controls creation | Sam Potts | 2017-03-26 | 4 | -493/+661 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 2 | -27/+90 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge pull request #520 from platformpurple/feature/subtitles | Sam Potts | 2017-03-25 | 2 | -27/+90 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Feature/subtitles | |||||
| | | * \ \ \ \ | Merge branch 'develop' into feature/subtitles | Sam Potts | 2017-03-25 | 13 | -131/+275 | |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | remove commented out code | Marios Tasos | 2017-03-24 | 1 | -7/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | toggle quality options | Marios Tasos | 2017-03-24 | 1 | -4/+13 | |
| | | | | | | | | ||||||
| | | * | | | | | make config.captions.selectedIndex number | Marios Tasos | 2017-03-22 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | set captionExists to true if selectedIndex is bigger than capt source | Marios Tasos | 2017-03-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | fix data typo in language button | Marios Tasos | 2017-03-18 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | check if captions exists | Marios Tasos | 2017-03-15 | 1 | -13/+16 | |
| | | | | | | | | ||||||
| | | * | | | | | Conflicts and tracks array on config | Chrysa Papadopoulou | 2017-02-24 | 3 | -67/+68 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | Subtitles tracks | Chrysa Papadopoulou | 2017-02-24 | 2 | -13/+59 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Notes | Sam Potts | 2017-03-25 | 1 | -3/+5 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'master' into develop | Sam Potts | 2017-03-25 | 10 | -26/+76 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.css # dist/plyr.js # src/js/plyr.js # src/less/plyr.less # src/scss/plyr.scss | |||||
| * | | | | | | | Manual merge of #509 | Sam Potts | 2017-03-25 | 3 | -1/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Clean up | Sam Potts | 2017-03-25 | 2 | -53/+41 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 3 | -6/+62 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| | * \ \ \ \ \ \ | Merge pull request #510 from platformpurple/feature/loop-events | Sam Potts | 2017-03-25 | 3 | -5/+61 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added key bindings for loop | |||||
| | | * \ \ \ \ \ \ | Merge branch 'develop' into feature/loop-events | Sam Potts | 2017-03-25 | 5 | -72/+108 | |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | Add looping key bindings to allowed array | Chrysa Papadopoulou | 2017-02-14 | 2 | -1/+4 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Removed console | Chrysa Papadopoulou | 2017-02-14 | 2 | -3/+2 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Added key bindings for loop | Chrysa Papadopoulou | 2017-02-14 | 3 | -5/+63 | |
| | | | |_|/ / / / | | | |/| | | | | | ||||||
| * | | | | | | | | Code formatting | Sam Potts | 2017-03-25 | 1 | -8/+8 | |
| | | | | | | | | |