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

Pre-auction filters and pbAdslot support #4539

Merged
merged 68 commits into from
Jan 15, 2020
Merged

Pre-auction filters and pbAdslot support #4539

merged 68 commits into from
Jan 15, 2020

Commits on Feb 16, 2019

  1. Add microadBidAdapter

    nakamoto committed Feb 16, 2019
    Configuration menu
    Copy the full SHA
    8d635ff View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. Remove unnecessary encodeURIComponent from microadBidAdapter

    nakamoto committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    3055b90 View commit details
    Browse the repository at this point in the history

  2. Submit Advangelists Prebid Adapter

    Chandra Prakash committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    67fb91b View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Submit Advangelists Prebid Adapter 1.1

    Chandra Prakash committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    3ebb916 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2019

  1. Correct procudtion endpoint for prebid

    nakamoto committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    4f5c451 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'microad-bid-adapter' of git://github.com/strong-zero/Pr… 

    …ebid.js into master-rubicon-clean
    Isaac Dettman committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    2dc6d1d View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2019

  1. Merge remote-tracking branch 'origin/master' into master-rubicon-clean 

    # Conflicts:
#	modules/advangelistsBidAdapter.js
#	test/spec/modules/advangelistsBidAdapter_spec.js
    Isaac Dettman committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    fa3e081 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-remote-updated
    Isaac Dettman committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    600a46e View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2019

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

    Isaac Dettman committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    7f578b3 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2019

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

    Isaac Dettman committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    176a312 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

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

    Isaac Dettman committed May 13, 2019
    Configuration menu
    Copy the full SHA
    9abf89c View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2019

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

    Eric Harper committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    6ce04ab View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

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

    …ter-origin
    Isaac Dettman committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    415e2f6 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2019

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

    …ter-origin-rp
    Isaac Dettman committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    61fb82c View commit details
    Browse the repository at this point in the history

  2. analytics update with wrapper name

    Isaac Dettman committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    3cc4c67 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

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

    …ter-origin-rp
    Isaac Dettman committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    cd81e02 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-origin-rp
    Isaac Dettman committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    e2b4e04 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-origin-rp
    Isaac Dettman committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    53b5970 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

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

    …ter-origin-rp
    Isaac Dettman committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    5c00ed5 View commit details
    Browse the repository at this point in the history

  2. reverted error merge

    Isaac Dettman committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    28848ad View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2019

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

    …ter-origin-rp
    Isaac Dettman committed Jul 19, 2019
    Configuration menu
    Copy the full SHA
    ab635ee View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

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

    …ter-origin-rp
    Isaac Dettman committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    93308f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

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

    Isaac Dettman committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    1cfd52d View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2019

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

    Isaac Dettman committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    d619807 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2019

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

    Isaac Dettman committed Aug 7, 2019
    Configuration menu
    Copy the full SHA
    9893f0f View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2019

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

    Eric Harper committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    986a251 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2019

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

    …gin-master
    Isaac Dettman committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    2cae7c0 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2019

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

    Isaac Dettman committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    d7fd252 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

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

    Isaac Dettman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    c7c01ba View commit details
    Browse the repository at this point in the history

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

    Isaac Dettman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    24a28aa View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. Merge branch 'master' of https://github.com/rubicon-project/Prebid.js

    Isaac Dettman committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    7a1a4ec View commit details
    Browse the repository at this point in the history

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

    Isaac Dettman committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    4173d16 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2019

  1. update changed default value of netRevenue to true

    Isaac Dettman committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    ca13952 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2019

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

    Isaac Dettman committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    0b6cd48 View commit details
    Browse the repository at this point in the history

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

    Isaac Dettman committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    5f0110d View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

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

    TJ Eastmond committed Oct 8, 2019
    Configuration menu
    Copy the full SHA
    f930a34 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2019

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

    Isaac Dettman committed Oct 14, 2019
    Configuration menu
    Copy the full SHA
    9bff282 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2019

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

    Isaac Dettman committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    712ec9e View commit details
    Browse the repository at this point in the history

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

    Isaac Dettman committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    f192f65 View commit details
    Browse the repository at this point in the history

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

    Isaac Dettman committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    006f53c View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

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

    Isaac Dettman committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    0341150 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2019

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

    Update fork with latest from Prebid
    Mark Monday committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    fa59897 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

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

    Isaac Dettman committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    dcff2cf View commit details
    Browse the repository at this point in the history

  2. add beforeRequestBids event

    Isaac Dettman committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    e4b0344 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2019

  1. add pbAdSlot support to pbs adapter

    Isaac Dettman committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    e52714d View commit details
    Browse the repository at this point in the history

  2. update jsdoc comment for on before request bids event

    Isaac Dettman committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    887971a View commit details
    Browse the repository at this point in the history

  3. add pbAdSlot support to rubicon adapter

    Isaac Dettman committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    ff646df View commit details
    Browse the repository at this point in the history

  4. added more tests

    Isaac Dettman committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    5e4c078 View commit details
    Browse the repository at this point in the history

  5. update code comment

    Isaac Dettman committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    6ca2d59 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2019

  1. add api test, update event to emit from adapterManager

    Isaac Dettman committed Nov 24, 2019
    Configuration menu
    Copy the full SHA
    b97e2b9 View commit details
    Browse the repository at this point in the history

  2. add multi-bid api test

    Isaac Dettman committed Nov 24, 2019
    Configuration menu
    Copy the full SHA
    8a89f4d View commit details
    Browse the repository at this point in the history

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

    Isaac Dettman committed Nov 24, 2019
    Configuration menu
    Copy the full SHA
    0222ce2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/rubicon-project/Prebid.js … 

    …into add-pbadslot
    Isaac Dettman committed Nov 24, 2019
    Configuration menu
    Copy the full SHA
    9e79b0e View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

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

    …-pbadslot
    Isaac Dettman committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    a6d83ab View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. added pbAdSlot to rubicon bid adapter video bid request

    Isaac Dettman committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    5375b6f View commit details
    Browse the repository at this point in the history

  2. added ext to server video path in rp adapter pbAdSlot

    Isaac Dettman committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    727f517 View commit details
    Browse the repository at this point in the history

  3. fix for pb video ortb path

    Isaac Dettman committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    3abfe1a View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2019

  1. fix for consistency with pb server

    Isaac Dettman committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    0c1b352 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

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

    …-pbadslot

� Conflicts:
�	src/adapterManager.js
    Isaac Dettman committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    d4e7f21 View commit details
    Browse the repository at this point in the history

  2. update obj path to fpd.context.pbAdSlot

    Isaac Dettman committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    c526a58 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

  1. add leading slash removal to all outputs of pbAslot

    Isaac Dettman committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    431a8b8 View commit details
    Browse the repository at this point in the history

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

    …-pbadslot
    Isaac Dettman committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    eea65d5 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. revert to previous branch reviewed

    Isaac Dettman committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    55d6e90 View commit details
    Browse the repository at this point in the history

  2. revert to previous branch reviewed

    Isaac Dettman committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    fe3fa59 View commit details
    Browse the repository at this point in the history

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

    …-pbadslot
    Isaac Dettman committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    728b7e5 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/add-pbadslot' into add-pbadslot 

    # Conflicts:
#	modules/prebidServerBidAdapter/index.js
#	modules/rubiconBidAdapter.js
#	test/spec/modules/prebidServerBidAdapter_spec.js
    Isaac Dettman committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    db6fff9 View commit details
    Browse the repository at this point in the history

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

    …-pbadslot
    Isaac Dettman committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    65dfb11 View commit details
    Browse the repository at this point in the history

  6. fix merge errors

    Isaac Dettman committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    240e621 View commit details
    Browse the repository at this point in the history