Skip to content

Commit 9ad53ea

Browse files
DimaIntentIQDimaIntentIQ
authored
Merge branch 'master' into master
2 parents 33eb513 + f1b7791 commit 9ad53ea

58 files changed

Lines changed: 1609 additions & 274 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
21-
- uses: tj-actions/changed-files@v44
21+
- uses: tj-actions/changed-files@v46
2222
id: changed-files
2323
with:
2424
files: '**/*.md'

‎_data/sidebar.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,14 @@
450450
sectionTitle:
451451
subgroup: 4
452452

453+
- sbSecId: 1
454+
title: How to Add A User ID submodule
455+
link: /dev-docs/userId-module.html
456+
isHeader: 0
457+
isSectionHeader: 0
458+
sectionTitle:
459+
subgroup: 4
460+
453461
- sbSecId: 1
454462
title: How to Add a Prebid.js Video submodule
455463
link: /dev-docs/add-video-submodule.html

‎_includes/code/gma-versions-tabs.html‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<ul class="nav nav-tabs" role="tablist">
2+
<!-- GMA SDK v12 Tab -->
3+
<li class="nav-item ui-tab" role="presentation">
4+
<button
5+
class="nav-link active"
6+
id="{{ include.id }}-gma12-tab"
7+
data-toggle="tab"
8+
data-target="#{{ include.id }}-gma12"
9+
type="button"
10+
role="tab"
11+
aria-controls="gma12"
12+
aria-selected="true"
13+
>
14+
GMA SDK v12
15+
</button>
16+
</li>
17+
<!-- GMA SDK v11 Tab -->
18+
<li class="nav-item ui-tab" role="presentation">
19+
<button
20+
class="nav-link"
21+
id="{{ include.id }}-gma11-tab"
22+
data-toggle="tab"
23+
data-target="#{{ include.id }}-gma11"
24+
type="button"
25+
role="tab"
26+
aria-controls="gma11"
27+
aria-selected="false"
28+
>
29+
GMA SDK v11
30+
</button>
31+
</li>
32+
</ul>
33+
34+
<div class="tab-content" id="gma-sdk-tab-content">
35+
<!-- GMA SDK v12 Content -->
36+
<div
37+
class="tab-pane fade show active"
38+
id="{{ include.id }}-gma12"
39+
role="tabpanel"
40+
aria-labelledby="{{ include.id }}-gma12-tab"
41+
>
42+
<div class="highlight">
43+
<pre
44+
class="highlight language-swift"
45+
><code class="language-swift">{{ include.gma12 | xml_escape }}</code></pre>
46+
</div>
47+
</div>
48+
<!-- GMA SDK v11 Content -->
49+
<div
50+
class="tab-pane fade"
51+
id="{{ include.id }}-gma11"
52+
role="tabpanel"
53+
aria-labelledby="{{ include.id }}-gma11-tab"
54+
>
55+
<div class="highlight">
56+
<pre
57+
class="highlight language-swift"
58+
><code class="language-swift">{{ include.gma11 | xml_escape }}</code></pre>
59+
</div>
60+
</div>
61+
</div>

‎_includes/dev-docs/vendor-exception.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{: .alert.alert-warning :}
2+
Prebid.org recommends working with a privacy lawyer before making enforcement exceptions for any vendor.
3+
{% if include.gvlId %}We recommend publishers let Prebid.js make use of their registered GVL ID {{ include.gvlId }} instead of a vendor exception.{% endif %}

‎_includes/mobile/adunit-config-android.md‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,38 @@ You can set `adPosition` by using the following method:
6767

6868
```kotlin
6969
adUnit.setAdPosition(AdPosition.FOOTER);
70-
```
70+
```
71+
72+
73+
### Native Impression Tracking
74+
75+
The SDK offers an API that enables impression tracking for the following ad unit types: `BannerAdUnit`, `InterstitialAdUnit`, and `PrebidAdUnit`. An example implementation is provided below:
76+
77+
`BannerAdUnit`:
78+
79+
```kotlin
80+
val adView = AdManagerAdView(this)
81+
val adUnit = BannerAdUnit(CONFIG_ID, WIDTH, HEIGHT)
82+
adUnit.activatePrebidImpressionTracker(adView)
83+
```
84+
85+
`InterstitialAdUnit`:
86+
87+
```kotlin
88+
val adUnit = InterstitialAdUnit(CONFIG_ID, 80, 60)
89+
adUnit.activateInterstitialPrebidImpressionTracker()
90+
```
91+
92+
`PrebidAdUnit`:
93+
94+
```kotlin
95+
val prebidAdUnit = PrebidAdUnit(configId)
96+
97+
// Use this method for banners
98+
prebidAdUnit.activatePrebidImpressionTracker(adView)
99+
100+
// Use this method for interstitials
101+
prebidAdUnit.activateInterstitialPrebidImpressionTracker()
102+
```
103+
104+
**NOTE**: The SDK support only `seatbid[].bid[].burl` as impression tracking URL for now.

‎_includes/mobile/adunit-config-ios.md‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,38 @@ You can set `adPosition` by using the following property:
5656

5757
```swift
5858
adUnit.adPosition = .footer
59-
```
59+
```
60+
61+
### Native Impression Tracking
62+
63+
The SDK offers an API that enables impression tracking for the following ad unit types: `BannerAdUnit`, `InterstitialAdUnit`, and `PrebidAdUnit`. An example implementation is provided below:
64+
65+
`BannerAdUnit`:
66+
67+
```swift
68+
let adUnit = BannerAdUnit(configId: CONFIG_ID, size: AD_SIZE)
69+
let gamBanner = GAMBannerView(adSize: GADAdSizeFromCGSize(AD_SIZE))
70+
adUnit.activatePrebidImpressionTracker(adView: gamBanner)
71+
```
72+
73+
`InterstitialAdUnit`:
74+
75+
```swift
76+
let adUnit = InterstitialAdUnit(configId: CONFIG_ID, minWidthPerc: 50, minHeightPerc: 70)
77+
adUnit.activatePrebidImpressionTracker()
78+
```
79+
80+
`PrebidAdUnit`:
81+
82+
```swift
83+
let adUnit = PrebidAdUnit(configId: CONFIG_ID)
84+
85+
// Use this method for intersitials
86+
adUnit.activatePrebidInterstitialImpressionTracker()
87+
88+
// Use this method for banners
89+
let gamBanner = GAMBannerView(adSize: GADAdSizeFromCGSize(AD_SIZE))
90+
adUnit.activatePrebidAdViewImpressionTracker(adView: gamBanner)
91+
```
92+
93+
**NOTE**: The SDK support only `seatbid[].bid[].burl` as impression tracking URL for now.

‎dev-docs/adunit-reference.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,9 +599,9 @@ time to set targeting.
599599

600600
<a name="adUnit-fpd-example"></a>
601601

602-
### First Party Data
602+
### First Party Data and Floors
603603

604-
Example of an adunit-specific block of first party data:
604+
Example of an adunit-specific block of first party data and a static floor:
605605

606606
```javascript
607607
pbjs.addAdUnits({
@@ -612,6 +612,8 @@ pbjs.addAdUnits({
612612
}
613613
},
614614
ortb2Imp: {
615+
bidfloor: 1.00,
616+
bidfloorcur: "EUR",
615617
ext: {
616618
data: {
617619
pbadslot: "homepage-top-rect",

‎dev-docs/analytics/uniquest.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
layout: analytics
3+
title: UNIQUEST
4+
description: UNIQUEST Prebid Analytics Adapter
5+
modulecode: uniquest
6+
enable_download: false
7+
---
8+
9+
#### Analytics Options
10+
11+
{: .table .table-bordered .table-striped }
12+
| Name | Scope | Description | Example | Type |
13+
|-------|----------|---------------------------|----------|----------|
14+
| `sid` | required | The AdUnit ID from UNIQUEST | `'SID00001'` | `string` |

‎dev-docs/bidders/1accord.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ safeframes_ok: true
1919
deals_supported: true
2020
sidebarType: 1
2121
fpd_supported: true
22+
multiformat_supported: will-bid-on-any
2223

2324
---
2425

‎dev-docs/bidders/adgeneration.md‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
layout: bidder
33
title: Ad Generation
44
description: Prebid Ad Generation Bidder Adaptor
5+
schain_supported: true
56
pbjs: true
6-
pbs: true
7+
pbs: no
8+
pbs_app_supported: no
9+
fpd_supported: true
710
biddercode: adgeneration
8-
userIds: criteo, id5Id
11+
userIds: all
912
media_types: native
1013
sidebarType: 1
1114
---
@@ -17,3 +20,36 @@ sidebarType: 1
1720
| Name | Scope | Description | Example | Type |
1821
|------|----------|-------------|----------|----------|
1922
| `id` | required | adId | `'1234'` | `string` |
23+
24+
#### First Party Data
25+
26+
In release 1.6.4 and later, publishers should use the `ortb2` method of setting [First Party Data](https://docs.prebid.org/features/firstPartyData.html). The following fields are supported:
27+
28+
* ortb2.site.content.data[]
29+
30+
If `ad-generation.jp` is specified for ortb2.site.content.data[].name and `546` is specified for ortb2.site.content.data[].ext.segtax,
31+
`ortb2.site.content.data[].segment[].name` and `ortb2.site.content.data[].segment[].value` can be any string value.
32+
33+
Example first party data that's available to all bidders and all adunits:
34+
35+
```javascript
36+
pbjs.setConfig({
37+
ortb2: {
38+
site: {
39+
content: {
40+
data: [{
41+
name: "ad-generation.jp",
42+
ext: {
43+
segtax: 546
44+
},
45+
segment: [
46+
{ name: "news_category", value: "Sports_Sumo" },// name and value must be string types
47+
{ name: "local_gourmet", value: "sushi" },
48+
{ name: "location", value: "tokyo" }
49+
]
50+
}]
51+
}
52+
},
53+
}
54+
});
55+
```

0 commit comments

Comments
 (0)