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.

Sign up for GitHub

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

Jump to bottom

Playground xyz - GDPR integration. #2699

Merged
merged 44 commits into from
Jun 18, 2018
Merged

Playground xyz - GDPR integration. #2699

merged 44 commits into from
Jun 18, 2018

Commits on Oct 18, 2017

  1. Merge pull request #1 from prebid/master 

    Merge from upstream
    @teranchristian
    teranchristian committed Oct 18, 2017
    Configuration menu
    Copy the full SHA
    5ce4579 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2018

  1. Merge branch 'master' of https://github.com/prebid/Prebid.js

    @LucaConfa
    LucaConfa committed May 8, 2018
    Configuration menu
    Copy the full SHA
    121df8f View commit details
    Browse the repository at this point in the history

Commits on May 10, 2018

  1. Merge branch 'master' of https://github.com/prebid/Prebid.js into 364… 

    …8-prebidjs-pxyz-adapter
    @LucaConfa
    LucaConfa committed May 10, 2018
    Configuration menu
    Copy the full SHA
    907becf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/prebid/Prebid.js into 364… 

    …8-prebidjs-pxyz-adapter
    @LucaConfa
    LucaConfa committed May 10, 2018
    Configuration menu
    Copy the full SHA
    4f3cd90 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2018

  1. add playground adapters

    @LucaConfa
    LucaConfa committed May 12, 2018
    Configuration menu
    Copy the full SHA
    77214e0 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2018

  1. Merge branch 'master' of https://github.com/prebid/Prebid.js into 364… 

    …8-prebidjs-pxyz-adapter
    @LucaConfa
    LucaConfa committed May 13, 2018
    Configuration menu
    Copy the full SHA
    43143fd View commit details
    Browse the repository at this point in the history

Commits on May 14, 2018

  1. clean up

    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    bf2eda5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/prebid/Prebid.js into mas… 

    …ter-updated-upstream
    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    e8729b8 View commit details
    Browse the repository at this point in the history

  3. update with upstream master

    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    843d90e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from playground-xyz/master-updated-upstream 

    Master updated upstream
    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    ac1dfeb View commit details
    Browse the repository at this point in the history

  5. add test file clean up adapter by removing native referecnes

    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    745620f View commit details
    Browse the repository at this point in the history

  6. test file

    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    5449653 View commit details
    Browse the repository at this point in the history

  7. replace appnexus with playground reference in error logs

    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    cdcd95a View commit details
    Browse the repository at this point in the history

  8. remove commented code

    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    958b55a View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of github.com:playground-xyz/Prebid.js into 364… 

    …8-prebidjs-pxyz-adapter
    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    1fd3e6c View commit details
    Browse the repository at this point in the history

  10. change key in response object from appnexus to playgroundxyz

    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    8aea0fa View commit details
    Browse the repository at this point in the history

  11. change tests so we test for ordering by cpm as well

    @LucaConfa
    LucaConfa committed May 14, 2018
    Configuration menu
    Copy the full SHA
    c4645d2 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2018

  1. dont drop other bids, just set cpm to 0 and send it through

    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    6fd8600 View commit details
    Browse the repository at this point in the history

  2. clean up

    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    2347af2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/prebid/Prebid.js into mas… 

    …ter-updated-upstream
    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    814763e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/prebid/Prebid.js into 364… 

    …8-prebidjs-pxyz-adapter
    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    7f4a307 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4 from playground-xyz/master-updated-upstream 

    Master updated upstream
    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    f0b84d9 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:playground-xyz/Prebid.js into 364… 

    …8-prebidjs-pxyz-adapter
    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    3129be9 View commit details
    Browse the repository at this point in the history

  7. restore glulp file

    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    4d01623 View commit details
    Browse the repository at this point in the history

  8. fix documentation

    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    6351d40 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #5 from playground-xyz/3648-prebidjs-pxyz-adapter 

    3648 prebidjs pxyz adapter
    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    412f5a6 View commit details
    Browse the repository at this point in the history

  10. remove cpm logic from adapter

    @LucaConfa
    LucaConfa committed May 16, 2018
    Configuration menu
    Copy the full SHA
    60bda45 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2018

  1. Merge pull request #6 from playground-xyz/3648-prebidjs-pxyz-adapter 

    remove cpm logic from adapter
    @LucaConfa
    LucaConfa committed May 17, 2018
    Configuration menu
    Copy the full SHA
    269bcbe View commit details
    Browse the repository at this point in the history

  2. change application type to application\json for playground adapter

    @LucaConfa
    LucaConfa committed May 17, 2018
    Configuration menu
    Copy the full SHA
    434d0b6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from playground-xyz/3648-prebidjs-pxyz-adapter 

    change application type to application\json for playground adapter
    @LucaConfa
    LucaConfa committed May 17, 2018
    Configuration menu
    Copy the full SHA
    bc705b0 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2018

  1. update adaptor to use openRtb

    @teranchristian
    teranchristian committed May 22, 2018
    Configuration menu
    Copy the full SHA
    946e03a View commit details
    Browse the repository at this point in the history

  2. add device and site to bid

    @teranchristian
    teranchristian committed May 22, 2018
    Configuration menu
    Copy the full SHA
    d4df2c4 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2018

  1. Merge pull request #8 from playground-xyz/3648-prebidjs-pxyz-adapter 

    3648 prebidjs pxyz adapter
    @LucaConfa
    LucaConfa committed May 24, 2018
    Configuration menu
    Copy the full SHA
    622ce4e View commit details
    Browse the repository at this point in the history

  2. add extra space on error msg

    @teranchristian
    teranchristian committed May 24, 2018
    Configuration menu
    Copy the full SHA
    a8a7a27 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9 from playground-xyz/3648-prebidjs-pxyz-adapter 

    add extra space on error msg
    @teranchristian
    teranchristian committed May 24, 2018
    Configuration menu
    Copy the full SHA
    cfc570f View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. remove package-lock

    @teranchristian
    teranchristian committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    7360e83 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/playground-xyz/Prebid.js … 

    …into 3648-prebidjs-pxyz-adapter
    @teranchristian
    teranchristian committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    39d9679 View commit details
    Browse the repository at this point in the history

  3. update pg details

    @teranchristian
    teranchristian committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    639e60e View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Update playgroundxyzBidAdapter.md

    @monofonik
    monofonik committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    b27be4c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from playground-xyz/3648-prebidjs-pxyz-adapter 

    3648 prebidjs pxyz adapter
    @teranchristian
    teranchristian committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    3552ab2 View commit details
    Browse the repository at this point in the history

  3. add GDPR 

    remove video sample config form .md file
    @teranchristian
    teranchristian committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    0476a76 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11 from playground-xyz/3750-add-gdpr-consent-supp… 

    …ort-the-pxyz-prebidjs-adapter

GDPR integration
    @teranchristian
    teranchristian committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    79e5355 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master'

    @teranchristian
    teranchristian committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    da58fb9 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/playground-xyz/Prebid.js

    @teranchristian
    teranchristian committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    69cc9f5 View commit details
    Browse the repository at this point in the history