aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'beta' of github.com:sampotts/plyr into betaSam Potts2018-02-111-1/+2
| |\ \
| | * \ Merge pull request #780 from friday/captions-ie11-indexsizeerrorSam Potts2018-02-061-1/+2
| | |\ \ | | | | | | | | | | Fix harmless but annoying IE error 'IndexSizeError'
| | | * | Fix harmless but annoying IE error 'IndexSizeError'Albin Larsson2018-02-061-1/+2
| | | | |
| * | | | Fullscreen API changes, color settings tweaksSam Potts2018-02-1120-266/+301
| |/ / /
| * | | CopySam Potts2018-02-061-2/+2
| | | |
| * | | Nicer checksSam Potts2018-02-061-27/+27
| | | |
| * | | CopySam Potts2018-02-061-1/+3
| | | |
| * | | Readme mergeSam Potts2018-02-068-32/+14
| |/ /
| | * Gulp js build: create both minified and non-minified outputsAlbin Larsson2018-02-063-30/+80
| | |
| | * Remove eslint-rule 'no-shadow' (common variable names should be able to ↵Albin Larsson2018-02-051-0/+1
| |/ | | | | | | exist in different scopes)
| * 3.0.0-beta.12Sam Potts2018-02-064-9/+9
| |
| * Added backwards compatibility for <div> embedsSam Potts2018-02-0613-247/+121
| |
| * Removed fetch dependencySam Potts2018-02-055-17/+16
| |
| * Merge branch 'beta' of github.com:sampotts/plyr into betaSam Potts2018-02-0516-32/+60
| |\ | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # dist/plyr.js.map
| | * Update readme.mdSam Potts2018-02-031-1/+1
| | |
| | * Small UI tweaks and fix for instanceof issueSam Potts2018-01-3116-31/+59
| | |
| * | Testing fetchSam Potts2018-02-056-10/+49
| |/
| * Version bump + icon fixSam Potts2018-01-305-8/+12
| |
| * Fix UMD stuffSam Potts2018-01-302-3/+3
| |
| * DeploySam Potts2018-01-303-5/+5
| |
| * Merge pull request #772 from sampotts/fix/ads-blockedSam Potts2018-01-307-28/+52
| |\ | | | | | | Fix: ads blocked and media playing before ad plays
| | * Merge branch 'beta' into fix/ads-blockedSam Potts2018-01-3019-68/+112
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | # Conflicts: # dist/plyr.js # dist/plyr.js.map # src/js/plugins/ads.js # src/js/plyr.js
| * | Version bumpSam Potts2018-01-253-5/+5
| | |
| * | Attempt to fix YouTube message error, added ads references, changes to boolSam Potts2018-01-2516-26/+73
| | |
| * | Restored “Ad” in labelSam Potts2018-01-247-8/+10
| | |
| * | Docs tweakSam Potts2018-01-231-2/+2
| | |
| * | Version bumpSam Potts2018-01-233-5/+5
| | |
| | * Fix typo'sferdiemmen2018-01-292-3/+3
| | |
| | * fix(ads): Fixes media from playing when ads are blockedferdiemmen2018-01-296-7/+36
| |/
| * Renamed property, UI tweakSam Potts2018-01-2312-42/+49
| |
| * Fix bug where ad would play on every play actionferdiemmen2018-01-226-19/+6
| |
| * Small tweaksSam Potts2018-01-2211-20/+25
| |
| * Bug fixSam Potts2018-01-227-12/+17
| |
| * Version bumpSam Potts2018-01-223-5/+5
| |
| * GulpSam Potts2018-01-222-2/+2
| |
| * Merge pull request #760 from sampotts/beta-with-adsSam Potts2018-01-2217-55/+698
| |\ | | | | | | Beta with ads
| | * Formatting, events and ad countdown addedSam Potts2018-01-2211-113/+199
| | |
| | * Converted demo to iifeSam Potts2018-01-206-26/+19
| | |
| | * Formatting and “ad” badgeSam Potts2018-01-1910-109/+104
| | |
| | * BuildSam Potts2018-01-196-6/+6
| | |
| | * Merge branch 'beta-with-ads' of github.com:sampotts/plyr into beta-with-adsSam Potts2018-01-193-267/+271
| | |\ | | | | | | | | | | | | | | | | # Conflicts: # src/js/plugins/ads.js
| | | * Merge pull request #763 from gehaktmolen/beta-with-ads-adjustmentsSam Potts2018-01-193-256/+311
| | | |\ | | | | | | | | | | Beta with ads - Reloading ads on new video
| | | | * Noticed that Plyr stopped working when ads are blocked.Arthur Hulsman2018-01-181-3/+6
| | | | |
| | | | * Updated pause and resume content methods within Ads class.Arthur Hulsman2018-01-181-5/+5
| | | | |
| | | | * Reformatted ads codebase and added/ changed comments. Also removed un-used ↵Arthur Hulsman2018-01-181-164/+119
| | | | | | | | | | | | | | | | | | | | events.
| | | | * Fixed string literal and position issue of the midroll cue inside the time ↵Arthur Hulsman2018-01-171-5/+8
| | | | | | | | | | | | | | | | | | | | line. Added a check for the progress element existence.
| | | | * Removed an un-used variable.Arthur Hulsman2018-01-171-3/+1
| | | | |
| | | | * Added cue markings within the time line for when midrolls will be displayed. ↵Arthur Hulsman2018-01-173-2/+30
| | | | | | | | | | | | | | | | | | | | Removed unusued callback parameter.
| | | | * Added the logging of our main promises to their resolving callback. ↵Arthur Hulsman2018-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | Otherwise they come up as null.
| | | | * Removed logic related to starting the ad by clicking/ tapping the ↵Arthur Hulsman2018-01-172-61/+2
| | | | | | | | | | | | | | | | | | | | advertisement container. Ad is started by plyr play method.