sync with master

SublimeSkinz · Oct 1, 2019 · 8c2b196 · 8c2b196
1 parent 7075182
commit 8c2b196
Show file tree

Hide file tree

Showing 64 changed files with 3,846 additions and 9,774 deletions.
diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
@@ -174,7 +174,8 @@
                         expires: 60
                       }
                     }],
-                    syncDelay: 5000
+                    syncDelay: 5000,
+                    auctionDelay: 1000 
                 }
             });
             pbjs.addAdUnits(adUnits);

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
@@ -23,7 +23,7 @@ const VERSION = '1.3';
 export const spec = {
 
   code: 'adkernel',
-  aliases: ['headbidding', 'adsolut', 'oftmediahb'],
+  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia'],
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bidRequest) {
     return 'params' in bidRequest &&

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
@@ -116,14 +116,16 @@ export const spec = {
 
     const memberIdBid = find(bidRequests, hasMemberId);
     const member = memberIdBid ? parseInt(memberIdBid.params.member, 10) : 0;
+    const schain = bidRequests[0].schain;
 
     const payload = {
       tags: [...tags],
       user: userObj,
       sdk: {
         source: SOURCE,
         version: '$prebid.version$'
-      }
+      },
+      schain: schain
     };
 
     if (member > 0) {

diff --git a/modules/conversantBidAdapter.js b/modules/conversantBidAdapter.js
diff --git a/modules/conversantBidAdapter.md b/modules/conversantBidAdapter.md