Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'beta' into fix/ads-blocked | Sam Potts | 2018-01-30 | 4 | -17/+42 | |
|\ | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # dist/plyr.js.map # src/js/plugins/ads.js # src/js/plyr.js | |||||
| * | Version bump | Sam Potts | 2018-01-25 | 1 | -1/+1 | |
| | | ||||||
| * | Attempt to fix YouTube message error, added ads references, changes to bool | Sam Potts | 2018-01-25 | 4 | -7/+27 | |
| | | ||||||
| * | Restored “Ad” in label | Sam Potts | 2018-01-24 | 3 | -2/+4 | |
| | | ||||||
| * | Version bump | Sam Potts | 2018-01-23 | 1 | -1/+1 | |
| | | ||||||
* | | Fix typo's | ferdiemmen | 2018-01-29 | 1 | -2/+2 | |
| | | ||||||
* | | fix(ads): Fixes media from playing when ads are blocked | ferdiemmen | 2018-01-29 | 3 | -4/+25 | |
|/ | ||||||
* | Renamed property, UI tweak | Sam Potts | 2018-01-23 | 3 | -14/+17 | |
| | ||||||
* | Fix bug where ad would play on every play action | ferdiemmen | 2018-01-22 | 2 | -15/+2 | |
| | ||||||
* | Small tweaks | Sam Potts | 2018-01-22 | 3 | -9/+13 | |
| | ||||||
* | Bug fix | Sam Potts | 2018-01-22 | 3 | -2/+7 | |
| | ||||||
* | Version bump | Sam Potts | 2018-01-22 | 1 | -1/+1 | |
| | ||||||
* | Formatting, events and ad countdown added | Sam Potts | 2018-01-22 | 5 | -107/+193 | |
| | ||||||
* | Formatting and “ad” badge | Sam Potts | 2018-01-19 | 4 | -103/+98 | |
| | ||||||
* | 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 | |||||
| * | 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. | |||||
| * | Adsmanager is now re/pre-loaded with new ads when the video is done or an ad ↵ | Arthur Hulsman | 2018-01-17 | 1 | -116/+237 | |
| | | | | | | | | error appears. Will make it possible to request ads when a new video is loaded. Added comments and missing events within the adsmanagerloader method. | |||||
| * | Moved the ads container to be outside of the video wrapper. This way we can ↵ | Arthur Hulsman | 2018-01-17 | 2 | -4/+16 | |
| | | | | | | | | easily move the ad in front or behind the video controls based on content resume or pause IMA events. | |||||
| * | Moved the logic for pausing and playing the video to content pause/ resume ↵ | Arthur Hulsman | 2018-01-17 | 1 | -37/+27 | |
| | | | | | | | | IMA events to avoid flickering. Also used events for resolving the adsmanager and adsloader promises. | |||||
* | | Merge branch 'beta' into beta-with-ads | Sam Potts | 2018-01-19 | 3 | -6/+6 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # demo/dist/demo.js.map # dist/plyr.js # dist/plyr.js.map | |||||
| * | | Transition event fix | Sam Potts | 2018-01-19 | 3 | -6/+6 | |
| | | | ||||||
* | | | Comments and formatting | Sam Potts | 2018-01-19 | 1 | -14/+39 | |
| |/ |/| | ||||||
* | | Fix loading/playing of the ads when there is no valid ads.tagUrl | ferdiemmen | 2018-01-17 | 2 | -30/+18 | |
| | | ||||||
* | | Some tweaks | ferdiemmen | 2018-01-16 | 2 | -72/+97 | |
| | | ||||||
* | | fix blocking play() if ads are set | ferdiemmen | 2018-01-15 | 2 | -49/+49 | |
| | | ||||||
* | | Added promises, missing events, new ad tag and additional logging. | Arthur Hulsman | 2018-01-15 | 1 | -68/+213 | |
| | | ||||||
* | | Tweaks | Sam Potts | 2018-01-14 | 1 | -5/+5 | |
| | | ||||||
* | | Code tweaks | Sam Potts | 2018-01-14 | 6 | -48/+63 | |
| | | ||||||
* | | Merge branch 'beta' into beta-with-ads | Sam Potts | 2018-01-14 | 1 | -2/+5 | |
|\| | | | | | | | | | | | | | | | # Conflicts: # demo/dist/demo.js # demo/dist/demo.js.map # dist/plyr.js # dist/plyr.js.map | |||||
| * | Minor logic tweak | Sam Potts | 2018-01-14 | 1 | -2/+5 | |
| | | ||||||
* | | Fix loading google ima sdk | ferdiemmen | 2018-01-14 | 1 | -3/+9 | |
| | | ||||||
* | | Implementing ads plugin | ferdiemmen | 2018-01-13 | 5 | -0/+356 | |
|/ | ||||||
* | Progressively enhance <iframe> embeds | Sam Potts | 2018-01-12 | 8 | -74/+168 | |
| | ||||||
* | Beta version up on https://plyr.io/beta and CDN | Sam Potts | 2018-01-09 | 1 | -1/+1 | |
| | ||||||
* | Publishing to /beta | Sam Potts | 2018-01-09 | 1 | -2/+2 | |
| | ||||||
* | Styling tweaks | Sam Potts | 2018-01-09 | 1 | -1/+0 | |
| | ||||||
* | Use CSS custom property for webkit range fill | Sam Potts | 2018-01-08 | 2 | -30/+9 | |
| | ||||||
* | Package tweaks | Sam Potts | 2018-01-08 | 2 | -3/+1 | |
| | ||||||
* | Empty storage fix | Sam Potts | 2018-01-07 | 1 | -1/+6 | |
| | ||||||
* | Slider styling | Sam Potts | 2018-01-07 | 3 | -11/+15 | |
| | ||||||
* | Started on error handling | Sam | 2018-01-04 | 9 | -5/+77 | |
| | ||||||
* | Fix for promise issue on Chrome, loading fix | Sam | 2017-12-27 | 2 | -6/+15 | |
| | ||||||
* | Docs, restored loadSprite and supported static methods | Sam Potts | 2017-12-23 | 2 | -8/+28 | |
| |