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.

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

Merge release 1.39.0 from upstream #79

Merged
merged 59 commits into from
Jan 29, 2019
Merged

Merge release 1.39.0 from upstream #79

merged 59 commits into from
Jan 29, 2019

Conversation

kelvin-chappell
Copy link
Member

Mike Chowla and others added 30 commits December 18, 2018 13:24
* Rivr thin adapter (#5)

* RVR-2049 - change impression event

* RVR-2049 - fix user id value returned on creation of the cookie

* RVR-2049 - remove blockedCategories and browser properties from Auction object

* RVR-2060 - rewrite rendering detection for impression and click events

* RVR-2060 - rewrite tests for rendering detection for impression and click events

* RVR-2049 - send ad unit code in click event

* RVR-2049 - adapt tests for click event

* RVR-2072 - split impression detection depending on the ad server - DFP/none

* RVR-2056 - set creativeId in Auction -> received bids

* RVR-2056 - set bid.clearPrice to cmp

* RVR-2087 - extract trackAuctionInit implementation to rivraddon

* RVR-2087 - extract implementation to rivraddon WIP

* RVR-2087 - extract implementation to rivraddon

* RVR-2087 - extract implementation to rivraddon

* RVR-2087 - Update package-lock

* RVR-2087 - Add addons check

* Rivr Thin Adapter - part 2 (#6)

* RVR-2087 - Remove sendAuction call from ExpiringQueue

* RVR-2147 - Fix test failing on IE 11.0.0

* RVR-2087 - Remove ExpiringQueue
* Fix multi-bid adId in Criteo bid adapter

A single bid request can generate multiple bids if it has multiple
sizes. However, by default 'adId' will be filled with the bid request's
'bidId' field, so if we create two bids from the same bid request, they
will share the same 'adId'.

Because of this, Prebid will not know which bid to use once DFP makes
either of those bids win, always taking the first one (see
'auctionManager.findBidByAdId' used in 'pbjs.renderAd').

* Increment Criteo adapter version

* Add test for Criteo multi-bid fix
…ze instead of bid.sizes (prebid#3377)

* Added telaria bid adapter

* more documentation

* Added more test cases. And improved some code in the adapter

* Removed the check for optional params, they are handled in the server. Also updated certain param names used in  the test spec.

* added some spaces to fix CircleCI tests

* added some spaces to fix CircleCI tests

* fixed code indentation in /spec/AnalyticsAdapter_spec.js which causing the CircleCI tests to fail.

* Reverted the changes

* merged with prebid master.

* creative Id is required when we build a response but our server doesn't always have the crid, so using a sentinel value when we don't have the crid.

* - removed an un used method
- Removed the package-lock file.

* merging to master

* updated telaria bid adapter to use player size provided by the bid.mediaTypes.video.playerSize instead of bid.sizes.

prebid#3331

* - removed the requirement for having player size
- updated the test spec to reflect the above change
- removed changes to the package-lock.json file.

* added a param to the ad call url to let us know that the request is coming via hb.

* to lower casing the bidder code.
* New adapter "Coinzilla" added

* Solved required modifications related to bidderRequest.referrerInfo.referer
* Changing to requestId in order to align with prebid cores mapping of bidId to responseId

* Need to update in other events as well

* Catching and logging no bid found

* Lint error fix
* * check if consent hook is already set

* * removed debug code

* * formatting
* inprogress

* add support for s2sConfig bidderOptions

* merged missing updates from origin

* changed arrow function in spec mocha tests to standard functions

* fixed missing closing bracket and paren

* updated incorrect spec expected values for s2sConfig tests

* removed rubicon specific s2s configuration default value for sra

* deleted unnecessary test and revised a test description since the rubicon specific defaults were removed

* removed jsdoc for deprecated cookieSetUrl
prebid#3380)

* Backward compatible update & reduced TTL

* replaced deprecated getWindowTopLocation with referer detection module
* RAD-2356 Upgrade Mocha karma-webpack karma

* RAD-2356 update readme to support node v6 or more

* Remove webpack output logs while testing

* move from gulp-webserver to gulp-connect

* remove karma-require and redundant watch task
* Fix prebid#3265 - pbs cookie sync race condition

* add/update jsdoc comments
* * make eslint fix formatting

* * remove double semi-column
)

A `const` in a string literal like this won't be correctly transpiled
by babel, so we'll be limited by the browser support matrix for
`const`

Fix: harcode a `var` here to be more permissive and widely supported
* update IE version in readme

* tweak IE message
…bid#3401)

* Adding GDPR support

* Always drop user syncs when available

* Set dealID based on buying type

* Native ads, single request option
…bid#3387)

* Adding remaining missing parameters from AppNexus Native response

* Removed native video, renamed sale and clickLabel to RTB spec names

* drop video from tests
* 3413-Insert Iframes for user sync in body

* Append Iframe as the last child

* Add unit test for insertElement

* utls insert element at the top by default

* add unit tests for utls insert element

* Insert iframe as html last child

* revert package.lock changes
* changing default currency file

* using defaultRate in the case of rate file not returning

* Adding date macro

* added unit tests for date macro support in currency file url, and small fix to date macro in currency.js

* replaced string concatenations with string literals

* removed unnecessary parens
* added suppor for grabbing digitrust id off the window

* added digitrust support
* Update the Gamoshi Gambid adapter to simply the Gamoshi adapter

This is a minor branding change to highlight the Gamoshi brand name. The
biddercode "gambid" is still retained in the adapter aliases array.

* update whitelabel

* Add  test that checks support for outstream renderers

* Update testing and page ref

* Modify bidder's url resolving

* Fix lint issue with bidder's url resolving
* otm

* ALF-95

* otm: modify adapter to support migration to a new ssp

* otm: fixed spec
* 	- pubnx new bidder adapter created
	- pubnx doc file created

* 	- Spec file added.

* 	- Vertoz removed from response text

* removed pubnx from serverbid

since there will be a standalone adapter, the pubnx alias needs to removed from here

* 	- pubnx response parameters updated

* 	- build request params updated
snapwich and others added 13 commits January 15, 2019 15:59
* added babel plugin to replace webpack StringReplacementPlugin

* remove ignore-loader in favor of filtering non .js files as modules

* make all imports relative for projects not using our resolver

* refactor adaptermanager to adapterManager

* convert adapterManager to be compatible with latest version of babel

* refactored utils with es6 exports

* fixing tests

* fixing stubs and tests

* babelrc updated to be used externally from parent project

* remove $prebid.version$ from gulp and add to babel plugin

* fix tests to use actual prebid.version rather than string literal

* refactor all modules to use relative imports w/o webpack resolver

* fix test in old safari

* update package-lock.json

* remove unnecessary json-loader

* update babel plugin to use same @babel/core

* add instructions for using prebid as npm depenedency added to readme

* remove unused variable in global babel plugin

* fixed missing internal.createTrackPixelIframeHtml

* fix relative pathing for new modules
* Add eplanningBidAdapter

* Add new parameter to request

* Fix sync URL parameter

* Update cleanName regexp

* Update tests for new cleanName
* remove comment that isn't relevant anymore.  tll in targeting code

* bid caching option added (default on)

* fix typo in config name
* Create advenueBidAdapter.js

* Create advenueBidAdapter.md

* Update pbjs_example_gpt.html

Add advenue integration example

* Advenue test

Added test for advenue adapter

* changes made

* edit

* edit

* Syntax error corrected

* Remove grunt, changed ajv version to 6.2.2

* Edit

* Update package-lock.json

* removed response validation

* removed unused variables

* Removed deprecated method

* Package-lock.json deleted

* https://github.com/devadvenue/Prebid.js.git deleted

* del

* Add package-lock.json from main repository

* Delete package-lock.json

* Only pushing original file resolves merge conflict

* Update advenueBidAdapter.js

Changed URL, used BidderRequest object

* Update advenueBidAdapter_spec.js

* Update package-lock.json

* Update advenueBidAdapter_spec.js
…id#3470)

* calling for currency file even when default rates are specified

* fixed broken unit tests

* added unit test to check that currency file is still requested even when default rates are set
* LiveYield Analytics Adapter

* tests corrections

* fixed getPlacementOrAdUnitCode function

* corrections

* paths fixed

* adaptermanager import fixed

* manager corrections
@janua
Copy link

janua commented Jan 24, 2019

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.