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 from upstream #1

Merged
merged 28 commits into from
Oct 18, 2017
Merged

Merge from upstream #1

merged 28 commits into from
Oct 18, 2017

Commits on Oct 3, 2017

  1. Configuration menu
    Copy the full SHA
    0ab545e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0bc0b29 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2017

  1. prebidAdapter secure support (#1655)

    bretg authored and Matt Kendall committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    42282f5 View commit details
    Browse the repository at this point in the history
  2. Aliasbidder fix (#1652)

    * aliasBidder did not work for bidderFactory
    
    * added function to get adapter spec
    
    * Freezing spec and moved unit tests
    
    * Updated test case to not import adapter
    jaiminpanchal27 authored and Matt Kendall committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    6186a2c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a9dda35 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a2db7c4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    731c7e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2017

  1. remove bidmanager from rubicon tests (#1671)

    * remove bidmanager from rubicon tests
    
    * updated rubicon tests to not use callBids
    
    * remove no longer used artifacts from rubiconBidAdapter_spec
    snapwich authored and dbemiller committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    a907a4a View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2017

  1. Configuration menu
    Copy the full SHA
    f40f0e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2017

  1. Fix adapter tests that hardcoded pbjs. (#1666)

    Updated adapters to use `$$PREBID_GLOBAL$$` instead.
    Now if you change `globalVarName` in `package.json` the
    tests won't fail.
    mattpr authored and dbemiller committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    2988065 View commit details
    Browse the repository at this point in the history
  2. Fix broken AOL mobile endpoint secure bid requests (#1684)

    * Add bidfloor parameter to AOL adapter
    
    * Remove errant comma
    
    * Fixed AOL adapter mobile endpoint secure support
    kizzard authored and jaiminpanchal27 committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    2f58bb0 View commit details
    Browse the repository at this point in the history
  3. Update spotx video adapter to set the spotx_ad_key used in DFP (#1614)

    * Update spotx video adapter to set the spotx_ad_key used in DFP
    targeting to the bid.adId
    
    * Changed spotx adapter to set hb_adid through registerDefaultBidderSetting
    
    	- Instead of setting the adid to the spotx key in the bid response itself
    	we now set a key bid.spotx_ad_key on the bid and then overwrite the hb_adid
    	using this key.
    npeceniak authored and Matt Kendall committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    fc9cbfb View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2017

  1. PulsePoint Lite adapter - Enabling Sync pixel (#1686)

    * 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
    
    * Enabling User sync pixel
    
    * minor fix
    anand-venkatraman authored and matthewlane committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    4eff79f View commit details
    Browse the repository at this point in the history
  2. Code improvement for trustx adapter (#1673)

    * Add trustx adapter and tests for it
    
    * update integration example
    
    * Update trustx adapter
    
    * Post-review fixes of Trustx adapter
    
    * Code improvement for trustx adapter: changed default price type from gross to net
    PWyrembak authored and jaiminpanchal27 committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    e1f2d08 View commit details
    Browse the repository at this point in the history
  3. Change Default Content-Type for POST Requests to 'application/json' (#…

    …1681)
    
    * Update Sovrn adapter. Add test coverage. Enable deal IDs.
    
    * HS-271: Avoid using private variables such as _bidsRequested and _bidsReceived in Sovrn adapter and Sovrn tests.
    
    * lint
    
    * Add bidfloor param to test.
    
    * changed post content-type in bidder factory to 'application/json', as this is the stated standard for Prebid 1.0.0.
    
    * Revert "changed post content-type in bidder factory to 'application/json', as this is the stated standard for Prebid 1.0.0."
    
    This reverts commit 0338ce7.
    
    * Changed method for altering contentType so that it is configurable via the ServerRequest object.
    
    * Altered PR to conform to change reviews. added unit tests.
    
    * Added comment to pass Trion adapter test.
    
    * Removed false-y check for request.options. Added request.options config for GET requests. Added test for this second change and removed tests for passing null or undefined member variables into the request.options object.
    
    * small optimization to request.options to remove extra object declaration.
    Theodore Rand authored and Matt Kendall committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    a20c3f8 View commit details
    Browse the repository at this point in the history
  4. AppnexusAst bidadapter markdown file (#1696)

    * added appnexusAst bidadapter markdown file
    
    * updated mediatype native config
    jaiminpanchal27 authored and matthewlane committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    3f8021c View commit details
    Browse the repository at this point in the history
  5. AppnexusAst adapter: logging error message from endpoint (#1697)

    * logging error message received from endpoint
    
    * removed alias
    jaiminpanchal27 authored and Matt Kendall committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    209921c View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2017

  1. Add ad units event (#1702)

    * Adding an addAdUnits event
    
    * Fixing errors
    hhhjort authored and dbemiller committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    5bfcdc4 View commit details
    Browse the repository at this point in the history
  2. Update JSDoc for pbjs.enableAnalytics (#1565)

    rmloveland authored and Matt Kendall committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    1ed7fb5 View commit details
    Browse the repository at this point in the history
  3. Don't set non-object configurations (#1704)

    matthewlane authored and Matt Kendall committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    c89e911 View commit details
    Browse the repository at this point in the history
  4. Renaming of "huddledmasses" adapter into colossusssp (#1701)

    Bill Newman authored and dbemiller committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    54edd80 View commit details
    Browse the repository at this point in the history
  5. Rubicon feature/s2s test module (#1678)

    * added new server-to-server testing module
    
    * fixed linting errors
    
    * s2sTesting module fixes
    
    * s2sTesting module fixes
    
    * removed "both" option from s2s ab testing module
    
    * removed leftover StorageManager reference
    
    * s2sTesting module improvements
    
    * s2sTesting module improvement
    
    * Revert "Merge branch 'bugfix/pbs-adapter-storagemanager' into rubicon-feature/s2s-test-module"
    
    This reverts commit be232c6, reversing
    changes made to 4a3abd7.
    
    * minor s2sTesting fixes
    harpere authored Oct 17, 2017
    Configuration menu
    Copy the full SHA
    9b5b211 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ac40506 View commit details
    Browse the repository at this point in the history
  7. Initial commit for video support for pbs (#1706)

    * initial commit for video support for pbs
    
    * Don't mutate bidRequest
    Matt Kendall authored and matthewlane committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    17115fc View commit details
    Browse the repository at this point in the history
  8. Support native click tracking (#1691)

    * Implement native click tracking
    
    * Fire based on postMessage in adserver creative
    * Fix tests, add comments
    
    * Require landing page urls on native bid responses
    
    * Address code review comments
    matthewlane authored and Matt Kendall committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    819f8fc View commit details
    Browse the repository at this point in the history
  9. Prebid 0.31.0 Release

    jaiminpanchal27 committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    d0140eb View commit details
    Browse the repository at this point in the history
  10. Fix for #1628 (allowing standard bidCpmAdjustment) (#1645)

    * Added standard bidCpmAdjustment
    
    * Fix missing «typeof»
    dugwood authored and jaiminpanchal27 committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    e74ea2a View commit details
    Browse the repository at this point in the history
  11. Increment pre version

    jaiminpanchal27 committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    75f6dc5 View commit details
    Browse the repository at this point in the history