Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Doceree-techStack authored Apr 3, 2024
2 parents 78cf57e + c8ed5f6 commit fc5cafd
Show file tree
Hide file tree
Showing 249 changed files with 7,753 additions and 2,696 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: tj-actions/changed-files@v37
- uses: tj-actions/changed-files@v41
id: changed-files
with:
files: '**/*.md'
separator: ","
- uses: DavidAnson/markdownlint-cli2-action@v13
- uses: DavidAnson/markdownlint-cli2-action@v15
if: steps.changed-files.outputs.any_changed == 'true'
with:
globs: ${{ steps.changed-files.outputs.all_changed_files }}
globs: "${{ steps.changed-files.outputs.all_changed_files }},!_includes"
separator: ","
config: '.markdownlint.json'
1 change: 1 addition & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"default": true,
"MD009": false,
"MD013": false,
"MD022": false,
"MD024": false,
Expand Down
83 changes: 53 additions & 30 deletions _data/sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@
isSectionHeader: 0
subgroup: 0

- sbSecId: 0
title: Glossary
link: /overview/glossary.html
isHeader: 0
isSectionHeader: 0
sectionTitle:
subgroup: 0

- sbSecId: 0
title: Codes of Conduct
link:
Expand Down Expand Up @@ -122,20 +130,6 @@
isSectionHeader: 0
subgroup: 2

- sbSecId: 0
title: Prebid and MSPA
link: /features/mspa-usnat.html
isHeader: 0
isSectionHeader: 0
subgroup: 2

- sbSecId: 0
title: Prebid and Quebec Privacy Support
link: /features/ac-quebec.html
isHeader: 0
isSectionHeader: 0
subgroup: 2

#--------------Prebid.js--------------|

- sbSecId: 1
Expand Down Expand Up @@ -264,7 +258,7 @@
subgroup: 1

- sbSecId: 1
title: Using Prebid.js with AppNexus Publisher Ad Server
title: Using Prebid.js with Microsoft Monetize Ad Server
link: /dev-docs/examples/use-prebid-with-appnexus-ad-server.html
isHeader: 0
isSectionHeader: 0
Expand Down Expand Up @@ -372,6 +366,14 @@
sectionTitle:
subgroup: 3

- sbSecId: 1
title: Internal API Reference
link: /dev-docs/internal-api-reference.html
isHeader: 0
isSectionHeader: 0
sectionTitle:
subgroup: 3

- sbSecId: 1
title: Ad Unit Reference
link: /dev-docs/adunit-reference.html
Expand Down Expand Up @@ -1098,7 +1100,7 @@
subgroup: 2

- sbSecId: 3
title: "AppNexus Publisher"
title: "Microsoft Monetize Publisher"
link:
isHeader: 0
isSectionHeader: 0
Expand Down Expand Up @@ -1338,6 +1340,14 @@
sectionTitle:
subgroup: 0

- sbSecId: 5
title: 'PBS+Digital Out Of Home'
link: /prebid-server/use-cases/pbs-dooh.html
isHeader: 0
isSectionHeader: 0
sectionTitle:
subgroup: 0

- sbSecId: 5
title: 'Hosting Your Own PBS'
link: /prebid-server/hosting/pbs-hosting.html
Expand Down Expand Up @@ -1722,7 +1732,7 @@

- sbSecId: 6
title: Video
link: /prebid-video/video-overview.html
link: /formats/video.html
isHeader: 0
isSectionHeader: 0
sectionTitle:
Expand Down Expand Up @@ -1791,12 +1801,34 @@
subgroup: 0

- sbSecId: 7
title: Training Videos
link: /videos/
isHeader: 0
title: Privacy Resources
link:
isHeader: 1
headerId: privacy
isSectionHeader: 0
sectionTitle:
subgroup: 0
subgroup: 1

- sbSecId: 7
title: Prebid Privacy Overview
link: /support/privacy-resources.html
isHeader: 0
isSectionHeader: 0
subgroup: 1

- sbSecId: 7
title: Prebid and MSPA
link: /features/mspa-usnat.html
isHeader: 0
isSectionHeader: 0
subgroup: 1

- sbSecId: 7
title: Prebid and Quebec Privacy Support
link: /features/ac-quebec.html
isHeader: 0
isSectionHeader: 0
subgroup: 1

- sbSecId: 7
title: FAQs
Expand Down Expand Up @@ -1851,15 +1883,6 @@
sectionTitle:
subgroup: 0

- sbSecId: 8
title: Dr. Prebid Validation App
link: /prebid-mobile/dr-prebid.html
isHeader: 0
isSectionHeader: 0
sectionTitle:
subgroup: 0


#-------------- Prebid Identity --------------|

- sbSecId: 9
Expand Down
17 changes: 17 additions & 0 deletions _includes/code/mobile-sdk.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

<ul class="nav nav-tabs" role="tablist">
<li class="nav-item ui-tab" role="presentation">
<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>
</li>
<li class="nav-item ui-tab" role="presentation">
<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>
</li>
</ul>
<div class="tab-content" id="code-tab-content">
<div class="tab-pane fade show active" id="{{ include.id }}-kotlin" role="tabpanel" aria-labelledby="{{ include.id }}-kotlin-tab">
<pre><code class="language-kotlin">{{ include.kotlin }}</code></pre>
</div>
<div class="tab-pane fade" id="{{ include.id }}-swift" role="tabpanel" aria-labelledby="{{ include.id }}-swift-tab">
<pre><code class="language-swift">{{ include.swift }}</code></pre>
</div>
</div>
74 changes: 74 additions & 0 deletions _includes/dev-docs/bidder-meta-data.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<table class="table table-bordered table-striped">
<tr>
<th class="pbTh">Bidder Code</th>
<td class="pbTd">{{ page.biddercode }}</td>
<th class="pbTh">Prebid.org Member</th>
<td class="pbTd">{% if page.prebid_member == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Prebid.js Adapter</th>
<td class="pbTd">{% if page.pbjs == true %}yes{% else %}no{% endif %}</td>
<th class="pbTh">Prebid Server Adapter</th>
<td class="pbTd">{% if page.pbs == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Media Types</th>
<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>
<th class="pbTh">Multi Format Support</th>
<td class="pbTd">{% if page.multiformat_supported %}{{page.multiformat_supported}}{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">TCF-EU Support</th>
<td class="pbTd">{% if page.tcfeu_supported == true %}yes{% else %}no{% endif %}</td>
<th class="pbTh">IAB GVL ID</th>
<td class="pbTd">{% if page.gvl_id %}{{page.gvl_id}}{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">GPP Support</th>
<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>
<th class="pbTh">DSA Support</th>
<td class="pbTd">{% if page.dsa_supported == true %}yes{% elsif page.dsa_supported == false %}no{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">USP/CCPA Support</th>
<td class="pbTd">{% if page.usp_supported == true %}yes{% elsif page.usp_supported == false %}no{% else %}check with bidder{% endif %}</td>
<th class="pbTh">COPPA Support</th>
<td class="pbTd">{% if page.coppa_supported == true %}yes{% elsif page.coppa_supported == false %}no{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Supply Chain Support</th>
<td class="pbTd">{% if page.schain_supported == true %}yes{% elsif page.schain_supported == false %}no{% else %}check with bidder{% endif %}</td>
<th class="pbTh">Demand Chain Support</th>
<td class="pbTd">{% if page.dchain_supported == true %}yes{% elsif page.dchain_supported == false %}no{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Safeframes OK</th>
<td class="pbTd">{% if page.safeframes_ok == false %}no{% elsif page.safeframes_ok == true %}yes{% else %}check with bidder{% endif %}</td>
<th class="pbTh">Supports Deals</th>
<td class="pbTd">{% if page.deals_supported == false %}no{% elsif page.deals_supported == true %}yes{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Floors Module Support</th>
<td class="pbTd">{% if page.floors_supported == true %}yes{% elsif page.floors_supported == false %}no{% else %}check with bidder{% endif %}</td>
<th class="pbTh">First Party Data Support</th>
<td class="pbTd">{% if page.fpd_supported == true %}yes{% elsif page.fpd_supported == false %}no{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">User IDs</th>
<td class="pbTd">{% if page.userIds and page.userIds != '' %}{{page.userIds}}{% else %}none{% endif %}</td>
<th class="pbTh">ORTB Blocking Support</th>
<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>
</tr>
<tr>
<th class="pbTh">Privacy Sandbox</th>
<td class="pbTd">{% if page.privacy_sandbox %}{{page.privacy_sandbox}}{% else %}check with bidder{% endif %}</td>
{% if page.pbs == true %}
<th class="pbTh">Prebid Server App Support</th>
<td class="pbTd">{% if page.pbs_app_supported == false %}no{% elsif page.pbs_app_supported == true %}yes{% else %}check with bidder{% endif %}</td>
{% else %}
<th class="pbTh"></th>
<td class="pbTd"></td>
{% endif %}
</tr>

</table>
3 changes: 3 additions & 0 deletions _includes/dev-docs/pbjs-adapter-required-for-pbs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{: .alert.alert-warning :}
This bidder requires the client side Prebid.js adapter to work on Prebid Server due to the dependency on the `transformBidParams` function.
See [prebid.js #6361](https://github.com/prebid/Prebid.js/issues/6361) for more details.
7 changes: 7 additions & 0 deletions _includes/legal-warning.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div markdown="span" class="pb-alert pb-alert-warning" role="alert">
Important: This resource should not be construed as legal advice and Prebid.org makes no guarantees about compliance with any law or regulation.
Please note that because every company and its collection, use, and storage of personal data is different, you should seek independent legal advice
relating to obligations under your regional regulations, including the GDPR, the ePrivacy Directive and individual country/province/state laws. Only a
lawyer can provide you with legal advice specifically tailored to your situation. Nothing in this guide is intended to provide you with, or should be
used as a substitute for, legal advice tailored to your business.
</div>
63 changes: 1 addition & 62 deletions _layouts/bidder.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,68 +49,7 @@ <h3>Note:</h3> This is a Prebid Server adapter only.

<h3>Features</h3>

<table class="table table-bordered table-striped">
<tr>
<th class="pbTh">Bidder Code</th>
<td class="pbTd">{{ page.biddercode }}</td>
<th class="pbTh">Prebid.org Member</th>
<td class="pbTd">{% if page.prebid_member == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Media Types</th>
<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>
<th class="pbTh">TCF-EU Support</th>
<td class="pbTd">{% if page.tcfeu_supported == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">User IDs</th>
<td class="pbTd">{% if page.userIds and page.userIds != '' %}{{page.userIds}}{% else %}none{% endif %}</td>
<th class="pbTh">USP/CCPA Support</th>
<td class="pbTd">{% if page.usp_supported == true %}yes{% elsif page.usp_supported == false %}no{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Supply Chain Support</th>
<td class="pbTd">{% if page.schain_supported == true %}yes{% elsif page.schain_supported == false %}no{% else %}check with bidder{% endif %}</td>
<th class="pbTh">COPPA Support</th>
<td class="pbTd">{% if page.coppa_supported == true %}yes{% elsif page.coppa_supported == false %}no{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Demand Chain Support</th>
<td class="pbTd">{% if page.dchain_supported == true %}yes{% elsif page.dchain_supported == false %}no{% else %}check with bidder{% endif %}</td>
<th class="pbTh">GPP Support</th>
<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>
</tr>
<tr>
<th class="pbTh">Supports Deals</th>
<td class="pbTd">{% if page.deals_supported == false %}no{% elsif page.deals_supported == true %}yes{% else %}check with bidder{% endif %}</td>
<th class="pbTh">Prebid.js Adapter</th>
<td class="pbTd">{% if page.pbjs == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">IAB GVL ID</th>
<td class="pbTd">{% if page.gvl_id %}{{page.gvl_id}}{% else %}check with bidder{% endif %}</td>
<th class="pbTh">Prebid Server Adapter</th>
<td class="pbTd">{% if page.pbs == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Floors Module Support</th>
<td class="pbTd">{% if page.floors_supported == true %}yes{% elsif page.floors_supported == false %}no{% else %}check with bidder{% endif %}</td>
<th class="pbTh">First Party Data Support</th>
<td class="pbTd">{% if page.fpd_supported == true %}yes{% elsif page.fpd_supported == false %}no{% else %}check with bidder{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Multi Format Support</th>
<td class="pbTd">{% if page.multiformat_supported %}{{page.multiformat_supported}}{% else %}check with bidder{% endif %}</td>
<th class="pbTh">ORTB Blocking Support</th>
<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>
</tr>
<tr>
<th class="pbTh">Safeframes OK</th>
<td class="pbTd">{% if page.safeframes_ok == false %}no{% elsif page.safeframes_ok == true %}yes{% else %}check with bidder{% endif %}</td>
<th class="pbTh"></th>
<td class="pbTd"></td>
</tr>
</table>
{% include dev-docs/bidder-meta-data.html page=page %}

{{content}}

Expand Down
Loading

0 comments on commit fc5cafd

Please sign in to comment.