Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Started on Vimeo captions | Sam Potts | 2017-04-25 | 1 | -7/+22 | |
| | | ||||||
| * | Tweaks | Sam Potts | 2017-04-25 | 1 | -9/+27 | |
| | | ||||||
| * | Tidy up | Sam Potts | 2017-04-25 | 1 | -29/+23 | |
| | | ||||||
| * | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-04-25 | 1 | -17/+7 | |
| |\ | ||||||
| | * | Merge branch 'develop' into master | Sam Potts | 2017-04-25 | 8 | -1610/+3141 | |
| | |\ | ||||||
| | * | | removed vimeo id parsing because it is not necessary | stormrockwell | 2017-04-19 | 1 | -11/+1 | |
| | | | | ||||||
| * | | | More work on menus and tidy up | Sam Potts | 2017-04-25 | 2 | -578/+314 | |
| | |/ | |/| | ||||||
* / | | Gulp tweak | Sam Potts | 2017-04-25 | 1 | -1/+0 | |
|/ / | ||||||
* | | Looping menu (WIP) | Sam Potts | 2017-04-19 | 1 | -13/+34 | |
| | | ||||||
* | | Toggle menu | Sam Potts | 2017-04-17 | 1 | -55/+71 | |
| | | ||||||
* | | Airplay and PiP | Sam Potts | 2017-04-17 | 2 | -18/+38 | |
| | | ||||||
* | | ID fix and styling fix | Sam Potts | 2017-04-17 | 2 | -20/+20 | |
| | | ||||||
* | | More work on menus | Sam Potts | 2017-04-16 | 1 | -40/+60 | |
| | | ||||||
* | | Cleanup events and references | Sam Potts | 2017-04-16 | 1 | -104/+168 | |
| | | ||||||
* | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-04-15 | 1 | -3/+3 | |
|\ \ | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| * | | Formatting | Sam Potts | 2017-04-15 | 1 | -7/+7 | |
| | | | ||||||
* | | | Formatting | Sam Potts | 2017-04-15 | 1 | -10/+29 | |
|/ / | ||||||
* | | Merge branch 'develop' of github.com:Selz/plyr into develop | Sam Potts | 2017-03-29 | 3 | -12/+23 | |
|\ \ | | | | | | | | | | | | | | | | # 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 | -81/+193 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # src/js/plyr.js | |||||
| * | | | Tweaks | Sam Potts | 2017-03-28 | 3 | -15/+23 | |
| | | | | ||||||
* | | | | Namespacing | Sam Potts | 2017-03-29 | 1 | -564/+576 | |
| |/ / |/| | | ||||||
* | | | Menu creation (WIP) | Sam Potts | 2017-03-28 | 1 | -87/+196 | |
|/ / | ||||||
* | | Controls rewrite | Sam Potts | 2017-03-27 | 1 | -311/+319 | |
| | | ||||||
* | | WIP on new controls creation | Sam Potts | 2017-03-26 | 1 | -465/+637 | |
| | | ||||||
* | | Merge branch 'develop' into feature/subtitles | Sam Potts | 2017-03-25 | 3 | -102/+189 | |
|\ \ | ||||||
| * | | Merge branch 'master' into develop | Sam Potts | 2017-03-25 | 3 | -3/+18 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | 1 | -2/+2 | |
| | | | ||||||
| | * | Merge pull request #468 from jronallo/captions-listener | Sam Potts | 2017-03-25 | 1 | -1/+1 | |
| | |\ | | | | | | | | | allow for setting additional listener for captions | |||||
| | | * | allow for setting additional listener for captions | Jason Ronallo | 2016-12-26 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Allow configuration of the blank.mp4 URL | Samuel Hodge | 2017-02-11 | 1 | -1/+2 | |
| | | | | | | | | | | | | This is useful for people behind firewalls who need to host a blank mp4 themselves. | |||||
| | * | | Fixed typo | Morten Vestergaard Hansen | 2016-11-30 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | v2.0.11 | Sam Potts | 2016-11-27 | 1 | -2/+2 | |
| | | | ||||||
| | * | Merge branch 'master' of https://github.com/Selz/plyr | Sam Potts | 2016-11-27 | 1 | -1/+3 | |
| | |\ | ||||||
| | | * | fixes bug where cleanUp would be called twice | Sebastian Carlsson | 2016-11-17 | 1 | -49/+51 | |
| | | | | ||||||
| | * | | Fix for iPad and YouTube issues | Sam Potts | 2016-11-27 | 3 | -87/+117 | |
| | |/ | ||||||
| * | | Manual merge of #509 | Sam Potts | 2017-03-25 | 2 | -0/+4 | |
| | | | ||||||
| * | | Clean up | Sam Potts | 2017-03-25 | 1 | -51/+39 | |
| | | | ||||||
| * | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 1 | -3/+39 | |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| | * \ | Merge branch 'develop' into feature/loop-events | Sam Potts | 2017-03-25 | 1 | -66/+100 | |
| | |\ \ | ||||||
| | * | | | Add looping key bindings to allowed array | Chrysa Papadopoulou | 2017-02-14 | 1 | -0/+3 | |
| | | | | | ||||||
| | * | | | Removed console | Chrysa Papadopoulou | 2017-02-14 | 1 | -1/+0 | |
| | | | | | ||||||
| | * | | | Added key bindings for loop | Chrysa Papadopoulou | 2017-02-14 | 1 | -2/+40 | |
| | | | | | ||||||
| * | | | | Code formatting | Sam Potts | 2017-03-25 | 1 | -8/+8 | |
| | | | | | ||||||
| * | | | | Manual merge of #543 PR | Sam Potts | 2017-03-25 | 2 | -23/+20 | |
| | |/ / | |/| | | ||||||
| * | | | Merge branch 'develop' into improvement/loop-color-area | Sam Potts | 2017-03-25 | 1 | -65/+79 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2017-03-25 | 1 | -3/+3 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js | |||||
| | * | | | | Loop variable naming | Sam Potts | 2017-03-25 | 1 | -54/+73 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Colored strip indicating looped area | Chrysa Papadopoulou | 2017-02-15 | 1 | -1/+25 | |
| | |/ / | |/| | | ||||||
| * | | | Fix on typo | Chrysa Papadopoulou | 2017-02-14 | 1 | -3/+3 | |
| |/ / | ||||||
* | | | remove commented out code | Marios Tasos | 2017-03-24 | 1 | -7/+2 | |
| | | |