Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream #1

Merged
merged 799 commits into from
Jul 25, 2022
Merged

Merge upstream #1

merged 799 commits into from
Jul 25, 2022

Conversation

bartholomews
Copy link

Run git merge upstream/master to get up to date

patmmccann and others added 30 commits March 24, 2022 22:37
@patmmccann
Update firstPartyData.md (prebid#3660)
0f3cd46
@johnwier
Conversant adapter now supports the supply chain module (prebid#3655)
ac1bb41
@mhlm
Updated list of parameters for nextMillennium (prebid#3654)
441445c
@kyoya-takei
Add dacid user id module (prebid#3644)
50ea49c
@pm-nitin-nimbalkar
Feature/esp (prebid#3643)
3e33c44 
* ESP: encryptedSignalSources key added under userSync object

* ESP: Description changed

* Docs updated for ESP in user id module section

* Docs updated for ESP in user id module section

* Docs updated for ESP in user id module section

* Docs updated for ESP in user id module section

* Section related to ESP moved at the end of basic configuration

* ESP documentation: Few corrections

* ESP: Added few more details and link to google beta documentation

* ESP documentation: Note classes added and few changes

* ESP configs  and its description is updated

* Config changes doc updated
@rajsidhunovatiq
Allow configuration of the sync URL and to allow callbacks for specif…
8792237 
…ic custom partner integrations (prebid#3586)

* Update userId.md

Included novatiq snowflake id submodule specifications

* Update download.md

Added novatiq snowflake id submodule

* Revert "Update userId.md"

This reverts commit 556d56a.

* Update userId.md

Novatiq ID System: updated product description as per request

* fix layout and format as per other examples

* tables still broken, missed markup line just before the close div - try again

* whitespace?

* Document "Allow configuration of the sync URL and to allow callbacks for specific custom partner integrations" functionality

* typos

Co-authored-by: novatiq <79258366+novatiq@users.noreply.github.com>
@readpeaktuomo
Add banner support (prebid#3638)
e849639
@lunamedia @ChrisHuie
SA Lunamedia Bidder Adapter: fix markdown (prebid#3637)
a0c63c2 
* New adapter "SA Lunamedia"

* New adapter "SA Lunamedia" 2

* add userSync

* remove gdpr tag since gdpr_supported is included

* schain

* fix markdown

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
@ChrisHuie
Open8 Bid Adapter: update docs for added back (prebid#3634)
37156fc
@ftxmoJason
JDB-496: adding ftrack to the Prebid website (prebid#3627)
9843f16 
Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>
@eknis
add imuid userId Module download (prebid#3624)
ba926a2
@kyrylenko
readme file for idWardRtdProvider (prebid#3578)
346fdcc 
Co-authored-by: Pavlo <pavlo@id-ward.com>
@omerDotan @bretg
Vendor Billing in Prebid.js (prebid#3533)
2fec524 
* auction delay and timeout

* removing common RTD params from params table

* Vendor Billing in Prebid.js

* Update vendor-billing.md

* wordsmithing

Co-authored-by: bretg <bgorsline@gmail.com>
Co-authored-by: MartianTribe <steve@martiantribe.com>
@jbartek25
added renderer config (prebid#3531)
919ee14
@dependabot
Bump url-parse from 1.5.7 to 1.5.10 (prebid#3604)
30c6185 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.5.7...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump ssri from 6.0.1 to 6.0.2 (prebid#3601)
3523ae0 
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](npm/ssri@v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: ssri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@balajimediafuse @RinchenNorbu
mediafuse md file change (prebid#3585)
6e09447 
* removed mediafuse md files

as we are deploying new pull request we wanted to remove the existing bidders list on the name mediafuse

* created mediafuse bidder md file

* Revert "created mediafuse bidder md file"

This reverts commit fb49c32.

* Created MediaFuse bidder md file

* updated test parameters

Co-authored-by: rn <rn@gmail.com>
@bretg
PBS deals update (prebid#3679)
3467038 
explaining the difference in what's sent to the ad server based on whether PBJS is present.
@bretg
PBS FAQ: SSL support (prebid#3680)
a00ad98
@bretg
PBS Hosting update (prebid#3681)
81c40c9 
adding note about SSL
@bretg
mobile config id (prebid#3682)
e82eca2 
Added note about config ID being the stored request id
@bretg
mobile config ID clarification (prebid#3683)
1f86752
@bretg
rubicon: added PBS host instructions (prebid#3684)
366398b
@bretg
PBS coop-sync doc (prebid#3685)
199ec09
@dgirardi @bretg
Update PBS adapter documentation (prebid#3662)
93fb2fa 
* Update PBS documentation

Unify PBS documentation as a module (not a bidder); remove duplication about it from `setConfig`; add stored impression examples

PBJS PR: prebid/Prebid.js#8154

* wordsmithing

Co-authored-by: bretg <bgorsline@gmail.com>
@oath-jac
YahooSSP added video support. (prebid#3664)
169db1f 
Co-authored-by: oath-jac <dsp-supply-prebid@verizonmedia.com>
@supadm
init (prebid#3661)
a0799a8
@SyntaxNode
PBS-Go: Remove User Sync Default + Update Features (prebid#3656)
d587d54
@Saveliev
add Yandex Bidder Adapter (prebid#3641)
9d71cf6 
Co-authored-by: Taras Saveliev <t-saveliev@yandex-team.ru>
@pm-nilesh-chate
PubMatic: add "acat" parameter (prebid#3657)
bb1d236 
* PubMatic: add "acat" parameter

* use IAB catagories for acat
relaido and others added 25 commits July 14, 2022 12:35
@relaido @r-ishigami @nmaeura
Relaido Bid Adapter: Add documentation for bids[].params.video.player…
a23f693 
…Size (prebid#3879)

* add relaido adapter

* Add support for bids[].params.video.playerSize

Co-authored-by: ishigami_shingo <s.ishigami@relaido.co.jp>
Co-authored-by: cmertv-sishigami <s.ishigami@cmertv.com>
Co-authored-by: n.maeura <n.maeura@cmertv.com>
@jlaso
adding partnerId and changing publisherId by partnerId (prebid#3881)
6855e3d
@ybootin
update seedtag bidder doc for usp/ccpa compliance (prebid#3882)
8ae35b4
@victorlassomarketing
Fix ccpa (prebid#3884)
bd45931 
* Lasso bid adapter

* Lasso adapter documentation update

* Lasso adapter documentation update

* Lasso prebid adapter

* fix for usp / ccpa

* fix ccpa and remove old value

Co-authored-by: Victor Romasenco <vic@Victors-Air.home>
@kakikei @banakemi
Added descriptions of ID5 and Criteo to AdGenerationDoc. (prebid#3886)
051e9c3 
* update AdGeneration Doc: add novatiq

* Added descriptions of ID5 and Criteo to AdGenerationDoc.

Co-authored-by: banakemi <banakemi@gmail.com>
@nnarhinen
chore: upgrade flowplayer to v3 (prebid#3891)
aa900aa
@ako-adot
[DSP-3690] feature: Add schain & pubProvidedId (#5) (prebid#3894)
e73ce98
@jpiros
update Consumable Bid Adapter features (prebid#3901)
edc3615
@muuki88
registerDelay of ESP is actually milliseconds (prebid#3896)
a670366
@danielsao
Update descriptions for notUse3P param (prebid#3895)
6f23d16
@patmmccann
Remove additional tcf 1.1 references (prebid#3904)
8e03b05 
* Update consentManagement.md

* Update consentManagement.md
@bretg
pbs ortb-block fix formatting (prebid#3909)
f0d31d4 
a couple of tables were missing a cell
@bretg
add ortb-blocking metadata (prebid#3908)
8b79713
PubMatic: add ORTB blocking & multi-bid info (prebid#3912)
d164eaf
@eknis
add doc: imRtdModule (prebid#3911)
75fa643 
* add imRtdProvider doc

* add corp link
@bretg
nextMillennium: adding scope flag (prebid#3918)
b0f036c
@stefanogabri
Update bucksense.md (prebid#3850)
7530994
@haruka-yamashita2
support for ID5 (prebid#3914)
ab95153
@Niass @samous
BLIINK Doc : Update doc by removing placement, adding optional imageU…
6c9eb04 
…rl and setting pbs to true (prebid#3907)

* fix: bliink.md updated

* fix(bliink doc) remove placement param

* fix(bliink doc) add optional imageUrl

Co-authored-by: louisbillaut <louis@bliink.io>
Co-authored-by: samous <samuel.kerboeuf@gmail.com>
@jpiros
add schain and coppa to Consumable docs (prebid#3906)
5d67155
@muuki88
Smartx does support floors (prebid#3917)
1e477f7
@gchicoye
Prisma Bid Adapter: add new bid adapter (prebid#3898)
dc2199f 
* Prisma Bid Adapter: add new bid adapter

* Update prisma.md
@onetag-dev @fliccione
Add support for price floors and schain in onetag.md (prebid#3893)
72d54f8 
Co-authored-by: federico <f.liccione@onetag.com>
@bwhisp
Update doc for 1plusX RTD Provider (prebid#3915)
dd9d697
@odureleau @adesmoules
@Spacedragoon @krzysztofequativ
Add native handling for PBS only (prebid#3883)
b526c9f 
* Fix domain sample

* Add HTTPS sample for domain parameter

* Add HTTPS sample for domain parameter

* Add Smart AdServer in the index and download list

* Add currency parameter documentation

* Revert "Merge remote-tracking branch 'refs/remotes/prebid/master'"

This reverts commit 099edc2, reversing
changes made to 07ce9fd.

* Update documentation

Specify "target" parameter development status

* Adding documentation for bidfloor parameter.

* [SIM-1517] Update doc

Co-authored-by: Mordhak <adrien.desmoules@gmail.com>
Co-authored-by: Mordhak <adesmoules@smartadserver.com>
Co-authored-by: Sébastien Ferry <sferry@sas-corp.local>
Co-authored-by: gcarnec <gcarnec@smartadserver.com>
Co-authored-by: Yuriy Tyukhnin <ytyukhnin@smartadserver.com>
Co-authored-by: tadam <tadam@smartadserver.com>
Co-authored-by: krzysztof <88041828+krysztal-smart@users.noreply.github.com>
Co-authored-by: Spacedragoon <yorfedog.cenrac@gmail.com>
@bartholomews bartholomews marked this pull request as ready for review July 25, 2022 11:43
@bartholomews bartholomews requested a review from a team July 25, 2022 11:43
@bartholomews bartholomews merged commit 67c5202 into master Jul 25, 2022
@bartholomews bartholomews deleted the merge-upstream branch July 25, 2022 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@desbo desbo desbo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.