Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'beta' of github.com:sampotts/plyr into beta | Sam Potts | 2018-02-11 | 1 | -1/+2 | |
| |\ \ | ||||||
| | * \ | Merge pull request #780 from friday/captions-ie11-indexsizeerror | Sam Potts | 2018-02-06 | 1 | -1/+2 | |
| | |\ \ | | | | | | | | | | | Fix harmless but annoying IE error 'IndexSizeError' | |||||
| | | * | | Fix harmless but annoying IE error 'IndexSizeError' | Albin Larsson | 2018-02-06 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Fullscreen API changes, color settings tweaks | Sam Potts | 2018-02-11 | 20 | -266/+301 | |
| |/ / / | ||||||
| * | | | Copy | Sam Potts | 2018-02-06 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Nicer checks | Sam Potts | 2018-02-06 | 1 | -27/+27 | |
| | | | | ||||||
| * | | | Copy | Sam Potts | 2018-02-06 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Readme merge | Sam Potts | 2018-02-06 | 8 | -32/+14 | |
| |/ / | ||||||
| | * | Gulp js build: create both minified and non-minified outputs | Albin Larsson | 2018-02-06 | 3 | -30/+80 | |
| | | | ||||||
| | * | Remove eslint-rule 'no-shadow' (common variable names should be able to ↵ | Albin Larsson | 2018-02-05 | 1 | -0/+1 | |
| |/ | | | | | | | exist in different scopes) | |||||
| * | 3.0.0-beta.12 | Sam Potts | 2018-02-06 | 4 | -9/+9 | |
| | | ||||||
| * | Added backwards compatibility for <div> embeds | Sam Potts | 2018-02-06 | 13 | -247/+121 | |
| | | ||||||
| * | Removed fetch dependency | Sam Potts | 2018-02-05 | 5 | -17/+16 | |
| | | ||||||
| * | Merge branch 'beta' of github.com:sampotts/plyr into beta | Sam Potts | 2018-02-05 | 16 | -32/+60 | |
| |\ | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # dist/plyr.js.map | |||||
| | * | Update readme.md | Sam Potts | 2018-02-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | Small UI tweaks and fix for instanceof issue | Sam Potts | 2018-01-31 | 16 | -31/+59 | |
| | | | ||||||
| * | | Testing fetch | Sam Potts | 2018-02-05 | 6 | -10/+49 | |
| |/ | ||||||
| * | Version bump + icon fix | Sam Potts | 2018-01-30 | 5 | -8/+12 | |
| | | ||||||
| * | Fix UMD stuff | Sam Potts | 2018-01-30 | 2 | -3/+3 | |
| | | ||||||
| * | Deploy | Sam Potts | 2018-01-30 | 3 | -5/+5 | |
| | | ||||||
| * | Merge pull request #772 from sampotts/fix/ads-blocked | Sam Potts | 2018-01-30 | 7 | -28/+52 | |
| |\ | | | | | | | Fix: ads blocked and media playing before ad plays | |||||
| | * | Merge branch 'beta' into fix/ads-blocked | Sam Potts | 2018-01-30 | 19 | -68/+112 | |
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # dist/plyr.js.map # src/js/plugins/ads.js # src/js/plyr.js | |||||
| * | | Version bump | Sam Potts | 2018-01-25 | 3 | -5/+5 | |
| | | | ||||||
| * | | Attempt to fix YouTube message error, added ads references, changes to bool | Sam Potts | 2018-01-25 | 16 | -26/+73 | |
| | | | ||||||
| * | | Restored “Ad” in label | Sam Potts | 2018-01-24 | 7 | -8/+10 | |
| | | | ||||||
| * | | Docs tweak | Sam Potts | 2018-01-23 | 1 | -2/+2 | |
| | | | ||||||
| * | | Version bump | Sam Potts | 2018-01-23 | 3 | -5/+5 | |
| | | | ||||||
| | * | Fix typo's | ferdiemmen | 2018-01-29 | 2 | -3/+3 | |
| | | | ||||||
| | * | fix(ads): Fixes media from playing when ads are blocked | ferdiemmen | 2018-01-29 | 6 | -7/+36 | |
| |/ | ||||||
| * | Renamed property, UI tweak | Sam Potts | 2018-01-23 | 12 | -42/+49 | |
| | | ||||||
| * | Fix bug where ad would play on every play action | ferdiemmen | 2018-01-22 | 6 | -19/+6 | |
| | | ||||||
| * | Small tweaks | Sam Potts | 2018-01-22 | 11 | -20/+25 | |
| | | ||||||
| * | Bug fix | Sam Potts | 2018-01-22 | 7 | -12/+17 | |
| | | ||||||
| * | Version bump | Sam Potts | 2018-01-22 | 3 | -5/+5 | |
| | | ||||||
| * | Gulp | Sam Potts | 2018-01-22 | 2 | -2/+2 | |
| | | ||||||
| * | Merge pull request #760 from sampotts/beta-with-ads | Sam Potts | 2018-01-22 | 17 | -55/+698 | |
| |\ | | | | | | | Beta with ads | |||||
| | * | Formatting, events and ad countdown added | Sam Potts | 2018-01-22 | 11 | -113/+199 | |
| | | | ||||||
| | * | Converted demo to iife | Sam Potts | 2018-01-20 | 6 | -26/+19 | |
| | | | ||||||
| | * | Formatting and “ad” badge | Sam Potts | 2018-01-19 | 10 | -109/+104 | |
| | | | ||||||
| | * | Build | Sam Potts | 2018-01-19 | 6 | -6/+6 | |
| | | | ||||||
| | * | Merge branch 'beta-with-ads' of github.com:sampotts/plyr into beta-with-ads | Sam Potts | 2018-01-19 | 3 | -267/+271 | |
| | |\ | | | | | | | | | | | | | | | | | # Conflicts: # src/js/plugins/ads.js | |||||
| | | * | Merge pull request #763 from gehaktmolen/beta-with-ads-adjustments | Sam Potts | 2018-01-19 | 3 | -256/+311 | |
| | | |\ | | | | | | | | | | | Beta with ads - Reloading ads on new video | |||||
| | | | * | Noticed that Plyr stopped working when ads are blocked. | Arthur Hulsman | 2018-01-18 | 1 | -3/+6 | |
| | | | | | ||||||
| | | | * | Updated pause and resume content methods within Ads class. | Arthur Hulsman | 2018-01-18 | 1 | -5/+5 | |
| | | | | | ||||||
| | | | * | Reformatted ads codebase and added/ changed comments. Also removed un-used ↵ | Arthur Hulsman | 2018-01-18 | 1 | -164/+119 | |
| | | | | | | | | | | | | | | | | | | | | events. | |||||
| | | | * | Fixed string literal and position issue of the midroll cue inside the time ↵ | Arthur Hulsman | 2018-01-17 | 1 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | | | line. Added a check for the progress element existence. | |||||
| | | | * | Removed an un-used variable. | Arthur Hulsman | 2018-01-17 | 1 | -3/+1 | |
| | | | | | ||||||
| | | | * | Added cue markings within the time line for when midrolls will be displayed. ↵ | Arthur Hulsman | 2018-01-17 | 3 | -2/+30 | |
| | | | | | | | | | | | | | | | | | | | | Removed unusued callback parameter. | |||||
| | | | * | Added the logging of our main promises to their resolving callback. ↵ | Arthur Hulsman | 2018-01-17 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | Otherwise they come up as null. | |||||
| | | | * | Removed logic related to starting the ad by clicking/ tapping the ↵ | Arthur Hulsman | 2018-01-17 | 2 | -61/+2 | |
| | | | | | | | | | | | | | | | | | | | | advertisement container. Ad is started by plyr play method. |