Skip to content

Commit 445515c

Browse files
e-volution-teche-volution-tech
committed
fix conflicts
2 parents 69a0f7b + a1ac1db commit 445515c

269 files changed

Lines changed: 6779 additions & 2437 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/pull_request_template.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Thanks for improving the documentation 😃
2+
Please give a short description and check the matching checkboxes to help us review this as quick as possible.
3+
4+
## 🏷 Type of documentation
5+
6+
- [ ] new bid adapter
7+
- [ ] update bid adapter
8+
- [ ] new feature
9+
- [ ] text edit only (wording, typos)
10+
- [ ] bugfix (code examples)
11+
- [ ] new examples
12+
13+
## 📋 Checklist
14+
15+
- [ ] Related pull requests in prebid.js or server are linked
16+
- [ ] For new adapters check [submitting your adapter docs](https://docs.prebid.org/dev-docs/bidder-adaptor.html#submitting-your-adapter)

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This repository contains the source files for the Prebid.js documentation site at [Prebid.org](https://prebid.org).
22

3-
Please see the sections below for more information.
3+
Please see the sections below for more information:
44

55
+ [Contributing](#contributing)
66
+ [License](#license)
@@ -53,9 +53,10 @@ Before submitting a pull request, you should run the site locally to make sure y
5353

5454
To get started editing the site and seeing your changes, clone this repo and enter the following commands in your terminal:
5555

56-
- `cd path/to/prebid.github.io`
57-
- `export JEKYLL_ENV=production`
58-
- `bundle exec jekyll serve`
56+
```bash
57+
$ JEKYLL_ENV=production bundle exec jekyll serve --watch --incremental
58+
```
59+
5960

6061
You should see output that looks something like this:
6162

‎_data/sidebar.yml‎

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
isSectionHeader: 0
243243
sectionTitle:
244244
subgroup: 1
245-
245+
246246
- sbSecId: 1
247247
title: Meta Bid Filtering
248248
link: /dev-docs/examples/meta-bid-filtering.html
@@ -359,6 +359,8 @@
359359
sectionTitle:
360360
subgroup: 4
361361

362+
363+
362364
- sbSecId: 1
363365
title: How to Add an Analytics Adapter
364366
link: /dev-docs/integrate-with-the-prebid-analytics-api.html
@@ -375,6 +377,14 @@
375377
sectionTitle:
376378
subgroup: 4
377379

380+
- sbSecId: 1
381+
title: Vendor Billing in Prebid.js
382+
link: /dev-docs/vendor-billing.html
383+
isHeader: 0
384+
isSectionHeader: 0
385+
sectionTitle:
386+
subgroup: 4
387+
378388
- sbSecId: 1
379389
title: Prebid.js Modules
380390
link:
@@ -467,6 +477,14 @@
467477
sectionTitle:
468478
subgroup: 8
469479

480+
- sbSecId: 1
481+
title: Ad Server Key Values
482+
link: /features/adServerKvps.html
483+
isHeader: 0
484+
isSectionHeader: 0
485+
sectionTitle:
486+
subgroup: 8
487+
470488
- sbSecId: 1
471489
title: Native Ads
472490
link: /prebid/native-implementation.html
@@ -517,7 +535,7 @@
517535

518536
- sbSecId: 1
519537
title: Interstitial Ads
520-
link: /features/interstitialAds.html
538+
link: /features/InterstitialAds.html
521539
isHeader: 0
522540
isSectionHeader: 0
523541
sectionTitle:
@@ -600,16 +618,16 @@
600618
headerId: rendering
601619
isSectionHeader: 0
602620
sectionTitle:
603-
subgroup: 1
604-
621+
subgroup: 1
622+
605623
- sbSecId: 2
606624
title: Rendering Overview
607625
link: /prebid-mobile/modules/rendering/modules-rendering.html
608626
isHeader: 0
609627
isSectionHeader: 0
610628
sectionTitle:
611629
subgroup: 1
612-
630+
613631
- sbSecId: 2
614632
title: "iOS"
615633
link:
@@ -642,6 +660,14 @@
642660
isSectionHeader: 0
643661
sectionTitle:
644662
subgroup: 1
663+
664+
- sbSecId: 2
665+
title: Integration with AdMob
666+
link: /prebid-mobile/modules/rendering/ios-sdk-integration-admob.html
667+
isHeader: 0
668+
isSectionHeader: 0
669+
sectionTitle:
670+
subgroup: 1
645671

646672
- sbSecId: 2
647673
title: Integration with MoPub
@@ -658,7 +684,7 @@
658684
isSectionHeader: 0
659685
sectionTitle:
660686
subgroup: 1
661-
687+
662688
- sbSecId: 2
663689
title: "Android"
664690
link:
@@ -675,22 +701,30 @@
675701
isSectionHeader: 0
676702
sectionTitle:
677703
subgroup: 1
678-
704+
679705
- sbSecId: 2
680706
title: Pure In-app Bidding
681707
link: /prebid-mobile/modules/rendering/android-sdk-integration-pb.html
682708
isHeader: 0
683709
isSectionHeader: 0
684710
sectionTitle:
685711
subgroup: 1
686-
712+
687713
- sbSecId: 2
688714
title: Integration with GAM
689715
link: /prebid-mobile/modules/rendering/android-sdk-integration-gam.html
690716
isHeader: 0
691717
isSectionHeader: 0
692718
sectionTitle:
693719
subgroup: 1
720+
721+
- sbSecId: 2
722+
title: Integration with AdMob
723+
link: /prebid-mobile/modules/rendering/android-sdk-integration-admob.html
724+
isHeader: 0
725+
isSectionHeader: 0
726+
sectionTitle:
727+
subgroup: 1
694728

695729
- sbSecId: 2
696730
title: Integration with MoPub
@@ -699,15 +733,15 @@
699733
isSectionHeader: 0
700734
sectionTitle:
701735
subgroup: 1
702-
736+
703737
- sbSecId: 2
704738
title: Targeting
705739
link: /prebid-mobile/modules/rendering/android-sdk-parameters.html
706740
isHeader: 0
707741
isSectionHeader: 0
708742
sectionTitle:
709743
subgroup: 1
710-
744+
711745
- sbSecId: 2
712746
title: "Ad Server"
713747
link:
@@ -716,14 +750,22 @@
716750
isCatHeader: 1
717751
sectionTitle:
718752
subgroup: 1
719-
753+
720754
- sbSecId: 2
721755
title: Rendering Order - GAM
722756
link: /prebid-mobile/modules/rendering/rendering-gam-line-item-setup.html
723757
isHeader: 0
724758
isSectionHeader: 0
725759
sectionTitle:
726760
subgroup: 1
761+
762+
- sbSecId: 2
763+
title: Mediation Group - AdMob
764+
link: /prebid-mobile/modules/rendering/rendering-admob-line-item-setup.html
765+
isHeader: 0
766+
isSectionHeader: 0
767+
sectionTitle:
768+
subgroup: 1
727769

728770
- sbSecId: 2
729771
title: Rendering Order - MoPub
@@ -759,7 +801,7 @@
759801
# hasSubMenus: 1
760802
# sectionTitle:
761803
# subgroup: 1
762-
804+
763805
- sbSecId: 2
764806
title: For iOS
765807
link:
@@ -1841,6 +1883,14 @@
18411883
sectionTitle:
18421884
subgroup: 3
18431885

1886+
- sbSecId: 5
1887+
title: Native
1888+
link: /prebid-server/features/pbs-native.html
1889+
isHeader: 0
1890+
isSectionHeader: 0
1891+
sectionTitle:
1892+
subgroup: 3
1893+
18441894
- sbSecId: 5
18451895
title: Caching
18461896
link: /prebid-server/features/pbs-caching.html

‎_includes/video/head.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% include head--common.html %}
66

77
<!--production version of prebid.js-->
8-
<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>
8+
<script async src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>
99
<script type="text/javascript" src="//services.brid.tv/player/build/brid.min.js"></script>
1010

1111
<script type="text/javascript">

‎_includes/video/pb-cp-fp.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
{% include head--common.html %}
66
<!--production version of prebid.js-->
7-
<!--<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>-->
7+
<!--<script async src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>-->
88

99
<!--flowplayer & prebid js code-->
1010
<link rel="stylesheet" href="//cdn.flowplayer.com/releases/native/stable/style/flowplayer.css">

‎_includes/video/pb-cp-jw.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<html lang="en" class="html--no-js">
33

44
<head>
5-
{% include head--common.html %}
5+
{% include head--common.html %}
66
<!--production version of prebid.js-->
7-
<!--<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>-->
8-
7+
<!--<script async src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>-->
8+
99
<!--jwplayer & prebid js code-->
1010
<script type="text/javascript">
1111
var options = {
@@ -50,9 +50,9 @@
5050
function doHeaderBidding() {
5151
window.prebidPluginCP.doPrebid(options);
5252
}
53-
53+
5454
</script>
55-
<script src="//acdn.adnxs.com/video/plugins/cp/PrebidPluginCP.min.js" onload="doHeaderBidding()"></script>
55+
<script src="//acdn.adnxs.com/video/plugins/cp/PrebidPluginCP.min.js" onload="doHeaderBidding()"></script>
5656
</head>
5757

5858
<body>

‎_includes/video/pb-cp-kl.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<html lang="en" class="html--no-js">
33

44
<head>
5-
{% include head--common.html %}
6-
5+
{% include head--common.html %}
6+
77
<!--production version of prebid.js-->
8-
<!--<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>-->
9-
8+
<!--<script async src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>-->
9+
1010
<!--kaltura & prebid js code-->
1111
<script type="text/javascript">
1212
var options = {
@@ -51,9 +51,9 @@
5151
function doHeaderBidding() {
5252
window.prebidPluginCP.doPrebid(options);
5353
}
54-
54+
5555
</script>
56-
<script src="//acdn.adnxs.com/video/plugins/cp/PrebidPluginCP.min.js" onload="doHeaderBidding()"></script>
56+
<script src="//acdn.adnxs.com/video/plugins/cp/PrebidPluginCP.min.js" onload="doHeaderBidding()"></script>
5757
</head>
5858

5959
<body>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<html lang="en" class="html--no-js">
33

44
<head>
5-
{% include head--common.html %}
5+
{% include head--common.html %}
66
<!--production version of prebid.js-->
7-
<!--<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>-->
8-
7+
<!--<script async src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>-->
8+
99
<!--videojs & prebid js code-->
1010
<!-- use recent version of videojs to ensure proper functioning with the iOS devices -->
1111
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/video.js/6.4.0/video-js.css">
1212
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/video.js/6.4.0/video.js"></script>
1313
<!-- videojs-vast-vpaid -->
1414
<link href="https://cdnjs.cloudflare.com/ajax/libs/videojs-vast-vpaid/2.0.2/videojs.vast.vpaid.min.css" rel="stylesheet">
1515
<script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-vast-vpaid/2.0.2/videojs_5.vast.vpaid.min.js"></script>
16-
16+
1717
<script type="text/javascript">
1818
var options = {
1919
biddersSpec: {
@@ -57,7 +57,7 @@
5757
function doHeaderBidding() {
5858
window.prebidPluginCP.doPrebid(options);
5959
}
60-
60+
6161
</script>
6262
<script src="//acdn.adnxs.com/video/plugins/cp/PrebidPluginCP.min.js" onload="doHeaderBidding()"></script>
6363
</head>

‎_includes/video/pb-cp.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<html lang="en" class="html--no-js">
33

44
<head>
5-
{% include head--common.html %}
5+
{% include head--common.html %}
66
<!--production version of prebid.js-->
7-
<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>
8-
7+
<script async src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>
8+
99
<!--brightcove & prebid js code-->
1010
<script>
1111
var pbjs = pbjs || {};
@@ -43,7 +43,7 @@
4343
bids: [{
4444
bidder: 'appnexus',
4545
params: {
46-
placementId: iosDevice ? 13239390 : 13232361, // Add your own placement id here. Note, skippable video is not supported on iOS
46+
placementId: iosDevice ? 13239390 : 13232361, // Add your own placement id here. Note, skippable video is not supported on iOS
4747
video: {
4848
skipppable: true,
4949
playback_method: ['auto_play_sound_off']
@@ -79,7 +79,7 @@
7979
});
8080

8181
</script>
82-
82+
8383
</head>
8484

8585
<body>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
{% include head--common.html %}
66
<!--production version of prebid.js-->
7-
<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>
7+
<script async src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>
88
<script type="text/javascript" src="https://amp.akamaized.net/hosted/1.1/player.esi?apikey=prebid.org.samples"></script>
99

1010
<script type="text/javascript">

0 commit comments

Comments
 (0)