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

33Across: Adding floors support #5408

Merged
merged 92 commits into from
Jun 23, 2020
Merged

33Across: Adding floors support #5408

merged 92 commits into from
Jun 23, 2020

Commits on Aug 3, 2018

  1. check gdpr in buildRequest

    @curlyblueeagle
    curlyblueeagle committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    60b6821 View commit details
    Browse the repository at this point in the history

  2. User sync based on whether gdpr applies or not

    @curlyblueeagle
    curlyblueeagle committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    888a1bd View commit details
    Browse the repository at this point in the history

  3. check if consent data exists during user sync

    @curlyblueeagle
    curlyblueeagle committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    59f8304 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2018

  1. split user sync into further branches: 1) when gdpr does not apply 2)… 

    … when consent data is unavailable
    @curlyblueeagle
    curlyblueeagle committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    1096846 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2018

  1. Merge pull request #8 from 33Across/XCH-801_gdpr_compliance 

    XCH-801 GDPR Compliance
    @curlyblueeagle
    curlyblueeagle committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    6dfb54d View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2018

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

    # Conflicts:
#	test/spec/modules/33acrossBidAdapter_spec.js
    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    c089d82 View commit details
    Browse the repository at this point in the history

  2. contribute viewability to ttxRequest

    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    fc9e8c6 View commit details
    Browse the repository at this point in the history

  3. update tests

    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    5a95872 View commit details
    Browse the repository at this point in the history

  4. remove window mock from tests

    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    8aa0218 View commit details
    Browse the repository at this point in the history

  5. use local variables

    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    7f75405 View commit details
    Browse the repository at this point in the history

  6. introduce ServerRequestBuilder

    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    6aedf17 View commit details
    Browse the repository at this point in the history

  7. add withOptions() method to ServerRequestBuilder

    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    9765718 View commit details
    Browse the repository at this point in the history

  8. add semicolons

    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    88a6527 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #12 from 33Across/viewability 

    Viewability
    @glebglushtsov
    glebglushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    093062d View commit details
    Browse the repository at this point in the history

  10. sync up package-lock.json with upstream/master

    Gleb Glushtsov committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    ac0b586 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2018

  1. stub window.top in tests

    Gleb Glushtsov committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    a9abbfb View commit details
    Browse the repository at this point in the history

  2. introduce getTopWindowSize() for test purpose

    Gleb Glushtsov committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    f701fb9 View commit details
    Browse the repository at this point in the history

  3. reformat code

    Gleb Glushtsov committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    059437b View commit details
    Browse the repository at this point in the history

  4. add withSite() method to TtxRequestBuilder 

    add withSite() method to TtxRequestBuilder
    Gleb Glushtsov committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    90e5bed View commit details
    Browse the repository at this point in the history

  5. Merge pull request #14 from 33Across/viewability 

    Viewability
    @glebglushtsov
    glebglushtsov committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    9660102 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2018

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

    Gleb Glushtsov committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    832e1d1 View commit details
    Browse the repository at this point in the history

  2. add isIframe() and _isViewabilityMeasurable()

    Gleb Glushtsov committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    f26b47a View commit details
    Browse the repository at this point in the history

  3. handle NON_MEASURABLE viewability in nested iframes

    Gleb Glushtsov committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    8f34683 View commit details
    Browse the repository at this point in the history

  4. consider page visibility, stub utils functions getWindowTop() and get… 

    …WindowSelf()
    Gleb Glushtsov committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    07f4933 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #15 from 33Across/viewability 

    Viewability
    @glebglushtsov
    glebglushtsov committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    525684b View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2018

  1. contribute viewability as 0 for inactive tab

    Gleb Glushtsov committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    8507272 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #16 from 33Across/viewability 

    contribute viewability as 0 for inactive tab
    @glebglushtsov
    glebglushtsov committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    d502156 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

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

    Gleb Glushtsov committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    a83374e View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

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

    Gleb Glushtsov committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    7219753 View commit details
    Browse the repository at this point in the history

  2. add prebidjs version to ttx request

    Gleb Glushtsov committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    527abc6 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2018

  1. send caller as an array

    Gleb Glushtsov committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    959637f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from 33Across/oculus-66-add-prebidjs-version-t… 

    …o-ttx-request

add prebidjs version to ttx request
    @glebglushtsov
    glebglushtsov committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    2b347c1 View commit details
    Browse the repository at this point in the history

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

    Gleb Glushtsov committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    a636d84 View commit details
    Browse the repository at this point in the history

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

    Gleb Glushtsov committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    1682fb3 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2018

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

    Gleb Glushtsov committed Nov 12, 2018
    Configuration menu
    Copy the full SHA
    753d9ab View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2018

  1. send viewability as non measurable when unable to locate target HTMLE… 

    …lement, add warning message
    Gleb Glushtsov committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    da38438 View commit details
    Browse the repository at this point in the history

  2. fix JSDoc in utils.js

    Gleb Glushtsov committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    6ee858d View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2018

  1. Merge pull request #18 from 33Across/oculus-68-map-ad-slot-path-to-el… 

    …ement-id

Oculus 68 map ad slot path to element
    @glebglushtsov
    glebglushtsov committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    66aa3eb View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2018

  1. Merge tag '1.33.0'

    Gleb Glushtsov committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    87b5970 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2019

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

    Gleb Glushtsov committed May 23, 2019
    Configuration menu
    Copy the full SHA
    f23e855 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

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

    Gleb Glushtsov committed May 31, 2019
    Configuration menu
    Copy the full SHA
    6e38645 View commit details
    Browse the repository at this point in the history

  2. introduce mapAdSlotPathToElementId()

    Gleb Glushtsov committed May 31, 2019
    Configuration menu
    Copy the full SHA
    3214634 View commit details
    Browse the repository at this point in the history

  3. introduce getAdSlotHTMLElement(), add logging

    Gleb Glushtsov committed May 31, 2019
    Configuration menu
    Copy the full SHA
    1058803 View commit details
    Browse the repository at this point in the history

  4. introduce mapAdSlotPathToElementId()

    Gleb Glushtsov committed May 31, 2019
    Configuration menu
    Copy the full SHA
    3fc8fe9 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. update logging in ad unit path to element id mapping

    Gleb Glushtsov committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    d850980 View commit details
    Browse the repository at this point in the history

  2. rephrase logging, fix tests

    Gleb Glushtsov committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    e14d1e1 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. update adapter documentation

    Gleb Glushtsov committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    17a2342 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2019

  1. remove excessive logging

    Gleb Glushtsov committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    178ccee View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2019

  1. improve logging

    Gleb Glushtsov committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    bc936c0 View commit details
    Browse the repository at this point in the history

  2. revert change

    Gleb Glushtsov committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    09bbfe7 View commit details
    Browse the repository at this point in the history

  3. fix return of _mapAdUnitPathToElementId()

    Gleb Glushtsov committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    236dd54 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2019

  1. improve logging of _mapAdUnitPathToElementId()

    Gleb Glushtsov committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    6c097ff View commit details
    Browse the repository at this point in the history

  2. Merge pull request #19 from 33Across/oculus-82-locate-ad-slot-element… 

    …-by-ad-slot-path

Oculus 82 locate ad slot element by ad slot path
    @glebglushtsov
    glebglushtsov committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    05f2753 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2019

  1. do not use Array.find()

    Gleb Glushtsov committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    acb0162 View commit details
    Browse the repository at this point in the history

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

    Gleb Glushtsov committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    3ca6029 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2019

  1. return id once element is found

    Gleb Glushtsov committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    c2cb54d View commit details
    Browse the repository at this point in the history

  2. return id once element is found

    Gleb Glushtsov committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    5bcde42 View commit details
    Browse the repository at this point in the history

  3. let -> const

    Gleb Glushtsov committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    a72b1a0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #20 from 33Across/oculus-82-locate-ad-slot-element… 

    …-by-ad-slot-path

Oculus 82 locate ad slot element by ad slot path
    @glebglushtsov
    glebglushtsov committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    11b1e96 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. Removing killswitch behavior for GDPR

    Aparna Hegde committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    0a84973 View commit details
    Browse the repository at this point in the history

  2. Updated comments to reflect current gdpr logic

    Aparna Hegde committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    ecefa15 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. URI encode consent string

    Aparna Hegde authored and Aparna Hegde committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    0a74fd9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #21 from 33Across/XCH-1388_gdpr_compliance 

    Xch 1388 gdpr compliance
    @curlyblueeagle
    curlyblueeagle committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    5b1eb46 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'prebid/master'

    Aparna Hegde authored and Aparna Hegde committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    2366af3 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2019

  1. Updated example site ID to help Prebid team e2e test our adapter

    Aparna Hegde committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    ced5902 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

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

    Aparna Hegde committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    9f3113a View commit details
    Browse the repository at this point in the history

  2. send page url in ortb

    Aparna Hegde committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    281814b View commit details
    Browse the repository at this point in the history

  3. Removed redundant pageUrl default

    Aparna Hegde committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    dbbecb0 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

  1. Merge pull request #22 from 33Across/XCH-1723_set_pageurl_in_request 

    Send Page Url in BidRequest
    @curlyblueeagle
    curlyblueeagle committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    8398b50 View commit details
    Browse the repository at this point in the history

  2. Restored package-log.json that mirrors prebid's repo

    Aparna Hegde committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    623f155 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #23 from 33Across/testing_revert 

    Restored package-log.json that mirrors prebid's repo
    @curlyblueeagle
    curlyblueeagle committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    34cd133 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

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

    Aparna Hegde authored and Aparna Hegde committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    305ddfa View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Sending USP string during buildRequest

    Aparna Hegde authored and Aparna Hegde committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    176a5d7 View commit details
    Browse the repository at this point in the history

  2. Adding USP consent data to user sync

    Aparna Hegde authored and Aparna Hegde committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    f6c94b2 View commit details
    Browse the repository at this point in the history

  3. add unit test for syncing without bidrequest

    Aparna Hegde authored and Aparna Hegde committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    8822c1b View commit details
    Browse the repository at this point in the history

  4. Changed to uspConsent to make the connatation consistent

    Aparna Hegde authored and Aparna Hegde committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    94714fa View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Resetting adapter state in adapter after user sync rather than exposi… 

    …ng it.
    Aparna Hegde authored and Aparna Hegde committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    3e94296 View commit details
    Browse the repository at this point in the history

  2. removed console log

    Aparna Hegde authored and Aparna Hegde committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    99e2d01 View commit details
    Browse the repository at this point in the history

  3. Adding schain info

    Aparna Hegde authored and Aparna Hegde committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    c979ddc View commit details
    Browse the repository at this point in the history

  4. remove setting empty format ext

    Aparna Hegde authored and Aparna Hegde committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    be12cd5 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. better tests invalid values

    Aparna Hegde authored and Aparna Hegde committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    77b0aa4 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. removing validation of schain

    Aparna Hegde authored and Aparna Hegde committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    c4b94bd View commit details
    Browse the repository at this point in the history

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

    Aparna Hegde authored and Aparna Hegde committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    4a31c03 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #26 from 33Across/XCH-1862_schain_support 

    Adding schain info
    @curlyblueeagle
    curlyblueeagle committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    17a958e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #25 from 33Across/XCH-1859_ccpa_compliance 

    CCPA compliance
    @curlyblueeagle
    curlyblueeagle committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    eb7efa1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/33Across/Prebid.js

    Aparna Hegde authored and Aparna Hegde committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    3246318 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2020

  1. Fixed lint errors

    Aparna Hegde authored and Aparna Hegde committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    b7118f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. First cut for bidfloors support

    Aparna Hegde authored and Aparna Hegde committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    d3884f5 View commit details
    Browse the repository at this point in the history

  2. fixed where getFloors is read

    Aparna Hegde authored and Aparna Hegde committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    56ca427 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #27 from 33Across/XCH-1803_bid_floors_support 

    First cut for bidfloors support
    @curlyblueeagle
    curlyblueeagle committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    2e46605 View commit details
    Browse the repository at this point in the history

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

    Aparna Hegde authored and Aparna Hegde committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    63d2e70 View commit details
    Browse the repository at this point in the history

  5. fixed merge conflicts

    Aparna Hegde authored and Aparna Hegde committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    091c23e View commit details
    Browse the repository at this point in the history