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

33Across ID System: Fix merge conflicts between master & 9.0 #11715

Merged
merged 10 commits into from
Jun 5, 2024

Commits on Jun 4, 2024

  1. Vis X Bid Adapter : retrieve and send seller defined audiences (prebi…

    …d#11638)
    
    * AF-3647 added device object to request in visxBidAdapter
    
    * AF-3647 added user, regs, site and user agent data to request
    
    * AF-3647 removed userAgentClientHints because of it is gotten from device object
    
    * AF-3647 updated test scenarios with sda signals
    
    * AF-3647 fixed to getting ortb2 and spec file
    
    * AF-3647 reverted to get user data from cookie/local storage
    Goncakkd authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    402b524 View commit details
    Browse the repository at this point in the history
  2. 33Across User ID Module : support for the recently introduced "multip…

    …le storage types" feature (prebid#11563)
    
    * Refactoring - break functions that are handling multiple storage types.
    
    * user id: introduce the concept of enabled storage types
    
    * Apply domain override to 33across ID
    
    * First party ID - Support for multiple storage types
    
    * 33Across User ID: Recommend both storage types
    
    * refactor the way enabled storage types are populated
    carlosfelix authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    6478666 View commit details
    Browse the repository at this point in the history
  3. Default to fetch keepalive (prebid#11682)

    Co-authored-by: Marcin Komorski <marcinkomorski@Marcins-MacBook-Pro.local>
    mkomorski and Marcin Komorski authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    82ce88e View commit details
    Browse the repository at this point in the history
  4. Dailymotion Bid Adapter: add support for user syncs & new fields (pre…

    …bid#11603)
    
    * Dailymotion Bid Adapter: add support for playbackmethod & plcmt
    
    * Dailymotion Bid Adapter: add support for user syncs
    
    * Dailymotion Bid Adapter: Add support for ortb2 device, and contextual informations
    
    * Dailymotion Bid Adapter: Fix tests
    
    * Dailymotion Bid Adapter: add support for content.url & device.ext.atts
    
    * Dailymotion Bid Adapter: change markdown header levels
    
    * Dailymotion Bid Adapter: collect prebid.version
    
    ---------
    
    Co-authored-by: Kevin Siow <kevin.siow@dailymotion.com>
    kvnsw and Kevin Siow authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    16263f3 View commit details
    Browse the repository at this point in the history
  5. ZetaGlobalSsp Analytics Adapter : provide device object (prebid#11607)

    * ZetaGlobalSpp Analytics adapter: provide device object
    
    * ZetaGlobalSpp Analytics adapter: provide ua in adRenderSucceeded event
    
    * provide domain and page in timeout event
    
    ---------
    
    Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com>
    Co-authored-by: Alexey Surovenko <ASurovenko@vdhk6ddf9m.home>
    3 people authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    5b7df85 View commit details
    Browse the repository at this point in the history
  6. Core Utils: fix jsdoc warnings (prebid#11694)

    * Update utils.js
    
    * Update perfMetrics.js
    
    * Update ttlCollection.js
    
    * Update adpod.js
    
    * Update consentManagementGpp.js
    
    * Update consentManagementGpp.js
    
    * Update consentManagement.js
    
    * Update consentManagementUsp.js
    
    * Update currency.js
    
    * Update dfpAdServerVideo.js
    
    * Update instreamTracking.js
    
    * Update s2sTesting.js
    
    * Update sizeMapping.js
    
    * Update topicsFpdModule.js
    
    * Update uid2IdSystem.js
    
    * Update consentManagementUsp.js
    
    * Update sizeMapping.js
    patmmccann authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    47e6561 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Configuration menu
    Copy the full SHA
    e802e21 View commit details
    Browse the repository at this point in the history
  2. ColossusSSP Bid Adapter : replace gpid for pbadslot (prebid#11701)

    * add video&native traffic colossus ssp
    
    * Native obj validation
    
    * Native obj validation #2
    
    * Added size field in requests
    
    * fixed test
    
    * fix merge conflicts
    
    * move to 3.0
    
    * move to 3.0
    
    * fix IE11 new URL issue
    
    * fix IE11 new URL issue
    
    * fix IE11 new URL issue
    
    * https for 3.0
    
    * add https test
    
    * add ccp and schain features
    
    * fix test
    
    * sync with upstream, fix conflicts
    
    * Update colossussspBidAdapter.js
    
    remove commented code
    
    * Update colossussspBidAdapter.js
    
    lint fix
    
    * identity extensions
    
    * identity extensions
    
    * fix
    
    * fix
    
    * fix
    
    * fix
    
    * fix
    
    * add tests for user ids
    
    * fix
    
    * fix
    
    * fix
    
    * fix
    
    * fix
    
    * fix
    
    * fix
    
    * add gdpr support
    
    * add gdpr support
    
    * id5id support
    
    * Update colossussspBidAdapter.js
    
    add bidfloor parameter
    
    * Update colossussspBidAdapter.js
    
    check bidfloor
    
    * Update colossussspBidAdapter.js
    
    * Update colossussspBidAdapter.js
    
    * Update colossussspBidAdapter.js
    
    * Update colossussspBidAdapter_spec.js
    
    * use floor module
    
    * Revert "use floor module"
    
    This reverts commit f0c5c24.
    
    * use floor module
    
    * update to 5v
    
    * fix
    
    * add uid2 and bidFloor support
    
    * fix
    
    * add pbadslot support
    
    * fix conflicts
    
    * add onBidWon
    
    * refactor
    
    * add test for onBidWon()
    
    * fix
    
    * add group_id
    
    * Trigger circleci
    
    * fix
    
    * update user sync
    
    * fix window.location
    
    * fix test
    
    * updates
    
    * fix conflict
    
    * fix
    
    * updates
    
    * remove traffic param
    
    * add transactionId to request data for colossusssp adapter
    
    * Send tid in placements array
    
    * update user sync
    
    * updated tests
    
    * remove changes package-lock file
    
    * fix
    
    * add First Party Data
    
    * gpp support
    
    * accepting eids from request
    
    * fixing lint errors
    
    * resolving a conflict
    
    * fixing a failed test case related to tid
    
    * fixing karma version for conflict resolution
    
    * reverting package json files to original version
    
    * switching placement to plcmt
    
    * replacing gpid for pbadslot
    
    ---------
    
    Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
    Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
    Co-authored-by: Bill Newman <huddled.masses1650@gmail.com>
    Co-authored-by: Mykhailo Yaremchuk <m.yaremchuk@smartyads.com>
    Co-authored-by: kottapally <bhasker@gytworkz.com>
    6 people authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    13b87fa View commit details
    Browse the repository at this point in the history
  3. Bidmatic Bid Adapter: Initial Release (prebid#11690)

    * Bidmatic Initial commit
    
    * Use getFloor from price module
    GeneGenie authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    105c662 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5b3ed44 View commit details
    Browse the repository at this point in the history