Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into smaato-adapter
Browse files Browse the repository at this point in the history
* origin/master: (402 commits)
  Updates for CMP Functionality Best Practices (prebid#2284)
  cross-linking TCF/CMP docs (prebid#2283)
  Restored zoneId parameter in criteo bid adapter doc (prebid#2275)
  Add sspBC adapter  (prebid#2157)
  Update cmp-best-practices.md
  Update cmp-best-practices.md
  Add supported modules table for GDPR Enforcement module. (prebid#2271)
  New Adapter: Concert (prebid#2033)
  ID+ submodule (prebid#2260)
  Cmp best practices (prebid#2282)
  creative declaration
  fixing creative pages, adding GAM declaration (prebid#2281)
  adding gvl_id to metadata (prebid#2279)
  removed syntax.css (prebid#2278)
  updated the PBM mobile privacy page (prebid#2250)
  Added TCF v2.0 support to the documentation (prebid#2276)
  Add smartx.md markdown for docs (prebid#2272)
  1.Change ironsource to be lower case all over (prebid#2265)
  Update show-outstream-video-ads.md for backupOnly renderers (prebid#2259)
  adform.md docs updated (prebid#2262)
  ...
  • Loading branch information
sbrosinski committed Aug 31, 2020
2 parents dce2a81 + d4c5ba3 commit 75d6bd0
Show file tree
Hide file tree
Showing 604 changed files with 10,992 additions and 3,799 deletions.
Binary file not shown.
2 changes: 1 addition & 1 deletion 404.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: fourofour
title: Page Not Found
description:
hide: true

---


Expand Down
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
prebid.org
docs.prebid.org
86 changes: 35 additions & 51 deletions _data/dropdown_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- subsectionId: 0
sectionId: 0
sectionName: Overview
title: What is Prebid?
title: Introduction
link: /overview/intro.html
needsDivider: 0
isHeader: 0
Expand All @@ -19,56 +19,22 @@
- subsectionId: 0
sectionId: 0
sectionName: Overview
title: Project Principles
link: /principles.html
needsDivider: 0
isHeader: 0
isSubSectionStart: 0

- subsectionId: 0
sectionId: 0
sectionName: Overview
title: Contributing
link: /contributing/contribute.html
needsDivider: 0
isHeader: 0
isSubSectionStart: 0

- subsectionId: 0
sectionId: 0
sectionName: Overview
title: About Prebid.Org
link: /overview/what-is-prebid-org.html
title: Developers
link: /developers.html
needsDivider: 0
isHeader: 0
isSubSectionStart: 0
isSubSectionStart: 1

- subsectionId: 0
sectionId: 0
sectionName: Overview
title: Membership
link: /partners/partners.html
title: Ad Ops
link: /adops/before-you-start.html
needsDivider: 0
isHeader: 0
isSubSectionStart: 0
isSubSectionStart: 1

- subsectionId: 0
sectionId: 0
sectionName: Overview
title: Privacy Policy
link: /privacy.html
needsDivider: 0
isHeader: 0
isSubSectionStart: 0

- subsectionId: 0
sectionId: 0
sectionName: Overview
title: Events
link: /prebid/events.html
needsDivider: 0
isHeader: 0
isSubSectionStart: 0

#----------Product SubNav------------

Expand Down Expand Up @@ -144,7 +110,7 @@
sectionId: 1
sectionName: Product
title: Prebid Server
link: /prebid-server/prebid-server-overview.html
link: /prebid-server/overview/prebid-server-overview.html
needsDivider: 1
isHeader: 0
isSubSectionStart: 1
Expand Down Expand Up @@ -320,15 +286,6 @@
isHeader: 0
isSubSectionStart: 0

- subsectionId: 4
sectionId: 2
sectionName: Support
title: Blog
link: /blog.html
needsDivider: 0
isHeader: 0
isSubSectionStart: 1

#-----------_Downloads---------------

- sectionId: 3
Expand Down Expand Up @@ -373,3 +330,30 @@
needsDivider: 0
isHeader: 0
isSubSectionStart: 0

#-----------Resources---------------

- sectionId: 4
sectionName: Resources
link:
isHeader: 1
hasSubMenus: 1
submenus:

- subsectionId: 0
sectionId: 4
sectionName: Resources
title: Prebid.org
link: http://www.prebid.org
needsDivider: 1
isHeader: 0
isSubSectionStart: 1

- subsectionId: 1
sectionId: 4
sectionName: Resources
title: Blog
link: http://www.prebid.org/blog
needsDivider: 0
isHeader: 0
isSubSectionStart: 1
4 changes: 2 additions & 2 deletions _data/message.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#-------------Message----------------
- messageId: 1
messageText:
messageCreateDt:
messageText: <a href="/prebid/events.html">Register for our webinar on Aug 27, 2020&#58; How to Make Prebid the Supply Path Buyers Choose</a>
messageCreateDt: 08_04_2020
46 changes: 41 additions & 5 deletions _data/partners.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
- company: IndexExchange
link: https://www.indexexchange.com/
imgURL: /assets/images/partners/leader/IX-logo.png
type: leader

- company: Magnite
link: https://www.magnite.com/
imgURL: /assets/images/partners/leader/Magnite_logo.png
type: leader

- company: MediaMath
link: https://www.mediamath.com/
imgURL: /assets/images/partners/leader/MediaMath-wordmark.png
Expand All @@ -13,11 +23,6 @@
imgURL: /assets/images/partners/leader/pubmatic.png
type: leader

- company: Rubicon Project
link: https://rubiconproject.com/header-bidding-for-publishers/
imgURL: /assets/images/partners/founders/rubicon.png
type: leader

- company: SpotX
link: https://spotx.tv
imgURL: /assets/images/partners/leader/spotx_logo.png
Expand Down Expand Up @@ -103,6 +108,16 @@
imgURL: /assets/images/partners/publisher/chegg.png
type: publisher

- company: diDNA
link: https://didna.io/
imgURL: /assets/images/partners/publisher/didna-logo.png
type: publisher

- company: Freestar
link: https://freestar.com/
imgURL: /assets/images/partners/publisher/freestar-logo.png
type: publisher

- company: Glewed TV
link: https://www.glewed.tv/
imgURL: /assets/images/partners/publisher/glewed_logo.png
Expand Down Expand Up @@ -153,6 +168,11 @@
imgURL: /assets/images/partners/publisher/sortable.png
type: publisher

- company: Havas
link: https://havasmedia.com/
imgURL: /assets/images/partners/buyer/Havas_Media_Logo.png
type: buyer

- company: AdForm
link: https://site.adform.com/
imgURL: /assets/images/partners/community/Adform-Logo.png
Expand Down Expand Up @@ -210,11 +230,19 @@
link: https://jwplayer.com
type: community

- company: Konduit
link: https://konduitvideo.com/
type: community

- company: LiveIntent
link: https://www.liveintent.com
imgURL: /assets/images/partners/community/liveintent_logo.png
type: community

- company: Lotame
link: https://www.lotame.com/
type: community

- company: Media.net
link: https://media.net
type: community
Expand Down Expand Up @@ -243,3 +271,11 @@
- company: Yeahmobi
link: https://yeahmobi.com
type: community

- company: Yieldlab
link: https://yieldlab.de
type: community

- company: Zeta Global
link: https://zetaglobal.com/
type: community
Loading

0 comments on commit 75d6bd0

Please sign in to comment.