Merge upstream #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
…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>
* 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>
Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>
Co-authored-by: Pavlo <pavlo@id-ward.com>
* 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>
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>
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>
* 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>
explaining the difference in what's sent to the ad server based on whether PBJS is present.
adding note about SSL
Added note about config ID being the stored request id
* 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>
Co-authored-by: oath-jac <dsp-supply-prebid@verizonmedia.com>
Co-authored-by: Taras Saveliev <t-saveliev@yandex-team.ru>
* PubMatic: add "acat" parameter * use IAB catagories for acat
…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>
* 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>
* update AdGeneration Doc: add novatiq * Added descriptions of ID5 and Criteo to AdGenerationDoc. Co-authored-by: banakemi <banakemi@gmail.com>
* Update consentManagement.md * Update consentManagement.md
a couple of tables were missing a cell
* add imRtdProvider doc * add corp link
…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>
* Prisma Bid Adapter: add new bid adapter * Update prisma.md
Co-authored-by: federico <f.liccione@onetag.com>
* 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>
desbo
approved these changes
Jul 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Run
git merge upstream/masterto get up to date