Merge Prebid 1.0 to Master #1936
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
* Adding timestamp function to utils * Auction manager (WIP) * WIP * Updated targeting with auction instances and added auction status * Updated appnexus and appnexusAst adapter * Added done callback * Removing bidmanager functions * Removing deprecated public api functions * remove bidmanager file * Revert "remove bidmanager file" This reverts commit 616409e. * Updated appnexus and rubicon adapters to call done callback after all responses are back * Added todo * Fixing circular dependency * filter s2s requests * Emit auction end Add getBidsRequested function * remove unused stuff from adapters * cleanup and fixes * Unit test fixes Added exclude to karma temporarily to support unit tests * added setTimeout for each auction instance * added constants closer to code * binded auction object inside done method * Adding auctionmanager_spec tests and fixes * Remove breakpoint * Moving auction to separate file and unit tests * Merged manually * Merged config api changes * Passing adunits, adunitscodes via constructor and fixing unit tests * added ajax with timeout * convert targeting module to factory pattern * Auction code refactored and unit tests * Updated bidderfactory for 1.0 changes and added unit tests * Renamed placementCode to adUnitCode * Refactor auction and update unit tests * JSDoc for auction and auctionManager * Unit test fixes after rebase * Manual merge new updates to bidmanager and its spec file into auction * Update appnexusAst spec file * Refactor * Prebid 1.0 does not require no_bid to be added * removed side effect by cloning objects * bug fix to set status on already used bid * Removing all !1.0 complaiant adapters * Adding aliases to appnexusAst adapter * Removed bidmanager from currency
* Auction moduel refactor * remove comment and global cbtimeout
* Add timeoutBuffer, s2sconfig, bidderSequence to config * Removing deprecated function and its unit test * fixed linting errors
# Conflicts: # modules/adxcgBidAdapter.js # modules/adyoulikeBidAdapter.js # modules/criteoBidAdapter.js # modules/gumgumBidAdapter.js # modules/openxBidAdapter.js # modules/prebidServerBidAdapter.js # modules/pulsepointLiteBidAdapter.js # modules/rubiconBidAdapter.js # modules/serverbidBidAdapter.js # modules/ucfunnelBidAdapter.js # modules/unrulyBidAdapter.js # modules/vertozBidAdapter.js # modules/yieldmoBidAdapter.js # src/adaptermanager.js # src/adapters/bidderFactory.js # src/bidmanager.js # src/native.js # src/prebid.js # test/spec/bidmanager_spec.js # test/spec/modules/adyoulikeBidAdapter_spec.js # test/spec/modules/appnexusAstBidAdapter_spec.js # test/spec/modules/appnexusBidAdapter_spec.js # test/spec/modules/criteoBidAdapter_spec.js # test/spec/modules/justpremiumBidAdapter_spec.js # test/spec/modules/komoonaBidAdapter_spec.js # test/spec/modules/marsmediaBidAdapter_spec.js # test/spec/modules/openxBidAdapter_spec.js # test/spec/modules/prebidServerBidAdapter_spec.js # test/spec/modules/pulsepointLiteBidAdapter_spec.js # test/spec/modules/rubiconBidAdapter_spec.js # test/spec/modules/sharethroughBidAdapter_spec.js # test/spec/unit/core/adapterManager_spec.js
# Conflicts: # modules/rubiconBidAdapter.js # test/spec/modules/rubiconBidAdapter_spec.js
* initial take on rubiconBidAdapter markup * formatting * formatting, cont. * formatting, cont.
* Fix issue with video bid validation * Modified tests to stub `auctionManager.getBidsRequested` instead of `getBidRequest` * Move stub to beforeEach hook * Fix lint errors * Add bidRequests param to bid validation
# Conflicts: # modules/adbutlerBidAdapter.js # modules/aolBidAdapter.js # modules/colossussspBidAdapter.js # modules/prebidServerBidAdapter.js # modules/spotxBidAdapter.js # modules/trustxBidAdapter.js # src/adaptermanager.js # src/bidmanager.js # test/spec/bidmanager_spec.js # test/spec/modules/adbutlerBidAdapter_spec.js # test/spec/modules/c1xBidAdapter_spec.js # test/spec/modules/colossussspBidAdapter_spec.js # test/spec/modules/improvedigitalBidAdapter_spec.js # test/spec/modules/orbitsoftBidAdapter_spec.js # test/spec/modules/sharethroughBidAdapter_spec.js # test/spec/modules/trustxBidAdapter_spec.js # test/spec/unit/core/adapterManager_spec.js
# Conflicts: # modules/beachfrontBidAdapter.js # modules/featureforwardBidAdapter.js # modules/jcmBidAdapter.js # modules/justpremiumBidAdapter.js # modules/platformioBidAdapter.js # modules/sonobiBidAdapter.js # src/adaptermanager.js # src/adapters/bidderFactory.js # src/prebid.js # test/spec/modules/beachfrontBidAdapter_spec.js # test/spec/modules/jcmBidAdapter_spec.js # test/spec/modules/platformioBidAdapter_spec.js # test/spec/unit/core/bidderFactory_spec.js
# Conflicts: # modules/adkernelBidAdapter.js # modules/adxcgBidAdapter.js # modules/audienceNetworkBidAdapter.js # modules/conversantBidAdapter.js # modules/fidelityBidAdapter.js # modules/improvedigitalBidAdapter.js # modules/kargoBidAdapter.js # modules/prebidServerBidAdapter.js # modules/quantcastBidAdapter.js # modules/trustxBidAdapter.js # modules/yieldmoBidAdapter.js # src/adapters/bidderFactory.js # test/spec/modules/adkernelBidAdapter_spec.js # test/spec/modules/adxcgBidAdapter_spec.js # test/spec/modules/audienceNetworkBidAdapter_spec.js # test/spec/modules/conversantBidAdapter_spec.js # test/spec/modules/fidelityBidAdapter_spec.js # test/spec/modules/improvedigitalBidAdapter_spec.js # test/spec/modules/kargoBidAdapter_spec.js # test/spec/modules/quantcastBidAdapter_spec.js # test/spec/modules/trustxBidAdapter_spec.js # test/spec/modules/yieldmoBidAdapter_spec.js # test/spec/unit/core/bidderFactory_spec.js
# Conflicts: # modules/appnexusBidAdapter.js # modules/centroBidAdapter.js # modules/currency.js # modules/dfpAdServerVideo.js # modules/getintentBidAdapter.js # modules/komoonaBidAdapter.js # modules/prebidServerBidAdapter.js # src/adaptermanager.js # src/adapters/bidderFactory.js # src/bidmanager.js # test/spec/modules/centroBidAdapter_spec.js # test/spec/modules/getintentBidAdapter_spec.js # test/spec/modules/komoonaBidAdapter_spec.js # test/spec/modules/prebidServerBidAdapter_spec.js # test/spec/video_spec.js
* added hook module to prebid core that allows extension of arbitrary functions * remove unused dependency tiny-queue * change PluginFunction to HookedFunction * more hook documentation fixes * Auction module updated to support currency/hook * remove unused dependency tiny-queue * change PluginFunction to HookedFunction * more hook documentation fixes * WIP * allow context for hooked functions * added tests for context * remove withContext, just use bind * fix in hooks so asyncSeries keeps proper bound context * Unit test fixes * Updated bid validation function
# Conflicts: # test/spec/modules/currency_spec.js
# Conflicts: # modules/openxBidAdapter.js # modules/realvuBidAdapter.js # modules/sharethroughBidAdapter.js # test/spec/modules/openxBidAdapter_spec.js # test/spec/modules/sharethroughBidAdapter_spec.js
* updated sizeMapping to use sizeConfig and support labels * added new tests for labels and sizes w/ sizeConfig when making auction * made some names clearer and added type to labels for sizeMapping * make error message more descriptive in adaptermanager * remove extra line in adpatermanager
* Added fix for location.origin * Fixed test case failing in IE and Safari browsers * Added utils.getOrigin method * Updated renderer to use hooks
# Conflicts: # modules/aolBidAdapter.js # modules/kummaBidAdapter.js # modules/mobfoxBidAdapter.js # modules/polluxBidAdapter.js # modules/prebidServerBidAdapter.js # modules/pubmaticBidAdapter.js # modules/sovrnBidAdapter.js # modules/underdogmediaBidAdapter.js # modules/vertamediaBidAdapter.js # src/bidmanager.js # test/spec/modules/aolBidAdapter_spec.js # test/spec/modules/kummaBidAdapter_spec.js # test/spec/modules/mobfoxBidAdapter_spec.js # test/spec/modules/polluxBidAdapter_spec.js # test/spec/modules/prebidServerBidAdapter_spec.js # test/spec/modules/sovrnBidAdapter_spec.js # test/spec/modules/underdogmediaBidAdapter_spec.js # test/spec/modules/vertamediaBidAdapter_spec.js # test/spec/unit/pbjs_api_spec.js
* Renamed appnexusAst adapter to appnexus * Updated unit test to use appnexus bidderCode * Remove completed todo comment
* Emit array of objects from BID_TIMEOUT event * requestId is now auctionId * Use v4 UUID to match previous requestId format * Move function
* Move public winningBids to auction * removed _winningBids * removed _winningBids * bugfix: return only new bids
* Updates for Prebid 1.0 Support * Updates for Bug Fixes and a small refactor
tests were failing due to no trailing space eslint rule.
* adxcg analytics adapter for 1.0 bidtimeout event * update tests for adxcg analytics 1.0
* fix adaptermanager s2sTest unit tests * fix s2s log message * remove errant comment * fixed log statement * removed seemingly unnecessary call to transformHeightWidth(adUnit); * removed legacy sizeMapping code block * initial refactor of prebidServerBidAdapter working w/o tests (cherry picked from commit 2b843d0) * add transformSizes back for prebidServer adUnits to fix request * fixed adapterManager_spec tests * added prebidServerBidAdapter tests for 1.0 * fixed lint errors * make sure addBidResponse and doneCb are stubbed for s2s calls * s2s requests now firing BID_REQUESTED event * fixed commented tests and other minor fixes * update defaults in prebidServerBidAdapter and fix doBidderSync bug * add new API for setting defaults in config for modules
# Conflicts: # modules/adformBidAdapter.js # modules/appnexusAstBidAdapter.js # modules/indexExchangeBidAdapter.js # modules/justpremiumBidAdapter.js # modules/rhythmoneBidAdapter.js # modules/trionBidAdapter.js # modules/yieldmoBidAdapter.js # src/adaptermanager.js # test/spec/modules/adformBidAdapter_spec.js # test/spec/modules/appnexusAstBidAdapter_spec.js # test/spec/modules/justpremiumBidAdapter_spec.js # test/spec/modules/rhythmoneBidAdapter_spec.js # test/spec/modules/trionBidAdapter_spec.js # test/spec/unit/core/adapterManager_spec.js
* Cherry pick alias bidder * Cherry pick alias bidder * Cherry pick alias bidder * Updated test case to not import adapter * targeting updates * targeting functions refactoring * Refactored functions * more refactor of function * added jsdoc and some more refactor * check bid expiry and filtering used bids
# Conflicts: # package.json # src/config.js
* video bug fix added required params to prebidServerAdapter * Emitted auction_end and updated ttl for prebidServer * fix logging of server adapters
# Conflicts: # modules/adformBidAdapter.js # modules/prebidServerBidAdapter.js # modules/sekindoUMBidAdapter.js # modules/serverbidBidAdapter.js # src/adaptermanager.js # src/utils.js # test/spec/modules/adformBidAdapter_spec.js # test/spec/modules/carambolaBidAdapter_spec.js # test/spec/modules/lifestreetBidAdapter_spec.js # test/spec/modules/sekindoUMBidAdapter_spec.js # test/spec/modules/serverbidBidAdapter_spec.js # test/spec/modules/yieldbotBidAdapter_spec.js
* IE bug fix * get only unique bidders
* remove polyfill.js and remove global polyfills * make sure find, findIndex, and includes use core-js in tests * switch from virtual function bind core-js to explicit usage. * remove transform-function-bind babel plugin
# Conflicts: # modules/admixerBidAdapter.js # modules/aerservBidAdapter.js # modules/appnexusAstBidAdapter.js # modules/indexExchangeBidAdapter.js # test/spec/modules/appnexusAstBidAdapter_spec.js # test/spec/modules/indexExchangeBidAdapter_video_spec.js # test/spec/unit/pbjs_api_spec.js
* replace usePrebidCache with video:cacheUrl and remove default * remove newConfig in dfpAdServerVideo_spec that isn't doing anything * change video.cacheUrl to cache.url * update to cache.url in auction and remove from adapter
* ET-1691: Pulsepoint Analytics adapter for Prebid. (#1) * ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter * ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter * ET-1691: cleanup * ET-1691: minor * ET-1691: revert package.json change * Adding bidRequest to bidFactory.createBid method as per #509 * ET-1765: Adding support for additional params in PulsePoint adapter (#2) * ET-1850: Fixing #866 * Minor fix * Adding mandatory parameters to Bid * Pulsepoint adapter changes * readme updates
# Conflicts: # modules/appnexusAstBidAdapter.js # test/spec/modules/appnexusAstBidAdapter_spec.js
* Removed the usage of utils library to get bidder requests during userSync since this info will now be passed into the method * Fixed extra space which cause lint to fail * Implemented user sync per code review feedback in #1917 * Minor feedback changes * Re-instated lint check for all files which was accidentally commited after testing
* add cache stuff to video for prebid server * add description for cacheMarkup
# Conflicts: # package.json
mkendall07
approved these changes
Dec 6, 2017
matthewlane
approved these changes
Dec 7, 2017
Millerrok
pushed a commit
to Vertamedia/Prebid.js
that referenced
this pull request
Dec 8, 2017
* 'master' of https://github.com/prebid/Prebid.js: (43 commits) Merge Prebid 1.0 to Master (prebid#1936) Prebid.js 0.34.1 release Vertamedia adapter outstream support (prebid#1860) Expose native image-type asset dimensions on bid response object (prebid#1919) Remove for of (prebid#1932) Unit-test fix (prebid#1927) Remove description_url (prebid#1922) Trion Interactive Adapter Bugfix (prebid#1925) Remove config setting from Optimatic adapter (prebid#1909) IE bug fix (prebid#1930) Clarify ad unit media filtering warning (prebid#1903) Add ReadPeak Bid Adapter (prebid#1838) Change clone function to make deep copies (prebid#1910) Serverbid 1.0 (prebid#1802) sekindoUM for prebid1.0 (prebid#1777) update auctionId to be requestId (prebid#1896) bug fixed to populate userSync default values (prebid#1897) Increment pre version AdkernelAdn analytics adapter (prebid#1868) Justpremium Adapter: use `filter` instead of `...new Set` (prebid#1895) ...
dluxemburg
pushed a commit
to Genius/Prebid.js
that referenced
this pull request
Jul 17, 2018
* Concurrent auctions (prebid#1593) * Adding timestamp function to utils * Auction manager (WIP) * WIP * Updated targeting with auction instances and added auction status * Updated appnexus and appnexusAst adapter * Added done callback * Removing bidmanager functions * Removing deprecated public api functions * remove bidmanager file * Revert "remove bidmanager file" This reverts commit 616409e. * Updated appnexus and rubicon adapters to call done callback after all responses are back * Added todo * Fixing circular dependency * filter s2s requests * Emit auction end Add getBidsRequested function * remove unused stuff from adapters * cleanup and fixes * Unit test fixes Added exclude to karma temporarily to support unit tests * added setTimeout for each auction instance * added constants closer to code * binded auction object inside done method * Adding auctionmanager_spec tests and fixes * Remove breakpoint * Moving auction to separate file and unit tests * Merged manually * Merged config api changes * Passing adunits, adunitscodes via constructor and fixing unit tests * added ajax with timeout * convert targeting module to factory pattern * Auction code refactored and unit tests * Updated bidderfactory for 1.0 changes and added unit tests * Renamed placementCode to adUnitCode * Refactor auction and update unit tests * JSDoc for auction and auctionManager * Unit test fixes after rebase * Manual merge new updates to bidmanager and its spec file into auction * Update appnexusAst spec file * Refactor * Prebid 1.0 does not require no_bid to be added * removed side effect by cloning objects * bug fix to set status on already used bid * Removing all !1.0 complaiant adapters * Adding aliases to appnexusAst adapter * Removed bidmanager from currency * Add ignore-loader to handle .md files (prebid#1646) * Auction module refactor (prebid#1644) * Auction moduel refactor * remove comment and global cbtimeout * Config api updates (prebid#1633) * Add timeoutBuffer, s2sconfig, bidderSequence to config * Removing deprecated function and its unit test * fixed linting errors * Adapter/rubicon bid adapter markup (prebid#1674) * initial take on rubiconBidAdapter markup * formatting * formatting, cont. * formatting, cont. * Prebid 1.0 Fix issue with video bid validation (prebid#1680) * Fix issue with video bid validation * Modified tests to stub `auctionManager.getBidsRequested` instead of `getBidRequest` * Move stub to beforeEach hook * Fix lint errors * Add bidRequests param to bid validation * Auction module updated to support currency/hook (prebid#1733) * added hook module to prebid core that allows extension of arbitrary functions * remove unused dependency tiny-queue * change PluginFunction to HookedFunction * more hook documentation fixes * Auction module updated to support currency/hook * remove unused dependency tiny-queue * change PluginFunction to HookedFunction * more hook documentation fixes * WIP * allow context for hooked functions * added tests for context * remove withContext, just use bind * fix in hooks so asyncSeries keeps proper bound context * Unit test fixes * Updated bid validation function * Fixed video unit test * updated sizeMapping to use sizeConfig and support labels (prebid#1772) * updated sizeMapping to use sizeConfig and support labels * added new tests for labels and sizes w/ sizeConfig when making auction * made some names clearer and added type to labels for sizeMapping * make error message more descriptive in adaptermanager * remove extra line in adpatermanager * update package.json with correct version. (prebid#1813) * Unit test fixes for IE 10 and other old browsers (prebid#1810) * Added fix for location.origin * Fixed test case failing in IE and Safari browsers * Added utils.getOrigin method * Updated renderer to use hooks * Rename appnexusAst adapter to appnexus adapter (prebid#1848) * Renamed appnexusAst adapter to appnexus * Updated unit test to use appnexus bidderCode * Remove completed todo comment * fixed safeframe for 1.0 (prebid#1834) * Emit array of objects from BID_TIMEOUT event (prebid#1824) * Emit array of objects from BID_TIMEOUT event * requestId is now auctionId * Use v4 UUID to match previous requestId format * Move function * Move public winningBids to auction (prebid#1828) * Move public winningBids to auction * removed _winningBids * removed _winningBids * bugfix: return only new bids * Updates for PubWise Prebid 1.0 Support (prebid#1847) * Updates for Prebid 1.0 Support * Updates for Bug Fixes and a small refactor * update JSDoc comment. Remove trailing space (prebid#1872) tests were failing due to no trailing space eslint rule. * Prebid 1.0 adxcg analytics adapter fix for bidtimeout event (prebid#1871) * adxcg analytics adapter for 1.0 bidtimeout event * update tests for adxcg analytics 1.0 * Prebid 1.0 prebid server (prebid#1846) * fix adaptermanager s2sTest unit tests * fix s2s log message * remove errant comment * fixed log statement * removed seemingly unnecessary call to transformHeightWidth(adUnit); * removed legacy sizeMapping code block * initial refactor of prebidServerBidAdapter working w/o tests (cherry picked from commit 2b843d0) * add transformSizes back for prebidServer adUnits to fix request * fixed adapterManager_spec tests * added prebidServerBidAdapter tests for 1.0 * fixed lint errors * make sure addBidResponse and doneCb are stubbed for s2s calls * s2s requests now firing BID_REQUESTED event * fixed commented tests and other minor fixes * update defaults in prebidServerBidAdapter and fix doBidderSync bug * add new API for setting defaults in config for modules * Targeting updates (prebid#1689) * Cherry pick alias bidder * Cherry pick alias bidder * Cherry pick alias bidder * Updated test case to not import adapter * targeting updates * targeting functions refactoring * Refactored functions * more refactor of function * added jsdoc and some more refactor * check bid expiry and filtering used bids * make sure we have the right version * Update version to fix invalid semver * video bug fix (prebid#1906) * video bug fix added required params to prebidServerAdapter * Emitted auction_end and updated ttl for prebidServer * fix logging of server adapters * Manually merge bidManager code to auction module (prebid#1905) * Unit test fix in IE for adxcgAnalytics Adapter (prebid#1929) * IE bug fix * get only unique bidders * added log message for xhr timeout (prebid#1928) * remove polyfill.js and remove global polyfills (prebid#1918) * remove polyfill.js and remove global polyfills * make sure find, findIndex, and includes use core-js in tests * switch from virtual function bind core-js to explicit usage. * remove transform-function-bind babel plugin * Replace usePrebidCache with cache:url and remove default (prebid#1904) * replace usePrebidCache with video:cacheUrl and remove default * remove newConfig in dfpAdServerVideo_spec that isn't doing anything * change video.cacheUrl to cache.url * update to cache.url in auction and remove from adapter * pulsepointLiteBidAdapter renamed to pulsepointBidAdapter (prebid#1931) * ET-1691: Pulsepoint Analytics adapter for Prebid. (#1) * ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter * ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter * ET-1691: cleanup * ET-1691: minor * ET-1691: revert package.json change * Adding bidRequest to bidFactory.createBid method as per prebid#509 * ET-1765: Adding support for additional params in PulsePoint adapter (#2) * ET-1850: Fixing prebid#866 * Minor fix * Adding mandatory parameters to Bid * Pulsepoint adapter changes * readme updates * add 'x_source.tid' to rubicon requests (prebid#1933) * Bring in pre-1.0 native-image asset adapter change (prebid#1934) * 33Across Adapter: Removed the usage of utils library (prebid#1917) * Removed the usage of utils library to get bidder requests during userSync since this info will now be passed into the method * Fixed extra space which cause lint to fail * Implemented user sync per code review feedback in prebid#1917 * Minor feedback changes * Re-instated lint check for all files which was accidentally commited after testing * Prebid 1.0 server cache (prebid#1935) * add cache stuff to video for prebid server * add description for cacheMarkup
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.
Type of change
Description of change
Its time to merge this mammoth PR.
Merge prebid-1.0 to master.
Other information
@prebid/core