Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-05-07 | 1 | -1/+1 | |
|\ | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| * | Implement loop in YouTube | Alejandro Iglesias | 2017-04-27 | 1 | -2/+2 | |
| | | ||||||
* | | Utils object, work on Vimeo captions | Sam Potts | 2017-05-07 | 2 | -3/+3 | |
|/ | ||||||
* | More work on Vimeo captions | Sam Potts | 2017-04-26 | 1 | -2/+2 | |
| | ||||||
* | Started on Vimeo captions | Sam Potts | 2017-04-25 | 1 | -2/+2 | |
| | ||||||
* | Tweaks | Sam Potts | 2017-04-25 | 1 | -2/+2 | |
| | ||||||
* | Tidy up | Sam Potts | 2017-04-25 | 1 | -2/+2 | |
| | ||||||
* | Built JS | Sam Potts | 2017-04-25 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-04-25 | 1 | -0/+0 | |
|\ | ||||||
| * | Merge branch 'develop' into blank-mp4 | Sam Potts | 2017-04-25 | 3 | -4/+4 | |
| |\ | ||||||
| * | | Add blank.mp4 to dist files | silverwind | 2017-03-25 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | 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 | 2 | -3/+3 | |
| |/ |/| | ||||||
* | | Looping menu (WIP) | Sam Potts | 2017-04-19 | 1 | -2/+2 | |
| | | ||||||
* | | Toggle menu | Sam Potts | 2017-04-17 | 1 | -2/+2 | |
| | | ||||||
* | | Airplay and PiP | Sam Potts | 2017-04-17 | 2 | -3/+3 | |
| | | ||||||
* | | ID fix and styling fix | Sam Potts | 2017-04-17 | 2 | -3/+3 | |
| | | ||||||
* | | More work on menus | Sam Potts | 2017-04-16 | 1 | -2/+2 | |
| | | ||||||
* | | Cleanup events and references | Sam Potts | 2017-04-16 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-04-15 | 1 | -2/+2 | |
|\ \ | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| * | | Formatting | Sam Potts | 2017-04-15 | 1 | -2/+2 | |
| | | | ||||||
* | | | Formatting | Sam Potts | 2017-04-15 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge branch 'develop' of github.com:Selz/plyr into develop | Sam Potts | 2017-03-29 | 2 | -3/+3 | |
|\ \ | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | |||||
| * \ | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-28 | 1 | -2/+2 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | |||||
| * | | | Tweaks | Sam Potts | 2017-03-28 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | Namespacing | Sam Potts | 2017-03-29 | 1 | -2/+2 | |
| |/ / |/| | | ||||||
* | | | Menu creation (WIP) | Sam Potts | 2017-03-28 | 1 | -2/+2 | |
|/ / | ||||||
* | | Controls rewrite | Sam Potts | 2017-03-27 | 1 | -2/+2 | |
| | | ||||||
* | | WIP on new controls creation | Sam Potts | 2017-03-26 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'develop' into feature/subtitles | Sam Potts | 2017-03-25 | 2 | -3/+3 | |
|\ \ | ||||||
| * | | Merge branch 'master' into develop | Sam Potts | 2017-03-25 | 2 | -2/+2 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.css # dist/plyr.js # src/js/plyr.js # src/less/plyr.less # src/scss/plyr.scss | |||||
| | * | Version bump to 2.0.12 | Sam Potts | 2017-03-25 | 2 | -3/+3 | |
| | | | ||||||
| | * | Generated dist files | Samuel Hodge | 2017-02-12 | 2 | -3/+3 | |
| | | | ||||||
| | * | v2.0.11 | Sam Potts | 2016-11-27 | 1 | -2/+2 | |
| | | | ||||||
| | * | Fix for iPad and YouTube issues | Sam Potts | 2016-11-27 | 2 | -3/+3 | |
| | | | ||||||
| * | | Manual merge of #509 | Sam Potts | 2017-03-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | Clean up | Sam Potts | 2017-03-25 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 1 | -2/+2 | |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| | * \ | Merge branch 'develop' into feature/loop-events | Sam Potts | 2017-03-25 | 1 | -2/+2 | |
| | |\ \ | ||||||
| | * | | | Add looping key bindings to allowed array | Chrysa Papadopoulou | 2017-02-14 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Removed console | Chrysa Papadopoulou | 2017-02-14 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Added key bindings for loop | Chrysa Papadopoulou | 2017-02-14 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Manual merge of #543 PR | Sam Potts | 2017-03-25 | 2 | -3/+3 | |
| | |/ / | |/| | | ||||||
| * | | | Merge branch 'develop' into improvement/loop-color-area | Sam Potts | 2017-03-25 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 1 | -2/+2 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| | * | | | | Loop variable naming | Sam Potts | 2017-03-25 | 1 | -2/+2 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Colored strip indicating looped area | Chrysa Papadopoulou | 2017-02-15 | 1 | -2/+2 | |
| | |/ / | |/| | | ||||||
| * | | | Fix on typo and gulp | Chrysa Papadopoulou | 2017-02-14 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Conflicts and tracks array on config | Chrysa Papadopoulou | 2017-02-24 | 1 | -2/+2 | |
|\| | | ||||||
| * | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-02-05 | 1 | -2/+2 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | |||||
| * | | | Menu work | Sam Potts | 2017-02-05 | 1 | -2/+2 | |
| | | | |