Code

33Across: Adding floors support#5408

Code

Merged

robertrmartinez merged 92 commits intoprebid:masterprebid/Prebid.js:masterfrom 33Across:master33Across/Prebid.js:masterCopy head branch name to clipboardJun 23, 2020

+113-3

Commits

Commits on Aug 3, 2018

• check gdpr in buildRequest

  curlyblueeagle

  committed
  60b6821

  Copy full SHA for 60b6821

• User sync based on whether gdpr applies or not

  curlyblueeagle

  committed
  888a1bd

  Copy full SHA for 888a1bd

• check if consent data exists during user sync

  curlyblueeagle

  committed
  59f8304

  Copy full SHA for 59f8304

Commits on Aug 7, 2018

• split user sync into further branches: 1) when gdpr does not apply 2) when consent data is unavailable

  curlyblueeagle

  committed
  1096846

  Copy full SHA for 1096846

Commits on Aug 16, 2018

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

  Show description for 6dfb54d
  curlyblueeagle

  authored
  6dfb54d

  Copy full SHA for 6dfb54d

Commits on Sep 12, 2018

• Merge remote-tracking branch 'upstream/master'

  Show description for c089d82
  

  Gleb Glushtsov

  committed
  c089d82

  Copy full SHA for c089d82

• contribute viewability to ttxRequest

  

  Gleb Glushtsov

  committed
  fc9e8c6

  Copy full SHA for fc9e8c6

• update tests

  

  Gleb Glushtsov

  committed
  5a95872

  Copy full SHA for 5a95872

• remove window mock from tests

  

  Gleb Glushtsov

  committed
  8aa0218

  Copy full SHA for 8aa0218

• use local variables

  

  Gleb Glushtsov

  committed
  7f75405

  Copy full SHA for 7f75405

• introduce ServerRequestBuilder

  

  Gleb Glushtsov

  committed
  6aedf17

  Copy full SHA for 6aedf17

• add withOptions() method to ServerRequestBuilder

  

  Gleb Glushtsov

  committed
  9765718

  Copy full SHA for 9765718

• add semicolons

  

  Gleb Glushtsov

  committed
  88a6527

  Copy full SHA for 88a6527

• Merge pull request #12 from 33Across/viewability

  Show description for 093062d
  glebglushtsov

  authored
  093062d

  Copy full SHA for 093062d

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

  

  Gleb Glushtsov

  committed
  ac0b586

  Copy full SHA for ac0b586

Commits on Sep 13, 2018

• stub window.top in tests

  

  Gleb Glushtsov

  committed
  a9abbfb

  Copy full SHA for a9abbfb

• introduce getTopWindowSize() for test purpose

  

  Gleb Glushtsov

  committed
  f701fb9

  Copy full SHA for f701fb9

• reformat code

  

  Gleb Glushtsov

  committed
  059437b

  Copy full SHA for 059437b

• add withSite() method to TtxRequestBuilder

  Show description for 90e5bed
  

  Gleb Glushtsov

  committed
  90e5bed

  Copy full SHA for 90e5bed

• Merge pull request #14 from 33Across/viewability

  Show description for 9660102
  glebglushtsov

  authored
  9660102

  Copy full SHA for 9660102

Commits on Sep 14, 2018

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  832e1d1

  Copy full SHA for 832e1d1

• add isIframe() and _isViewabilityMeasurable()

  

  Gleb Glushtsov

  committed
  f26b47a

  Copy full SHA for f26b47a

• handle NON_MEASURABLE viewability in nested iframes

  

  Gleb Glushtsov

  committed
  8f34683

  Copy full SHA for 8f34683

• consider page visibility, stub utils functions getWindowTop() and getWindowSelf()

  

  Gleb Glushtsov

  committed
  07f4933

  Copy full SHA for 07f4933

• Merge pull request #15 from 33Across/viewability

  Show description for 525684b
  glebglushtsov

  authored
  525684b

  Copy full SHA for 525684b

Commits on Sep 17, 2018

• contribute viewability as 0 for inactive tab

  

  Gleb Glushtsov

  committed
  8507272

  Copy full SHA for 8507272

• Merge pull request #16 from 33Across/viewability

  Show description for d502156
  glebglushtsov

  authored
  d502156

  Copy full SHA for d502156

Commits on Sep 27, 2018

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  a83374e

  Copy full SHA for a83374e

Commits on Nov 7, 2018

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  7219753

  Copy full SHA for 7219753

• add prebidjs version to ttx request

  

  Gleb Glushtsov

  committed
  527abc6

  Copy full SHA for 527abc6

Commits on Nov 8, 2018

• send caller as an array

  

  Gleb Glushtsov

  committed
  959637f

  Copy full SHA for 959637f

• Merge pull request #17 from 33Across/oculus-66-add-prebidjs-version-to-ttx-request

  Show description for 2b347c1
  glebglushtsov

  authored
  2b347c1

  Copy full SHA for 2b347c1

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  a636d84

  Copy full SHA for a636d84

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  1682fb3

  Copy full SHA for 1682fb3

Commits on Nov 12, 2018

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  753d9ab

  Copy full SHA for 753d9ab

Commits on Nov 14, 2018

• send viewability as non measurable when unable to locate target HTMLElement, add warning message

  

  Gleb Glushtsov

  committed
  da38438

  Copy full SHA for da38438

• fix JSDoc in utils.js

  

  Gleb Glushtsov

  committed
  6ee858d

  Copy full SHA for 6ee858d

Commits on Nov 15, 2018

• Merge pull request #18 from 33Across/oculus-68-map-ad-slot-path-to-element-id

  Show description for 66aa3eb
  glebglushtsov

  authored
  66aa3eb

  Copy full SHA for 66aa3eb

Commits on Nov 26, 2018

• Merge tag '1.33.0'

  

  Gleb Glushtsov

  committed
  87b5970

  Copy full SHA for 87b5970

Commits on May 23, 2019

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  f23e855

  Copy full SHA for f23e855

Commits on May 31, 2019

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  6e38645

  Copy full SHA for 6e38645

• introduce mapAdSlotPathToElementId()

  

  Gleb Glushtsov

  committed
  3214634

  Copy full SHA for 3214634

• introduce getAdSlotHTMLElement(), add logging

  

  Gleb Glushtsov

  committed
  1058803

  Copy full SHA for 1058803

• introduce mapAdSlotPathToElementId()

  

  Gleb Glushtsov

  committed
  3fc8fe9

  Copy full SHA for 3fc8fe9

Commits on Jun 3, 2019

• update logging in ad unit path to element id mapping

  

  Gleb Glushtsov

  committed
  d850980

  Copy full SHA for d850980

• rephrase logging, fix tests

  

  Gleb Glushtsov

  committed
  e14d1e1

  Copy full SHA for e14d1e1

Commits on Jun 5, 2019

• update adapter documentation

  

  Gleb Glushtsov

  committed
  17a2342

  Copy full SHA for 17a2342

Commits on Jun 10, 2019

• remove excessive logging

  

  Gleb Glushtsov

  committed
  178ccee

  Copy full SHA for 178ccee

Commits on Jun 11, 2019

• improve logging

  

  Gleb Glushtsov

  committed
  bc936c0

  Copy full SHA for bc936c0

• revert change

  

  Gleb Glushtsov

  committed
  09bbfe7

  Copy full SHA for 09bbfe7

• fix return of _mapAdUnitPathToElementId()

  

  Gleb Glushtsov

  committed
  236dd54

  Copy full SHA for 236dd54

Commits on Jun 12, 2019

• improve logging of _mapAdUnitPathToElementId()

  

  Gleb Glushtsov

  committed
  6c097ff

  Copy full SHA for 6c097ff

• Merge pull request #19 from 33Across/oculus-82-locate-ad-slot-element-by-ad-slot-path

  Show description for 05f2753
  glebglushtsov

  authored
  05f2753

  Copy full SHA for 05f2753

Commits on Jun 17, 2019

• do not use Array.find()

  

  Gleb Glushtsov

  committed
  acb0162

  Copy full SHA for acb0162

• Merge remote-tracking branch 'upstream/master'

  

  Gleb Glushtsov

  committed
  3ca6029

  Copy full SHA for 3ca6029

Commits on Jun 18, 2019

• return id once element is found

  

  Gleb Glushtsov

  committed
  c2cb54d

  Copy full SHA for c2cb54d

• return id once element is found

  

  Gleb Glushtsov

  committed
  5bcde42

  Copy full SHA for 5bcde42

• let -> const

  

  Gleb Glushtsov

  committed
  a72b1a0

  Copy full SHA for a72b1a0

• Merge pull request #20 from 33Across/oculus-82-locate-ad-slot-element-by-ad-slot-path

  Show description for 11b1e96
  glebglushtsov

  authored
  11b1e96

  Copy full SHA for 11b1e96

Commits on Jun 25, 2019

• Removing killswitch behavior for GDPR

  

  Aparna Hegde

  committed
  0a84973

  Copy full SHA for 0a84973

• Updated comments to reflect current gdpr logic

  

  Aparna Hegde

  committed
  ecefa15

  Copy full SHA for ecefa15

Commits on Jun 26, 2019

• URI encode consent string

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  0a74fd9

  Copy full SHA for 0a74fd9

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

  Show description for 5b1eb46
  curlyblueeagle

  authored
  5b1eb46

  Copy full SHA for 5b1eb46

• Merge remote-tracking branch 'prebid/master'

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  2366af3

  Copy full SHA for 2366af3

Commits on Jul 2, 2019

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

  

  Aparna Hegde

  committed
  ced5902

  Copy full SHA for ced5902

Commits on Jan 28, 2020

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

  

  Aparna Hegde

  committed
  9f3113a

  Copy full SHA for 9f3113a

• send page url in ortb

  

  Aparna Hegde

  committed
  281814b

  Copy full SHA for 281814b

• Removed redundant pageUrl default

  

  Aparna Hegde

  committed
  dbbecb0

  Copy full SHA for dbbecb0

Commits on Jan 29, 2020

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

  Show description for 8398b50
  curlyblueeagle

  authored
  8398b50

  Copy full SHA for 8398b50

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

  

  Aparna Hegde

  committed
  623f155

  Copy full SHA for 623f155

• Merge pull request #23 from 33Across/testing_revert

  Show description for 34cd133
  curlyblueeagle

  authored
  34cd133

  Copy full SHA for 34cd133

Commits on Jun 3, 2020

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

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  305ddfa

  Copy full SHA for 305ddfa

Commits on Jun 4, 2020

• Sending USP string during buildRequest

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  176a5d7

  Copy full SHA for 176a5d7

• Adding USP consent data to user sync

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  f6c94b2

  Copy full SHA for f6c94b2

• add unit test for syncing without bidrequest

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  8822c1b

  Copy full SHA for 8822c1b

• Changed to uspConsent to make the connatation consistent

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  94714fa

  Copy full SHA for 94714fa

Commits on Jun 8, 2020

• Resetting adapter state in adapter after user sync rather than exposing it.

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  3e94296

  Copy full SHA for 3e94296

• removed console log

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  99e2d01

  Copy full SHA for 99e2d01

• Adding schain info

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  c979ddc

  Copy full SHA for c979ddc

• remove setting empty format ext

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  be12cd5

  Copy full SHA for be12cd5

Commits on Jun 9, 2020

• better tests invalid values

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  77b0aa4

  Copy full SHA for 77b0aa4

Commits on Jun 11, 2020

• removing validation of schain

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  c4b94bd

  Copy full SHA for c4b94bd

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

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  4a31c03

  Copy full SHA for 4a31c03

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

  Show description for 17a958e
  curlyblueeagle

  authored
  17a958e

  Copy full SHA for 17a958e

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

  Show description for eb7efa1
  curlyblueeagle

  authored
  eb7efa1

  Copy full SHA for eb7efa1

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

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  3246318

  Copy full SHA for 3246318

Commits on Jun 16, 2020

• Fixed lint errors

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  b7118f1

  Copy full SHA for b7118f1

Commits on Jun 22, 2020

• First cut for bidfloors support

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  d3884f5

  Copy full SHA for d3884f5

• fixed where getFloors is read

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  56ca427

  Copy full SHA for 56ca427

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

  Show description for 2e46605
  curlyblueeagle

  authored
  2e46605

  Copy full SHA for 2e46605

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

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  63d2e70

  Copy full SHA for 63d2e70

• fixed merge conflicts

  

  Aparna Hegde

  authored and

  Aparna Hegde

  committed
  091c23e

  Copy full SHA for 091c23e