| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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. | |||||
| | | | | * | 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 | 5 | -9/+9 | |
| | | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | # 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 | 9 | -13/+13 | |
| | | | | | ||||||
| | | * | | Comments and formatting | Sam Potts | 2018-01-19 | 5 | -18/+43 | |
| | | |/ | ||||||
| | | * | Fix loading/playing of the ads when there is no valid ads.tagUrl | ferdiemmen | 2018-01-17 | 4 | -32/+20 | |
| | | | | ||||||
| | | * | Some tweaks | ferdiemmen | 2018-01-16 | 7 | -82/+102 | |
| | | | | ||||||
| | | * | fix blocking play() if ads are set | ferdiemmen | 2018-01-15 | 6 | -53/+53 | |
| | | | | ||||||
| | | * | Merge pull request #761 from gehaktmolen/beta-with-ads-promises | Ferdi | 2018-01-15 | 3 | -70/+221 | |
| | | |\ | | | | | | | | | Beta with ads - Added promises, missing events, new ad tag and additional logging. | |||||
| | | | * | Added promises, missing events, new ad tag and additional logging. | Arthur Hulsman | 2018-01-15 | 3 | -70/+221 | |
| | | |/ | ||||||
| | | * | Tweaks | Sam Potts | 2018-01-14 | 2 | -6/+6 | |
| | | | | ||||||
| | | * | Code tweaks | Sam Potts | 2018-01-14 | 15 | -76/+71 | |
| | | | | ||||||
| | | * | Merge branch 'beta' into beta-with-ads | Sam Potts | 2018-01-14 | 6 | -19/+9 | |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | # 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 | 6 | -19/+9 | |
| | | | | ||||||
| | | * | Fix loading google ima sdk | ferdiemmen | 2018-01-14 | 7 | -128/+17 | |
| | | | | ||||||
| | | * | Implementing ads plugin | ferdiemmen | 2018-01-13 | 12 | -5/+502 | |
| | |/ | ||||||
| | * | Progressively enhance <iframe> embeds | Sam Potts | 2018-01-12 | 15 | -110/+204 | |
| | | | ||||||
| | * | Publish script tweaks | Sam Potts | 2018-01-09 | 2 | -3/+16 | |
| | | | ||||||
| | * | Package | Sam Potts | 2018-01-09 | 2 | -1/+10 | |
| | | | ||||||
| | * | Beta version up on https://plyr.io/beta and CDN | Sam Potts | 2018-01-09 | 12 | -9052/+283 | |
| | | | ||||||
| | * | Publishing to /beta | Sam Potts | 2018-01-09 | 6 | -287/+62 | |
| | | | ||||||
| | * | Recommended extensions for VS Code | Sam Potts | 2018-01-09 | 1 | -0/+12 | |
| | | | ||||||
| | * | Styling tweaks | Sam Potts | 2018-01-09 | 10 | -246/+293 | |
| | | | ||||||
| | * | Use CSS custom property for webkit range fill | Sam Potts | 2018-01-08 | 8 | -36/+15 | |
| | | | ||||||
| | * | Merge branch 'develop' of github.com:sampotts/plyr into develop | Sam Potts | 2018-01-08 | 1 | -2/+6 | |
| | |\ | ||||||
| | | * | Merge pull request #752 from friday/gulp-fix | Sam Potts | 2018-01-08 | 1 | -2/+6 | |
| | | |\ | | | | | | | | | Enable gulp builds when aws.json isn't present. | |||||
| | | | * | Fix gulp build for user who doesn't have aws.json | Albin Larsson | 2018-01-08 | 1 | -2/+6 | |
| | | |/ | ||||||
| | * / | Package tweaks | Sam Potts | 2018-01-08 | 8 | -577/+147 | |
| | |/ | ||||||
| | * | Empty storage fix | Sam Potts | 2018-01-07 | 5 | -5/+10 | |
| | | | ||||||
| | * | Merge branch 'master' into develop | Sam Potts | 2018-01-07 | 0 | -0/+0 | |
| | |\ | | | | | | | | | | | | | # Conflicts: # src/js/plyr.js | |||||
| | * \ | Merge branch 'master' into develop | Sam Potts | 2018-01-07 | 2 | -0/+24 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .vscode/settings.json # demo/dist/demo.css # demo/dist/demo.js # demo/error.html # demo/index.html # demo/src/js/main.js # demo/src/less/lib/fontface.less # dist/plyr.css # dist/plyr.js # gulpfile.js # package-lock.json # package.json # readme.md # src/js/plyr.js # src/less/plyr.less # src/scss/plyr.scss | |||||
| | * | | | Slider styling | Sam Potts | 2018-01-07 | 5 | -13/+17 | |
| | | | | | ||||||
| | * | | | Merge branch 'develop' of https://github.com/Selz/plyr into develop | Sam Potts | 2018-01-05 | 14 | -10/+82 | |
| | |\ \ \ | ||||||
| | | * | | | Started on error handling | Sam | 2018-01-04 | 16 | -12/+84 | |
| | | | | | | ||||||
 |
index : plyr.git | |
| A fork of plyr without nonfree parts | heckyel |
| aboutsummaryrefslogtreecommitdiffstats |