aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #772 from sampotts/fix/ads-blockedSam Potts2018-01-307-28/+52
|\
| * Merge branch 'beta' into fix/ads-blockedSam Potts2018-01-3019-68/+112
| |\ | |/ |/|
* | 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
|\
| * 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
| |\
| | * Merge pull request #763 from gehaktmolen/beta-with-ads-adjustmentsSam Potts2018-01-193-256/+311
| | |\
| | | * 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 ev...Arthur Hulsman2018-01-181-164/+119
| | | * Fixed string literal and position issue of the midroll cue inside the time li...Arthur Hulsman2018-01-171-5/+8
| | | * 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
| | | * Added the logging of our main promises to their resolving callback. Otherwise...Arthur Hulsman2018-01-171-0/+4
| | | * Removed logic related to starting the ad by clicking/ tapping the advertiseme...Arthur Hulsman2018-01-172-61/+2
| | | * Adsmanager is now re/pre-loaded with new ads when the video is done or an ad ...Arthur Hulsman2018-01-171-116/+237
| | | * Moved the ads container to be outside of the video wrapper. This way we can e...Arthur Hulsman2018-01-172-4/+16
| | | * Moved the logic for pausing and playing the video to content pause/ resume IM...Arthur Hulsman2018-01-171-37/+27
| | |/
| * | Merge branch 'beta' into beta-with-adsSam Potts2018-01-195-9/+9
| |\ \ | |/ / |/| |
* | | Transition event fixSam Potts2018-01-199-13/+13
| * | Comments and formattingSam Potts2018-01-195-18/+43
| |/
| * Fix loading/playing of the ads when there is no valid ads.tagUrlferdiemmen2018-01-174-32/+20
| * Some tweaksferdiemmen2018-01-167-82/+102
| * fix blocking play() if ads are setferdiemmen2018-01-156-53/+53
| * Merge pull request #761 from gehaktmolen/beta-with-ads-promisesFerdi2018-01-153-70/+221
| |\
| | * Added promises, missing events, new ad tag and additional logging.Arthur Hulsman2018-01-153-70/+221
| |/
| * TweaksSam Potts2018-01-142-6/+6
| * Code tweaksSam Potts2018-01-1415-76/+71
| * Merge branch 'beta' into beta-with-adsSam Potts2018-01-146-19/+9
| |\ | |/ |/|
* | Minor logic tweakSam Potts2018-01-146-19/+9
| * Fix loading google ima sdkferdiemmen2018-01-147-128/+17
| * Implementing ads pluginferdiemmen2018-01-1312-5/+502
|/
* Progressively enhance <iframe> embedsSam Potts2018-01-1215-110/+204
* Publish script tweaksSam Potts2018-01-092-3/+16
* PackageSam Potts2018-01-092-1/+10