Merge pull request #3 from prebid/master

Pull the latest master
LiveIntent · May 5, 2020 · 1e7fa07 · 1e7fa07
2 parents 70f5a9d + c26f9dc
commit 1e7fa07
Show file tree

Hide file tree

Showing 22 changed files with 1,219 additions and 153 deletions.
diff --git a/_includes/video/pb-is-br.html b/_includes/video/pb-is-br.html
@@ -110,9 +110,9 @@
 
 		  pbjs.setConfig({ 
 		    usePrebidCache: true,
-		    cache: {
-			url: 'https://prebid.adnxs.com/pbc/v1/cache'
-		    } 
+				cache: {
+					url: 'https://prebid.adnxs.com/pbc/v1/cache'
+				} 
 		  });
 
 		  pbjs.requestBids({

diff --git a/dev-docs/bidders/152media.md → deprecated-bidders/152media.md b/dev-docs/bidders/152media.md → deprecated-bidders/152media.md
@@ -1,5 +1,5 @@
 ---
-layout: bidder
+layout: deprecated-bidder
 title: 152Media
 description: Prebid 152Media Bidder Adaptor
 

diff --git a/dev-docs/bidders/archon.md b/dev-docs/bidders/archon.md
diff --git a/dev-docs/bidders/districtmdmx.md b/dev-docs/bidders/districtmdmx.md
@@ -7,6 +7,8 @@ biddercode: districtmDMX
 gdpr_supported: true
 schain_supported: true
 usp_supported: true
+coppa_supported: true
+userIds: digitrust, id5Id, identityLink, pubCommonId, unifiedId
 ---
 
 

diff --git a/dev-docs/bidders/gumgum.md b/dev-docs/bidders/gumgum.md
@@ -27,3 +27,4 @@ information.
 | `inScreenPubID`| optional | Publisher ID| `123`        | `integer` |
 | `inSlot`       | optional | Slot ID     | `9`          | `integer` |
 | `video`        | optional | Tracking ID | `'ggumtest'` | `string`  |
+| `inVideo`      | optional | Tracking ID | `'ggumtest'` | `string`  |
diff --git a/dev-docs/bidders/lunamedia.md b/dev-docs/bidders/lunamedia.md
@@ -0,0 +1,22 @@
+---
+layout: bidder
+title: Luna Media
+description: Prebid Luna Media Bidder Adapter
+hide: true
+biddercode: lunamedia
+---
+
+### Note:
+For more information about Luna Media, please contact lokesh@advangelists.com
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name             | Scope    | Description      | Example                                  | Type              |
+|------------------|----------|------------------|------------------------------------------|-------------------|
+| `placement  `    | required |                  | `'263'`                                  | `string`          |
+| `pubid`          | required |                  | `'0cf8d6d643e13d86a5b6374148a4afac'`     | `string`          |
+| `mimes`          | optional |  video only      | `['video/mp4', 'application/javascript']`| `array of strings`|
+| `playbackmethod` | optional |  video only      | `[2,6]`                                  | `array of numbers`|
+| `maxduration`    | optional |  video only      | `30`                                     | `number`          |
+| `skip`           | optional |  video only      | `0 or 1`                                 | `number`          |
diff --git a/dev-docs/bidders/luponmedia.md b/dev-docs/bidders/luponmedia.md
@@ -0,0 +1,23 @@
+---
+layout: bidder
+title: LuponMedia
+description: LuponMedia Bidder Adapter
+hide: true
+biddercode: luponmedia
+gdpr_supported: true
+usp_supported: true
+coppa_supported: true
+schain_supported: true
+userIds: digitrust, identityLink, liveIntentId, pubCommonId
+---
+
+### Note:
+The LuponMedia bidder adapter requires setup and approval from the LuponMedia support team, even for existing LuponMedia publishers. Please contact us for more information.
+
+### Bid Params
+
+{: .table .table-bordered .table-striped }
+| Name   | Scope    | Description              | Example | Type      |
+|--------|----------|--------------------------|---------|-----------|
+| `siteId`  | required | The publisher's unique site ID | `12345`   | `integer` |
+| `keyId` | required | The key ID              | `4o2c4` | `string` |
diff --git a/dev-docs/bidders/nobidBidAdapter.md b/dev-docs/bidders/nobidBidAdapter.md
@@ -4,7 +4,7 @@ title: Nobid
 description: Prebid Nobid Bidder Adaptor
 biddercode: nobid
 hide: true
-media_types: banner
+media_types: banner, video
 gdpr_supported: true
 usp_supported: true
 schain_supported: true
@@ -18,12 +18,13 @@ coppa_supported: true
 |---------------|----------|-------------|---------|----------|
 | `siteId` | required | siteId is provided by your NoBid account manager(s) |         | `integer` |
 | `placementId` | optional | placementId is provided by your NoBid account manager(s). This parameter allows to report on a specific ad unit |         | `integer` |
+| `video`| optional | Object containing video targeting parameters.  See [Video Object](#nobid-video-object) for details. | `video: { playback_method: ['auto_play_sound_off'] }` | `object`|
 
 # Test Parameters
 ```
     var adUnits = [
         {
-            code: 'test-div',
+            code: 'test-div1',
             mediaTypes: {
                 banner: {
                     sizes: [[300, 250]],  // a display size
@@ -39,7 +40,7 @@ coppa_supported: true
                 }
             ]
         },{
-            code: 'test-div',
+            code: 'test-div2',
             mediaTypes: {
                 banner: {
                     sizes: [[320, 50]],   // a mobile size
@@ -55,4 +56,20 @@ coppa_supported: true
             ]
         }
     ];
-```
+```
+
+<a name="nobid-video-object" />
+
+#### Video Object
+
+{: .table .table-bordered .table-striped }
+| Name              | Description                                                                                                                                                                                                                                          | Type             |
+|-------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------|
+| `skippable`       | Boolean which, if `true`, means the user can click a button to skip the video ad. Defaults to `false`.                                                                                                                                               | `boolean`        |
+| `playback_method` | Array of strings listing playback methods supported by the publisher. Allowed values: `"auto_play_sound_on"`; `"auto_play_sound_off"`; `"click_to_play"`; `"mouseover"`; `"auto_play_sound_unknown"`; `"viewport_sound_on"`, `"viewport_sound_off"`. | `Array<string>`  |
+| `position`        | Array of strings listing video player position supported by the publisher. Allowed values: `"na"`, `"atf"`, `"btf"`, `"head"`, `"foot"`, `"sidebar"`, `"full"`.                                                                                      | `Array<string>`  |
+| `mimes`           | Array of strings listing the content MIME types supported, e.g., `["video/x-flv", "video/x-ms-wmv"]`.                                                                                                                                                | `Array<string>`  |
+| `minduration`     | Integer that defines the minimum video ad duration in seconds.                                                                                                                                                                                       | `integer`        |
+| `maxduration`     | Integer that defines the maximum video ad duration in seconds.                                                                                                                                                                                       | `integer`        |
+| `frameworks`      | Array of integers listing API frameworks supported by the publisher. Allowed values: None: `0`; VPAID 1.0: `1`; VPAID 2.0: `2`; MRAID 1.0: `3`; ORMMA: `4`; MRAID 2.0: `5`.                                                                          | `Array<integer>` |
+
diff --git a/dev-docs/bidders/onefiftytwo.md b/dev-docs/bidders/onefiftytwo.md
diff --git a/dev-docs/bidders/pubmatic.md b/dev-docs/bidders/pubmatic.md
@@ -11,6 +11,7 @@ coppa_supported: true
 schain_supported: true
 userIds: britepoolId, criteo, digitrust, id5Id, identityLink, liveIntentId, netId, parrableId, pubCommonId, unifiedId
 prebid_member: true
+tcf2_supported: true
 ---
 
 ### Prebid Server Note:

diff --git a/dev-docs/bidders/yieldmo.md b/dev-docs/bidders/yieldmo.md
@@ -5,7 +5,10 @@ description: Prebid Yieldmo Bidder Adaptor
 hide: true
 biddercode: yieldmo
 media_types: native
-userIds: pubCommonId, unifiedId
+userIds: pubCommonId, unifiedId, criteo
+gdpr_supported: true
+usp_supported: true
+schain_supported: true
 ---
 
 

diff --git a/dev-docs/faq.md b/dev-docs/faq.md
@@ -64,7 +64,7 @@ The "limited bid caching" feature applies only:
 Since the storage is in the browser, cached bids only apply to a single page context. If the user refreshes the page, the bid is lost.
 
 Each bid adapter defines the amount of time their bids can be cached and reconsidered.
-This setting is called “Time to Live” (TTL), documented [here]({{site.baseurl}}/dev-docs/publisher-api-reference.html#module_pbjs.getBidResponses).
+This setting is called “Time to Live” (TTL), documented in the <code>pbjs.getBidResponse</code> [parameter table here]({{site.baseurl}}/dev-docs/publisher-api-reference.html#module_pbjs.getBidResponses).
 
 Examples of scenarios where a bid may be reconsidered in Prebid.js:
 

diff --git a/dev-docs/modules/sizeMappingV2.md b/dev-docs/modules/sizeMappingV2.md
@@ -3,8 +3,8 @@ layout: page_v2
 page_type: module
 title: Module - Size Mapping
 description: Display Conditional and Responsive Ad Units
-module_code: sizeMapping
-display_name: Size Mapping
+module_code: sizeMappingV2
+display_name: Advanced Size Mapping
 enable_download: true
 sidebarType: 1
 ---