This repository has been archived by the owner on Feb 13, 2021. It is now read-only.
forked from prebid/Prebid.js
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request prebid#113 in AOLP_ADS_JS/prebid.js from release/1…
….25.0 to aolgithub-master * commit '2a31c81b71595988ed2bf3470fb94d4fb75098bc': (71 commits) Sync with contrib/aol-adapter-aliases branch. Added junit reporter, improved browserstack tests running. Change browsers config to allow run tests on CI. Temporary comment unit test to provide compatibility with pre-bidder timeout feature. Added banner for minified source file. Improve matching to avoid breaking js syntax. Changed changelog entry. Fixed invalid module link. Prebid 0.26.1 Release (prebid#1412) fix prebid#1410 - issue with ie and xhr.timeout (prebid#1411) Lint modules directory (prebid#1404) Added changelog entry. Added ids in aolPartnersIds. Added tests for delimiterLoader. Set outstream mediaType based on renderer in response (prebid#1391) Fixing the BidAdjustmentEvent fire time (prebid#1399) Improved adapter source code wrappig. Changed aol analytics adapter to new structure. Get rid of preserve keyword. Added preserved keyword for adapters wrapping. ...
- Loading branch information
Showing
237 changed files
with
9,235 additions
and
5,645 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 5.1 | ||
| 7.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,17 @@ | ||
| sudo: required | ||
| dist: trusty | ||
|
|
||
| language: node_js | ||
|
|
||
| node_js: | ||
| - "5.1" | ||
| - "7.0" | ||
|
|
||
| # See https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-the-Chrome-addon-in-the-headless-mode | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - google-chrome | ||
| packages: | ||
| - google-chrome-stable | ||
| chrome: stable | ||
|
|
||
| before_install: | ||
| - npm install -g gulp | ||
| - export CHROME_BIN=google-chrome | ||
| - export DISPLAY=:99.0 | ||
| - sh -e /etc/init.d/xvfb start | ||
| - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost & | ||
|
|
||
| script: | ||
| - gulp run-tests |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,171 +0,0 @@ | ||
| [ | ||
| "aardvark", | ||
| "adblade", | ||
| "adbund", | ||
| "adbutler", | ||
| "adequant", | ||
| "adform", | ||
| "adkernel", | ||
| "admedia", | ||
| "adyoulike", | ||
| "bidfluence", | ||
| "vertamedia", | ||
| "aol", | ||
| "appnexus", | ||
| "appnexusAst", | ||
| "beachfront", | ||
| "audienceNetwork", | ||
| "carambola", | ||
| "conversant", | ||
| "districtmDMX", | ||
| "fidelity", | ||
| "gumgum", | ||
| "hiromedia", | ||
| "indexExchange", | ||
| "innity", | ||
| "kruxlink", | ||
| "getintent", | ||
| "inneractive", | ||
| "komoona", | ||
| "lifestreet", | ||
| "mantis", | ||
| "openx", | ||
| "piximedia", | ||
| "pubmatic", | ||
| "pubgears", | ||
| "pulsepoint", | ||
| "pulsepointLite", | ||
| "quantcast", | ||
| "rhythmone", | ||
| "rubicon", | ||
| "smartyads", | ||
| "huddledmasses", | ||
| "smartadserver", | ||
| "sekindoUM", | ||
| "serverbid", | ||
| "sonobi", | ||
| "sovrn", | ||
| "springserve", | ||
| "thoughtleadr", | ||
| "stickyadstv", | ||
| "triplelift", | ||
| "twenga", | ||
| "yieldbot", | ||
| "nginad", | ||
| "brightcom", | ||
| "wideorbit", | ||
| "jcm", | ||
| "underdogmedia", | ||
| "memeglobal", | ||
| "criteo", | ||
| "centro", | ||
| "xhb", | ||
| "sharethrough", | ||
| "roxot", | ||
| "vertoz", | ||
| "widespace", | ||
| "admixer", | ||
| "atomx", | ||
| "tapsense", | ||
| "trion", | ||
| "eplanning", | ||
| "prebidServer", | ||
| "adsupply", | ||
| "cox", | ||
| { | ||
| "aol": { | ||
| "alias": "onemobile" | ||
| } | ||
| }, | ||
| { | ||
| "aol": { | ||
| "alias": "onedisplay" | ||
| } | ||
| }, | ||
| { | ||
| "appnexus": { | ||
| "alias": "brealtime" | ||
| } | ||
| }, | ||
| { | ||
| "appnexus": { | ||
| "alias": "pagescience" | ||
| } | ||
| }, | ||
| { | ||
| "appnexus": { | ||
| "alias": "defymedia" | ||
| } | ||
| }, | ||
| { | ||
| "appnexus": { | ||
| "alias": "gourmetads" | ||
| } | ||
| }, | ||
| { | ||
| "appnexusAst": { | ||
| "supportedMediaTypes": ["video", "native"] | ||
| } | ||
| }, | ||
| { | ||
| "vertamedia": { | ||
| "supportedMediaTypes": ["video"] | ||
| } | ||
| }, | ||
| { | ||
| "beachfront": { | ||
| "supportedMediaTypes": ["video"] | ||
| } | ||
| }, | ||
| { | ||
| "appnexus": { | ||
| "alias": "matomy" | ||
| } | ||
| }, | ||
| { | ||
| "rubicon": { | ||
| "alias": "rubiconLite", | ||
| "supportedMediaTypes": ["video"] | ||
| } | ||
| }, | ||
| { | ||
| "appnexus": { | ||
| "alias": "featureforward" | ||
| } | ||
| }, | ||
| { | ||
| "appnexus": { | ||
| "alias": "oftmedia" | ||
| } | ||
| }, | ||
| { | ||
| "adkernel": { | ||
| "alias": "headbidding" | ||
| } | ||
| }, | ||
| { | ||
| "getintent": { | ||
| "supportedMediaTypes" : ["video"] | ||
| } | ||
| }, | ||
| { | ||
| "stickyadstv": { | ||
| "alias": "freewheel-ssp" | ||
| } | ||
| }, | ||
| { | ||
| "rhythmone": { | ||
| "supportedMediaTypes": ["video"] | ||
| } | ||
| }, | ||
| { | ||
| "admixer": { | ||
| "supportedMediaTypes": ["video"] | ||
| } | ||
| }, | ||
| { | ||
| "conversant": { | ||
| "supportedMediaTypes": ["video"] | ||
| } | ||
| } | ||
| ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +0,0 @@ | ||
| ["aol"] | ||
Oops, something went wrong.