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

SupplyChainObject support and fires a pixel onTimeout #4152

Merged
merged 37 commits into from
Sep 17, 2019
Merged

SupplyChainObject support and fires a pixel onTimeout #4152

merged 37 commits into from
Sep 17, 2019

Commits on Aug 1, 2018

  1. Added telaria bid adapter

    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    5dcf4b5 View commit details
    Browse the repository at this point in the history

  2. more documentation

    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    0a19ea2 View commit details
    Browse the repository at this point in the history

  3. Added more test cases. And improved some code in the adapter

    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    e1d19e4 View commit details
    Browse the repository at this point in the history

  4. Removed the check for optional params, they are handled in the server… 

    …. Also updated certain param names used in the test spec.
    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    0863824 View commit details
    Browse the repository at this point in the history

  5. added some spaces to fix CircleCI tests

    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    cb0973a View commit details
    Browse the repository at this point in the history

  6. added some spaces to fix CircleCI tests

    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    836779c View commit details
    Browse the repository at this point in the history

  7. fixed code indentation in /spec/AnalyticsAdapter_spec.js which causin… 

    …g the CircleCI tests to fail.
    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    850c4f4 View commit details
    Browse the repository at this point in the history

  8. Reverted the changes

    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    ad01373 View commit details
    Browse the repository at this point in the history

  9. merged with prebid master.

    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    df23a42 View commit details
    Browse the repository at this point in the history

  10. merged with prebid master.

    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    de868c1 View commit details
    Browse the repository at this point in the history

  11. creative Id is required when we build a response but our server doesn… 

    …'t always have the crid, so using a sentinel value when we don't have the crid.
    @tremorvideo
    tremorvideo committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    dd996a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2018

  1. - removed an un used method 

    - Removed the package-lock file.
    @tremorvideo
    tremorvideo committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    7ef41b9 View commit details
    Browse the repository at this point in the history

  2. Merge https://github.com/prebid/Prebid.js 

    # Conflicts:
#	package-lock.json
    @tremorvideo
    tremorvideo committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    d7b95e6 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2018

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

    Vinay Prasad committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    58cc7ce View commit details
    Browse the repository at this point in the history

  2. merging to master

    Vinay Prasad committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    81ec17a View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2018

  1. updated telaria bid adapter to use player size provided by the bid.me… 

    …diaTypes.video.playerSize instead of bid.sizes.

prebid#3331
    Vinay Prasad committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    cebc764 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. - removed the requirement for having player size 

    - updated the test spec to reflect the above change
- removed changes to the package-lock.json file.
    Vinay Prasad committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    7d617a7 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. added a param to the ad call url to let us know that the request is c… 

    …oming via hb.
    Vinay Prasad committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    012a77b View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. to lower casing the bidder code.

    Vinay Prasad committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    178c072 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2019

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

    # Conflicts:
#	modules/telariaBidAdapter.js
    Vinay Prasad committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    fb10552 View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	modules/telariaBidAdapter.js

Added GDPR support
    Vinay Prasad committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    7c6f20c View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2019

  1. Sending the gdpr & gdpr consent string only if they're defined

    Vinay Prasad committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    32831bf View commit details
    Browse the repository at this point in the history

Commits on May 6, 2019

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

    Merging with master
    Vinay Prasad committed May 6, 2019
    Configuration menu
    Copy the full SHA
    a9607be View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

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

    Merged the fork with the latest master
    Vinay Prasad committed May 21, 2019
    Configuration menu
    Copy the full SHA
    3b3e433 View commit details
    Browse the repository at this point in the history

  2. - Updated the test ad unit to use 'telaria' as the bidder code. 

    - Added an example URL.
    Vinay Prasad committed May 21, 2019
    Configuration menu
    Copy the full SHA
    95f6d98 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2019

  1. using the bidder code constant

    Vinay Prasad committed May 23, 2019
    Configuration menu
    Copy the full SHA
    5385ca0 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2019

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

    Merging the telaria prebid fork to master
    Vinay Prasad committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    787a6ff View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. - Implemented the 'onTimeout' callback to fire a pixel when there's a… 

    … timeout.

- Added the ability to serialize an schain object according to the description provided here: https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/supplychainobject.md
    Vinay Prasad committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    6f2cb7d View commit details
    Browse the repository at this point in the history

  2. some mods to the schain tag generation

    Vinay Prasad committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    b64b614 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2019

  1. - added tests for schain param checking.

    Vinay Prasad committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    fa420db View commit details
    Browse the repository at this point in the history

  2. - fixed a malformed url for timeouts

    Vinay Prasad committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    4d8f45d View commit details
    Browse the repository at this point in the history

  3. - Removed a trailing ',' while generating a schain param.

    Vinay Prasad committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    834945d View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2019

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

    Merging with master
    Vinay Prasad committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    9fd494e View commit details
    Browse the repository at this point in the history

  2. - Using the schain object from validBidRequest if present. Reverting … 

    …to checking if params has it if not.
    Vinay Prasad committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    969e275 View commit details
    Browse the repository at this point in the history

  3. - reverting changes to merge with master

    Vinay Prasad committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    991fb84 View commit details
    Browse the repository at this point in the history

  4. resolving merge conflicts

    Vinay Prasad committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    a9ff4f8 View commit details
    Browse the repository at this point in the history

  5. - Resolving merge issues

    Vinay Prasad committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    f744560 View commit details
    Browse the repository at this point in the history