Skip to content

Commit 0676c54

Browse files
dariaboykodariaboyko
authored
Merge branch 'prebid:master' into master
2 parents 114225b + a28786a commit 0676c54

418 files changed

Lines changed: 13785 additions & 8084 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/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ jobs:
1515
name: run markdownlint
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
21-
- uses: tj-actions/changed-files@v37
21+
- uses: tj-actions/changed-files@v44
2222
id: changed-files
2323
with:
2424
files: '**/*.md'
2525
separator: ","
26-
- uses: DavidAnson/markdownlint-cli2-action@v13
26+
- uses: DavidAnson/markdownlint-cli2-action@v16
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,

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
22
gem 'github-pages', '>= 228'
3-
3+
gem 'ffi', '1.16.3'
44
gem "webrick", "~> 1.7"

‎_data/dropdown_v2.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
- subsectionId: 0
6262
sectionId: 1
6363
sectionName: Product
64-
title: Analytics
65-
link: /overview/analytics.html
64+
title: Modules
65+
link: /dev-docs/modules/index.html
6666
needsDivider: 0
6767
isHeader: 0
6868
isSubHeader: 0
@@ -71,8 +71,8 @@
7171
- subsectionId: 0
7272
sectionId: 1
7373
sectionName: Product
74-
title: Modules
75-
link: /dev-docs/modules/index.html
74+
title: Publisher API
75+
link: /dev-docs/publisher-api-reference.html
7676
needsDivider: 0
7777
isHeader: 0
7878
isSubHeader: 0
@@ -81,8 +81,8 @@
8181
- subsectionId: 0
8282
sectionId: 1
8383
sectionName: Product
84-
title: Publisher API
85-
link: /dev-docs/publisher-api-reference.html
84+
title: Bidder Params
85+
link: /dev-docs/bidders.html
8686
needsDivider: 0
8787
isHeader: 0
8888
isSubHeader: 0
@@ -91,8 +91,8 @@
9191
- subsectionId: 0
9292
sectionId: 1
9393
sectionName: Product
94-
title: Bidder Params
95-
link: /dev-docs/bidders.html
94+
title: Analytics
95+
link: /overview/analytics.html
9696
needsDivider: 0
9797
isHeader: 0
9898
isSubHeader: 0
@@ -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
@@ -285,6 +276,15 @@
285276
sectionName: Support
286277
title: Prebid Server
287278
link: /faq/prebid-server-faq.html
279+
needsDivider: 0
280+
isHeader: 0
281+
isSubSectionStart: 0
282+
283+
- subsectionId: 3
284+
sectionId: 2
285+
sectionName: Support
286+
title: Prebid Mobile
287+
link: /faq/prebid-mobile-faq.html
288288
needsDivider: 1
289289
isHeader: 0
290290
isSubSectionStart: 0

‎_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: 61 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,6 @@
130130
isSectionHeader: 0
131131
subgroup: 2
132132

133-
- sbSecId: 0
134-
title: Prebid and MSPA
135-
link: /features/mspa-usnat.html
136-
isHeader: 0
137-
isSectionHeader: 0
138-
subgroup: 2
139-
140-
- sbSecId: 0
141-
title: Prebid and Quebec Privacy Support
142-
link: /features/ac-quebec.html
143-
isHeader: 0
144-
isSectionHeader: 0
145-
subgroup: 2
146-
147133
#--------------Prebid.js--------------|
148134

149135
- sbSecId: 1
@@ -198,6 +184,14 @@
198184
sectionTitle:
199185
subgroup: 0
200186

187+
- sbSecId: 1
188+
title: Analytics For Prebid
189+
link: /overview/analytics.html
190+
isHeader: 0
191+
isSectionHeader: 0
192+
sectionTitle:
193+
subgroup: 0
194+
201195
- sbSecId: 1
202196
title: Consent Management Best Practices
203197
link: /dev-docs/cmp-best-practices.html
@@ -521,31 +515,6 @@
521515
sectionTitle:
522516
subgroup: 6
523517

524-
- sbSecId: 1
525-
title: Analytics
526-
link:
527-
isHeader: 1
528-
headerId: analytics
529-
isSectionHeader: 0
530-
sectionTitle:
531-
subgroup: 7
532-
533-
- sbSecId: 1
534-
title: Analytics For Prebid
535-
link: /overview/analytics.html
536-
isHeader: 0
537-
isSectionHeader: 0
538-
sectionTitle:
539-
subgroup: 7
540-
541-
- sbSecId: 1
542-
title: Prebid Analytics for GA
543-
link: /overview/ga-analytics.html
544-
isHeader: 0
545-
isSectionHeader: 0
546-
sectionTitle:
547-
subgroup: 7
548-
549518
- sbSecId: 1
550519
title: Features
551520
link:
@@ -757,6 +726,14 @@
757726
sectionTitle:
758727
subgroup: 2
759728

729+
- sbSecId: 2
730+
title: Global Parameters
731+
link: /prebid-mobile/pbm-api/ios/pbm-targeting-ios.html
732+
isHeader: 0
733+
isSectionHeader: 0
734+
sectionTitle:
735+
subgroup: 2
736+
760737
- sbSecId: 2
761738
title: GAM Original Integration
762739
link: /prebid-mobile/pbm-api/ios/ios-sdk-integration-gam-original-api.html
@@ -797,17 +774,9 @@
797774
sectionTitle:
798775
subgroup: 2
799776

800-
- sbSecId: 2
801-
title: Targeting Parameters
802-
link: /prebid-mobile/pbm-api/ios/pbm-targeting-ios.html
803-
isHeader: 0
804-
isSectionHeader: 0
805-
sectionTitle:
806-
subgroup: 2
807-
808777
- sbSecId: 2
809778
title: Ad Experience Controls
810-
link: /prebid-mobile/modules/rendering/ios-sdk-customization-controls.html
779+
link: /prebid-mobile/modules/rendering/combined-ad-experience-controls.html
811780
isHeader: 0
812781
isSectionHeader: 0
813782
sectionTitle:
@@ -838,6 +807,14 @@
838807
sectionTitle:
839808
subgroup: 3
840809

810+
- sbSecId: 2
811+
title: Global Parameters
812+
link: /prebid-mobile/pbm-api/android/pbm-targeting-params-android.html
813+
isHeader: 0
814+
isSectionHeader: 0
815+
sectionTitle:
816+
subgroup: 3
817+
841818
- sbSecId: 2
842819
title: GAM Original Integration
843820
link: /prebid-mobile/pbm-api/android/android-sdk-integration-gam-original-api.html
@@ -878,17 +855,9 @@
878855
sectionTitle:
879856
subgroup: 3
880857

881-
- sbSecId: 2
882-
title: Targeting Parameters
883-
link: /prebid-mobile/pbm-api/android/pbm-targeting-params-android.html
884-
isHeader: 0
885-
isSectionHeader: 0
886-
sectionTitle:
887-
subgroup: 3
888-
889858
- sbSecId: 2
890859
title: Ad Experience Controls
891-
link: /prebid-mobile/modules/rendering/android-sdk-customization-controls.html
860+
link: /prebid-mobile/modules/rendering/combined-ad-experience-controls.html
892861
isHeader: 0
893862
isSectionHeader: 0
894863
sectionTitle:
@@ -1056,6 +1025,14 @@
10561025
sectionTitle:
10571026
subgroup: 2
10581027

1028+
- sbSecId: 3
1029+
title: 'Header Bidding Trafficking Setup'
1030+
link: /adops/gam-hbt-step-by-step.html
1031+
isHeader: 0
1032+
isSectionHeader: 0
1033+
sectionTitle:
1034+
subgroup: 2
1035+
10591036
- sbSecId: 3
10601037
title: 'Line Item Setup'
10611038
link: /adops/step-by-step.html
@@ -1260,13 +1237,6 @@
12601237
sectionTitle:
12611238
subgroup: 0
12621239

1263-
- sbSecId: 4
1264-
title: Training Videos
1265-
link: /videos/prebid-video.html
1266-
isHeader: 0
1267-
isSectionHeader: 0
1268-
sectionTitle:
1269-
subgroup: 0
12701240

12711241
- sbSecId: 4
12721242
title: Prebid.js Video Module
@@ -1516,14 +1486,6 @@
15161486
sectionTitle:
15171487
subgroup: 3
15181488

1519-
- sbSecId: 5
1520-
title: Programmatic Guaranteed
1521-
link: /prebid-server/features/pg/pbs-pg-idx.html
1522-
isHeader: 0
1523-
isSectionHeader: 0
1524-
sectionTitle:
1525-
subgroup: 3
1526-
15271489
- sbSecId: 5
15281490
title: Modules
15291491
link: /prebid-server/pbs-modules/
@@ -1746,7 +1708,7 @@
17461708

17471709
- sbSecId: 6
17481710
title: Video
1749-
link: /prebid-video/video-overview.html
1711+
link: /formats/video.html
17501712
isHeader: 0
17511713
isSectionHeader: 0
17521714
sectionTitle:
@@ -1815,12 +1777,34 @@
18151777
subgroup: 0
18161778

18171779
- sbSecId: 7
1818-
title: Training Videos
1819-
link: /videos/
1820-
isHeader: 0
1780+
title: Privacy Resources
1781+
link:
1782+
isHeader: 1
1783+
headerId: privacy
18211784
isSectionHeader: 0
18221785
sectionTitle:
1823-
subgroup: 0
1786+
subgroup: 1
1787+
1788+
- sbSecId: 7
1789+
title: Prebid Privacy Overview
1790+
link: /support/privacy-resources.html
1791+
isHeader: 0
1792+
isSectionHeader: 0
1793+
subgroup: 1
1794+
1795+
- sbSecId: 7
1796+
title: Prebid US Compliance
1797+
link: /features/mspa-usnat.html
1798+
isHeader: 0
1799+
isSectionHeader: 0
1800+
subgroup: 1
1801+
1802+
- sbSecId: 7
1803+
title: Prebid and Quebec Privacy Support
1804+
link: /features/ac-quebec.html
1805+
isHeader: 0
1806+
isSectionHeader: 0
1807+
subgroup: 1
18241808

18251809
- sbSecId: 7
18261810
title: FAQs

‎_includes/code/mobile-sdk.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</ul>
1010
<div class="tab-content" id="code-tab-content">
1111
<div class="tab-pane fade show active" id="{{ include.id }}-kotlin" role="tabpanel" aria-labelledby="{{ include.id }}-kotlin-tab">
12-
<pre><code class="language-kotlin">{{ include.kotlin }}</code></pre>
12+
{{ include.kotlin | markdownify }}
1313
</div>
1414
<div class="tab-pane fade" id="{{ include.id }}-swift" role="tabpanel" aria-labelledby="{{ include.id }}-swift-tab">
15-
<pre><code class="language-swift">{{ include.swift }}</code></pre>
15+
{{ include.swift | markdownify }}
1616
</div>
1717
</div>

0 commit comments

Comments
 (0)