Skip to content

Commit b3f5059

Browse files
DariaBoykoAdmixerDariaBoykoAdmixer
authored
Merge branch 'prebid:master' into master
2 parents 4e66de2 + aa43916 commit b3f5059

255 files changed

Lines changed: 9026 additions & 1212 deletions

File tree

Some content is hidden

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

‎.github/workflows/scripts/codepath-notification‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@
1414
/dev-docs/bidders/appnexus|/dev-docs/bidders/msft : prebid@microsoft.com
1515
/dev-docs/bidders/pubmatic : header-bidding@pubmatic.com
1616
/dev-docs/bidders/openx : prebid@openx.com
17+
/dev-docs/bidders/teads : tech-ssp-video@teads.tv
18+
/dev-docs/bidders/kargo : kraken@kargo.com

‎ADS - Acceso directo.lnk‎

885 Bytes
Binary file not shown.

‎_data/sidebar.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,14 @@
531531
sectionTitle:
532532
subgroup: 5
533533

534+
- sbSecId: 1
535+
title: Loading modules separately
536+
link: /dev-docs/modules/index.html#loading-modules-separately
537+
isHeader: 0
538+
isSectionHeader: 0
539+
sectionTitle:
540+
subgroup: 5
541+
534542
- sbSecId: 1
535543
title: External Interfaces
536544
link:
@@ -815,6 +823,14 @@
815823
sectionTitle:
816824
subgroup: 2
817825

826+
- sbSecId: 2
827+
title: Ad Experience Specification
828+
link: /prebid-mobile/modules/rendering/combined-ui-ux-policy.html
829+
isHeader: 0
830+
isSectionHeader: 0
831+
sectionTitle:
832+
subgroup: 2
833+
818834
- sbSecId: 2
819835
title: Ad Experience Controls
820836
link: /prebid-mobile/modules/rendering/combined-ad-experience-controls.html
@@ -919,6 +935,14 @@
919935
isSectionHeader: 0
920936
sectionTitle:
921937
subgroup: 3
938+
939+
- sbSecId: 2
940+
title: Ad Experience Specification
941+
link: /prebid-mobile/modules/rendering/combined-ui-ux-policy.html
942+
isHeader: 0
943+
isSectionHeader: 0
944+
sectionTitle:
945+
subgroup: 3
922946

923947
- sbSecId: 2
924948
title: Ad Experience Controls
@@ -2018,3 +2042,32 @@
20182042
isSectionHeader: 0
20192043
sectionTitle:
20202044
subgroup: 0
2045+
2046+
#-------------- Prebid Agents --------------|
2047+
2048+
- sbSecId: 10
2049+
title:
2050+
link:
2051+
isHeader: 0
2052+
isSectionHeader: 1
2053+
sectionTitle: Prebid Agents
2054+
sectionId: prebid-agents
2055+
subgroup: 1000
2056+
sbCollapseId: prebid-agents
2057+
2058+
- sbSecId: 10
2059+
title: General
2060+
link:
2061+
isHeader: 1
2062+
headerId: agents-general
2063+
isSectionHeader: 0
2064+
sectionTitle:
2065+
subgroup: 0
2066+
2067+
- sbSecId: 10
2068+
title: Salesagent
2069+
link: /agents/salesagent.html
2070+
isHeader: 0
2071+
isSectionHeader: 0
2072+
sectionTitle:
2073+
subgroup: 0

‎_includes/body-end.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script src="https://cdn.jsdelivr.net/npm/@docsearch/js@3"></script>
22
<script type="text/javascript"> docsearch({
3-
apiKey: '6f0eda209a805cfa66b415043ab5fbfc',
3+
apiKey: '7777b1f98e980527606d00e705ff3d6f',
44
appId: 'FN26QH8JE9',
55
indexName: 'prebid',
66
container: '.pb-header .c-search',

‎_includes/mobile/gam-native-adops.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1><a target="_blank" href="hb_native_linkurl" class="pb-click">hb_native_title
2020
<div class="attribution">hb_native_brand</div>
2121
</div>
2222
</div>
23-
<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/native-trk.js"></script>
23+
<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@%%PATTERN:hb_ver%%/dist/native-trk.js"></script>
2424
<script>
2525
var pbNativeTagData = {};
2626
pbNativeTagData.uuid = "%%PATTERN:hb_cache_id%%";

‎_includes/video/pb-is-jw01.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
pbjs.setConfig({
4545
debug: true,
4646
cache: {
47-
url: "https://prebid.adnxs.com/pbc/v1/cache",
47+
url: "https://prebid.example.com/pbc/v1/cache",
4848
},
4949
});
5050

‎_includes/video/pb-is-jw02.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
pbjs.setConfig({
4949
debug: true,
5050
cache: {
51-
url: "https://prebid.adnxs.com/pbc/v1/cache",
51+
url: "https://prebid.example.com/pbc/v1/cache",
5252
},
5353
});
5454

‎_includes/video/pb-is-vjs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
pbjs.setConfig({
6666
debug: true,
6767
cache: {
68-
url: "https://prebid.adnxs.com/pbc/v1/cache",
68+
url: "https://prebid.example.com/pbc/v1/cache",
6969
},
7070
});
7171

‎_includes/video/pb-lf-fw.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
pbjs.setConfig({
9696
debug: true,
9797
cache: {
98-
url: 'https://prebid.adnxs.com/pbc/v1/cache'
98+
url: 'https://prebid.example.com/pbc/v1/cache'
9999
},
100100
adpod: {
101101
brandCategoryExclusion: true

‎_layouts/home.html‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,23 @@ <h1>Prebid Documentation</h1>
4343
<p class="mt-4"><a href="/prebid-mobile/prebid-mobile-download.html">Download Mobile SDK</a></p>
4444
</div>
4545
</div>
46+
</div>
47+
48+
<div class="card-deck--md card-deck--products mt-4">
4649
<div class="card text-center">
4750
<div class="card-body">
48-
<div class="card-media"><img src="/assets/images/user-identity.png" width=100 alt="Prebid User Identity Icon"></div>
51+
<div class="card-media"><img src="/assets/images/user-identity.png" width="100" alt="Prebid User Identity Icon"></div>
4952
<div class="card-title"><h3>Prebid User Identity</h3></div>
5053
<p class="mb-4">Supporting the open web while respecting user privacy.</p>
51-
<a href="/identity/prebid-identity.html" class="btn btn-outline-brand">View Docs</a>
54+
<a class="btn btn-outline-brand" href="/identity/prebid-identity">View Docs</a>
55+
</div>
56+
</div>
57+
<div class="card text-center">
58+
<div class="card-body">
59+
<div class="card-media"><img src="/assets/images/icon__product--prebid-server.svg" alt="Prebid Sales Agent Icon"></div>
60+
<div class="card-title"><h3>Prebid Sales Agent</h3></div>
61+
<p class="mb-4">Expose inventory to AI agents with AdCP-ready workflows.</p>
62+
<a href="https://github.com/prebid/prebid-server" class="btn btn-outline-brand">Setup Prebid Sales Agent</a>
5263
</div>
5364
</div>
5465
</div>
@@ -133,6 +144,12 @@ <h2 class="text-white my-4">Prebid is Completely Open Source! Join our Community
133144
<div class="card-title"><h3><a href="https://github.com/prebid/prebid.github.io" class="stretched-link">Prebid Docs</a></h3></div>
134145
</div>
135146
</div>
147+
<div class="card">
148+
<div class="card-body">
149+
<div class="card-media"><img src="/assets/images/icon__source--prebid-docs.svg" alt="Prebid Sales Agent"></div>
150+
<div class="card-title"><h3><a href="https://github.com/prebid/salesagent" class="stretched-link">Prebid Sales Agent</a></h3></div>
151+
</div>
152+
</div>
136153
</div>
137154
</div>
138155
</div>

0 commit comments

Comments
 (0)