Skip to content

Commit 4e2c18a

Browse files
author
dsravana
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3f71f1c + 62131cb commit 4e2c18a

File tree

376 files changed

+12397
-7247
lines changed

Some content is hidden

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

376 files changed

+12397
-7247
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
- uses: actions/checkout@v3
1919
with:
2020
fetch-depth: 0
21-
- uses: tj-actions/changed-files@v37
21+
- uses: tj-actions/changed-files@v41
2222
id: changed-files
2323
with:
2424
files: '**/*.md'
2525
separator: ","
26-
- uses: DavidAnson/markdownlint-cli2-action@v13
26+
- uses: DavidAnson/markdownlint-cli2-action@v15
2727
if: steps.changed-files.outputs.any_changed == 'true'
2828
with:
29-
globs: ${{ steps.changed-files.outputs.all_changed_files }}
29+
globs: "${{ steps.changed-files.outputs.all_changed_files }},!_includes"
3030
separator: ","
3131
config: '.markdownlint.json'

.markdownlint.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"default": true,
3+
"MD009": false,
34
"MD013": false,
45
"MD022": false,
56
"MD024": false,

_data/dropdown_v2.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,6 @@
244244
isHeader: 0
245245
isSubSectionStart: 0
246246

247-
- subsectionId: 2
248-
sectionId: 2
249-
sectionName: Support
250-
title: Training Videos
251-
link: /videos/index.html
252-
needsDivider: 0
253-
isHeader: 0
254-
isSubSectionStart: 0
255-
256247
- subsectionId: 2
257248
sectionId: 2
258249
sectionName: Support

_data/partners.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,6 @@
173173
imgURL: /assets/images/partners/community/Adform-Logo.png
174174
type: community
175175

176-
- company: Adomik
177-
link: https://adomik.com/
178-
imgURL: /assets/images/partners/community/Adomik-logo.png
179-
type: community
180-
181176
- company: Adtelligent
182177
link: https://adtelligent.com/
183178
type: community

_data/sidebar.yml

Lines changed: 63 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@
5050
isSectionHeader: 0
5151
subgroup: 0
5252

53+
- sbSecId: 0
54+
title: Glossary
55+
link: /overview/glossary.html
56+
isHeader: 0
57+
isSectionHeader: 0
58+
sectionTitle:
59+
subgroup: 0
60+
5361
- sbSecId: 0
5462
title: Codes of Conduct
5563
link:
@@ -122,20 +130,6 @@
122130
isSectionHeader: 0
123131
subgroup: 2
124132

125-
- sbSecId: 0
126-
title: Prebid and MSPA
127-
link: /features/mspa-usnat.html
128-
isHeader: 0
129-
isSectionHeader: 0
130-
subgroup: 2
131-
132-
- sbSecId: 0
133-
title: Prebid and Quebec Privacy Support
134-
link: /features/ac-quebec.html
135-
isHeader: 0
136-
isSectionHeader: 0
137-
subgroup: 2
138-
139133
#--------------Prebid.js--------------|
140134

141135
- sbSecId: 1
@@ -264,7 +258,7 @@
264258
subgroup: 1
265259

266260
- sbSecId: 1
267-
title: Using Prebid.js with AppNexus Publisher Ad Server
261+
title: Using Prebid.js with Microsoft Monetize Ad Server
268262
link: /dev-docs/examples/use-prebid-with-appnexus-ad-server.html
269263
isHeader: 0
270264
isSectionHeader: 0
@@ -372,6 +366,14 @@
372366
sectionTitle:
373367
subgroup: 3
374368

369+
- sbSecId: 1
370+
title: Internal API Reference
371+
link: /dev-docs/internal-api-reference.html
372+
isHeader: 0
373+
isSectionHeader: 0
374+
sectionTitle:
375+
subgroup: 3
376+
375377
- sbSecId: 1
376378
title: Ad Unit Reference
377379
link: /dev-docs/adunit-reference.html
@@ -791,7 +793,7 @@
791793

792794
- sbSecId: 2
793795
title: Ad Experience Controls
794-
link: /prebid-mobile/modules/rendering/ios-sdk-customization-controls.html
796+
link: /prebid-mobile/modules/rendering/combined-ad-experience-controls.html
795797
isHeader: 0
796798
isSectionHeader: 0
797799
sectionTitle:
@@ -872,7 +874,7 @@
872874

873875
- sbSecId: 2
874876
title: Ad Experience Controls
875-
link: /prebid-mobile/modules/rendering/android-sdk-customization-controls.html
877+
link: /prebid-mobile/modules/rendering/combined-ad-experience-controls.html
876878
isHeader: 0
877879
isSectionHeader: 0
878880
sectionTitle:
@@ -1040,6 +1042,14 @@
10401042
sectionTitle:
10411043
subgroup: 2
10421044

1045+
- sbSecId: 3
1046+
title: 'Header Bidding Trafficking Setup'
1047+
link: /adops/gam-hbt-step-by-step.html
1048+
isHeader: 0
1049+
isSectionHeader: 0
1050+
sectionTitle:
1051+
subgroup: 2
1052+
10431053
- sbSecId: 3
10441054
title: 'Line Item Setup'
10451055
link: /adops/step-by-step.html
@@ -1098,7 +1108,7 @@
10981108
subgroup: 2
10991109

11001110
- sbSecId: 3
1101-
title: "AppNexus Publisher"
1111+
title: "Microsoft Monetize Publisher"
11021112
link:
11031113
isHeader: 0
11041114
isSectionHeader: 0
@@ -1244,13 +1254,6 @@
12441254
sectionTitle:
12451255
subgroup: 0
12461256

1247-
- sbSecId: 4
1248-
title: Training Videos
1249-
link: /videos/prebid-video.html
1250-
isHeader: 0
1251-
isSectionHeader: 0
1252-
sectionTitle:
1253-
subgroup: 0
12541257

12551258
- sbSecId: 4
12561259
title: Prebid.js Video Module
@@ -1338,6 +1341,14 @@
13381341
sectionTitle:
13391342
subgroup: 0
13401343

1344+
- sbSecId: 5
1345+
title: 'PBS+Digital Out Of Home'
1346+
link: /prebid-server/use-cases/pbs-dooh.html
1347+
isHeader: 0
1348+
isSectionHeader: 0
1349+
sectionTitle:
1350+
subgroup: 0
1351+
13411352
- sbSecId: 5
13421353
title: 'Hosting Your Own PBS'
13431354
link: /prebid-server/hosting/pbs-hosting.html
@@ -1722,7 +1733,7 @@
17221733

17231734
- sbSecId: 6
17241735
title: Video
1725-
link: /prebid-video/video-overview.html
1736+
link: /formats/video.html
17261737
isHeader: 0
17271738
isSectionHeader: 0
17281739
sectionTitle:
@@ -1791,12 +1802,34 @@
17911802
subgroup: 0
17921803

17931804
- sbSecId: 7
1794-
title: Training Videos
1795-
link: /videos/
1796-
isHeader: 0
1805+
title: Privacy Resources
1806+
link:
1807+
isHeader: 1
1808+
headerId: privacy
17971809
isSectionHeader: 0
17981810
sectionTitle:
1799-
subgroup: 0
1811+
subgroup: 1
1812+
1813+
- sbSecId: 7
1814+
title: Prebid Privacy Overview
1815+
link: /support/privacy-resources.html
1816+
isHeader: 0
1817+
isSectionHeader: 0
1818+
subgroup: 1
1819+
1820+
- sbSecId: 7
1821+
title: Prebid and MSPA
1822+
link: /features/mspa-usnat.html
1823+
isHeader: 0
1824+
isSectionHeader: 0
1825+
subgroup: 1
1826+
1827+
- sbSecId: 7
1828+
title: Prebid and Quebec Privacy Support
1829+
link: /features/ac-quebec.html
1830+
isHeader: 0
1831+
isSectionHeader: 0
1832+
subgroup: 1
18001833

18011834
- sbSecId: 7
18021835
title: FAQs
@@ -1851,15 +1884,6 @@
18511884
sectionTitle:
18521885
subgroup: 0
18531886

1854-
- sbSecId: 8
1855-
title: Dr. Prebid Validation App
1856-
link: /prebid-mobile/dr-prebid.html
1857-
isHeader: 0
1858-
isSectionHeader: 0
1859-
sectionTitle:
1860-
subgroup: 0
1861-
1862-
18631887
#-------------- Prebid Identity --------------|
18641888

18651889
- sbSecId: 9

_includes/code/mobile-sdk.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
<ul class="nav nav-tabs" role="tablist">
3+
<li class="nav-item ui-tab" role="presentation">
4+
<button class="nav-link active" id="{{ include.id }}-kotlin-tab" data-toggle="tab" data-target="#{{ include.id }}-kotlin" type="button" role="tab" aria-controls="kotlin" aria-selected="true">Kotlin</button>
5+
</li>
6+
<li class="nav-item ui-tab" role="presentation">
7+
<button class="nav-link" id="{{ include.id }}swift-tab" data-toggle="tab" data-target="#{{ include.id }}-swift" type="button" role="tab" aria-controls="swift" aria-selected="false">Swift</button>
8+
</li>
9+
</ul>
10+
<div class="tab-content" id="code-tab-content">
11+
<div class="tab-pane fade show active" id="{{ include.id }}-kotlin" role="tabpanel" aria-labelledby="{{ include.id }}-kotlin-tab">
12+
{{ include.kotlin | markdownify }}
13+
</div>
14+
<div class="tab-pane fade" id="{{ include.id }}-swift" role="tabpanel" aria-labelledby="{{ include.id }}-swift-tab">
15+
{{ include.swift | markdownify }}
16+
</div>
17+
</div>
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<table class="table table-bordered table-striped">
2+
<tr>
3+
<th class="pbTh">Bidder Code</th>
4+
<td class="pbTd">{{ page.biddercode }}</td>
5+
<th class="pbTh">Prebid.org Member</th>
6+
<td class="pbTd">{% if page.prebid_member == true %}yes{% else %}no{% endif %}</td>
7+
</tr>
8+
<tr>
9+
<th class="pbTh">Prebid.js Adapter</th>
10+
<td class="pbTd">{% if page.pbjs == true %}yes{% else %}no{% endif %}</td>
11+
<th class="pbTh">Prebid Server Adapter</th>
12+
<td class="pbTd">{% if page.pbs == true %}yes{% else %}no{% endif %}</td>
13+
</tr>
14+
<tr>
15+
<th class="pbTh">Media Types</th>
16+
<td class="pbTd">{% unless page.media_types contains 'no-display' %}display{% if page.media_types contains 'video' %},{% endif %}{% endunless %}{% if page.media_types contains 'video' %} video{% endif %}{% if page.media_types != "no-display, native" and page.media_types contains 'native' %}, native{% endif %}{% if page.media_types == "no-display, native" %}native{% endif %}</td>
17+
<th class="pbTh">Multi Format Support</th>
18+
<td class="pbTd">{% if page.multiformat_supported %}{{page.multiformat_supported}}{% else %}check with bidder{% endif %}</td>
19+
</tr>
20+
<tr>
21+
<th class="pbTh">TCF-EU Support</th>
22+
<td class="pbTd">{% if page.tcfeu_supported == true %}yes{% else %}no{% endif %}</td>
23+
<th class="pbTh">IAB GVL ID</th>
24+
<td class="pbTd">{% if page.gvl_id %}{{page.gvl_id}}{% else %}check with bidder{% endif %}</td>
25+
</tr>
26+
<tr>
27+
<th class="pbTh">GPP Support</th>
28+
<td class="pbTd">{% if page.gpp_sids and page.gpp_sids != '' %}{{page.gpp_sids}}{% elsif page.gpp_supported == true and page.gpp_sids == nil %}some (check with bidder){% elsif page.gpp_supported == false and gpp_sids == nil %}None{% else %}check with bidder{% endif %}</td>
29+
<th class="pbTh">DSA Support</th>
30+
<td class="pbTd">{% if page.dsa_supported == true %}yes{% elsif page.dsa_supported == false %}no{% else %}check with bidder{% endif %}</td>
31+
</tr>
32+
<tr>
33+
<th class="pbTh">USP/CCPA Support</th>
34+
<td class="pbTd">{% if page.usp_supported == true %}yes{% elsif page.usp_supported == false %}no{% else %}check with bidder{% endif %}</td>
35+
<th class="pbTh">COPPA Support</th>
36+
<td class="pbTd">{% if page.coppa_supported == true %}yes{% elsif page.coppa_supported == false %}no{% else %}check with bidder{% endif %}</td>
37+
</tr>
38+
<tr>
39+
<th class="pbTh">Supply Chain Support</th>
40+
<td class="pbTd">{% if page.schain_supported == true %}yes{% elsif page.schain_supported == false %}no{% else %}check with bidder{% endif %}</td>
41+
<th class="pbTh">Demand Chain Support</th>
42+
<td class="pbTd">{% if page.dchain_supported == true %}yes{% elsif page.dchain_supported == false %}no{% else %}check with bidder{% endif %}</td>
43+
</tr>
44+
<tr>
45+
<th class="pbTh">Safeframes OK</th>
46+
<td class="pbTd">{% if page.safeframes_ok == false %}no{% elsif page.safeframes_ok == true %}yes{% else %}check with bidder{% endif %}</td>
47+
<th class="pbTh">Supports Deals</th>
48+
<td class="pbTd">{% if page.deals_supported == false %}no{% elsif page.deals_supported == true %}yes{% else %}check with bidder{% endif %}</td>
49+
</tr>
50+
<tr>
51+
<th class="pbTh">Floors Module Support</th>
52+
<td class="pbTd">{% if page.floors_supported == true %}yes{% elsif page.floors_supported == false %}no{% else %}check with bidder{% endif %}</td>
53+
<th class="pbTh">First Party Data Support</th>
54+
<td class="pbTd">{% if page.fpd_supported == true %}yes{% elsif page.fpd_supported == false %}no{% else %}check with bidder{% endif %}</td>
55+
</tr>
56+
<tr>
57+
<th class="pbTh">User IDs</th>
58+
<td class="pbTd">{% if page.userIds and page.userIds != '' %}{{page.userIds}}{% else %}none{% endif %}</td>
59+
<th class="pbTh">ORTB Blocking Support</th>
60+
<td class="pbTd">{% if page.ortb_blocking_supported == true %}yes{% elsif page.ortb_blocking_supported == false %}no{% elsif page.ortb_blocking_supported == 'partial' %}partial{% else %}check with bidder{% endif %}</td>
61+
</tr>
62+
<tr>
63+
<th class="pbTh">Privacy Sandbox</th>
64+
<td class="pbTd">{% if page.privacy_sandbox %}{{page.privacy_sandbox}}{% else %}check with bidder{% endif %}</td>
65+
{% if page.pbs == true %}
66+
<th class="pbTh">Prebid Server App Support</th>
67+
<td class="pbTd">{% if page.pbs_app_supported == false %}no{% elsif page.pbs_app_supported == true %}yes{% else %}check with bidder{% endif %}</td>
68+
{% else %}
69+
<th class="pbTh"></th>
70+
<td class="pbTd"></td>
71+
{% endif %}
72+
</tr>
73+
74+
</table>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{: .alert.alert-warning :}
2+
This bidder requires the client side Prebid.js adapter to work on Prebid Server due to the dependency on the `transformBidParams` function.
3+
See [prebid.js #6361](https://github.com/prebid/Prebid.js/issues/6361) for more details.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<ul class="nav nav-tabs" role="tablist">
2+
<li class="nav-item ui-tab" role="presentation">
3+
<button class="nav-link active" id="{{ include.id }}-kotlin-tab" data-toggle="tab" data-target="#{{ include.id }}-kotlin" type="button" role="tab" aria-controls="kotlin" aria-selected="true">Android</button>
4+
</li>
5+
<li class="nav-item ui-tab" role="presentation">
6+
<button class="nav-link" id="{{ include.id }}-swift-tab" data-toggle="tab" data-target="#{{ include.id }}-swift" type="button" role="tab" aria-controls="swift" aria-selected="false">iOS</button>
7+
</li>
8+
</ul>
9+
<div class="tab-content" id="code-tab-content">
10+
<div class="tab-pane fade show active" id="{{ include.id }}-kotlin" role="tabpanel" aria-labelledby="{{ include.id }}-kotlin-tab">
11+
{{ include.kotlin | markdownify }}
12+
</div>
13+
<div class="tab-pane fade" id="{{ include.id }}-swift" role="tabpanel" aria-labelledby="{{ include.id }}-swift-tab">
14+
{{ include.swift | markdownify }}
15+
</div>
16+
</div>

_includes/footer.html

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<!-- Global tag (gtag.js) - Google Analytics -->
1717
<script async src="https://www.googletagmanager.com/gtag/js?id=G-GM972HCTEB"></script>
1818
<script>
19-
// OneTrust has no TCF support, so we disable it explicitly here
2019
window['gtag_enable_tcf_support'] = false;
2120
window.dataLayer = window.dataLayer || [];
2221
function gtag(){dataLayer.push(arguments);}
@@ -30,23 +29,6 @@
3029
anonymize_ip: true
3130
});
3231

33-
// grant consent if one trust says so. We use the callback to update gtag consent status
34-
function oneTrustGaConsent() {
35-
OneTrust.InsertHtml('<span>given</span>', 'prebid-google-analytics-consent', function() {
36-
gtag('consent', 'update', {'ad_storage': 'granted','analytics_storage': 'granted'});
37-
}, {}, 'C0002');
38-
}
39-
40-
41-
// use the global variable provided in the head-common to wait for onetrust
42-
window.onetrustLoaded.then(() => {
43-
// if consent has already been given
44-
oneTrustGaConsent();
45-
46-
// if a users sees the first layer message and gives consent
47-
OneTrust.OnConsentChanged(() => oneTrustGaConsent());
48-
});
49-
5032
</script>
5133

5234

0 commit comments

Comments
 (0)