Code

Trion gdpr and usp consent#4740

Code

Merged

bretg merged 26 commits intoprebid:masterprebid/Prebid.js:masterfrom grohm33:mastergrohm33/Prebid.js:masterCopy head branch name to clipboardJan 21, 2020

+85-8

Commits

Commits on Oct 17, 2017

• Adding files associated with the trion adapter update to the newest prebid version(1.0).

  

  Mike Groh

  committed
  21bab6b

  Copy full SHA for 21bab6b

• Merge branch 'master' into master

  grohm33

  authored
  fae1208

  Copy full SHA for fae1208

Commits on Oct 18, 2017

• Updating pull request with safer checks for user sync and general clean up/consistency of tests.

  

  Mike Groh

  committed
  3abcf64

  Copy full SHA for 3abcf64

Commits on Nov 13, 2017

• removing a call to bidder code for pull request review. also removing the test that requires it

  

  Mike Groh

  committed
  0c040fc

  Copy full SHA for 0c040fc

• Merge remote-tracking branch 'upstream/master'

  

  Mike Groh

  committed
  40444f7

  Copy full SHA for 40444f7

Commits on Dec 5, 2017

• there were some changes to the bid factory after our initial release that we didn't account for. Changing adapter to account for response body and required params.

  

  Mike Groh

  committed
  324d157

  Copy full SHA for 324d157

• Revert "there were some changes to the bid factory after our initial release that we didn't account for. Changing adapter to account for response body and required params."

  Show description for bb5f8c7
  

  Mike Groh

  committed
  bb5f8c7

  Copy full SHA for bb5f8c7

• Merge remote-tracking branch 'upstream/master'

  

  Mike Groh

  committed
  8d40681

  Copy full SHA for 8d40681

• there were some changes to the bid factory after our initial release that we didn't account for. Changing adapter to account for response body and required params.

  

  Mike Groh

  committed
  8d67f63

  Copy full SHA for 8d67f63

Commits on Feb 8, 2019

• Merge remote-tracking branch 'upstream/master'

  

  Mike Groh

  committed
  6f213fb

  Copy full SHA for 6f213fb

• adding safety checks to Trion adapter

  

  Mike Groh

  committed
  c734aff

  Copy full SHA for c734aff

Commits on Nov 26, 2019

• Merge remote-tracking branch 'upstream/master'

  

  Mike Groh

  committed
  2bc52cf

  Copy full SHA for 2bc52cf

Commits on Dec 2, 2019

• Sending up to trion endpoint if there is bot traffic or the browser tab is not visible.

  

  Mike Groh

  committed
  29320de

  Copy full SHA for 29320de

• sending the wrong param in the test.

  

  Mike Groh

  committed
  f0c2028

  Copy full SHA for f0c2028

• Merge remote-tracking branch 'upstream/master'

  

  Mike Groh

  committed
  2e4b257

  Copy full SHA for 2e4b257

Commits on Dec 3, 2019

• Merge remote-tracking branch 'upstream/master'

  

  Mike Groh

  committed
  5546465

  Copy full SHA for 5546465

Commits on Dec 9, 2019

• Trion test cleanup. returning document and window states to their original form after tests.

  

  Mike Groh

  committed
  3322fd4

  Copy full SHA for 3322fd4

• Trion test cleanup. using before and after to alter window and document objects in tests.

  

  Mike Groh

  committed
  4521bf0

  Copy full SHA for 4521bf0

Commits on Dec 13, 2019

• Merge remote-tracking branch 'upstream/master'

  Show description for d36ba3b
  

  Mike Groh

  committed
  d36ba3b

  Copy full SHA for d36ba3b

• re-adding trion adapter to prebid project to stop using deprecated function for page url for 3.0 release

  

  Mike Groh

  committed
  d408b9c

  Copy full SHA for d408b9c

Commits on Dec 16, 2019

• minor formatting change

  

  Mike Groh

  committed
  abe60af

  Copy full SHA for abe60af

• accept size array from media types banner over the sizes array from pubs.

  

  Mike Groh

  committed
  a8cd6af

  Copy full SHA for a8cd6af

Commits on Jan 14, 2020

• Merge remote-tracking branch 'upstream/master'

  

  Mike Groh

  committed
  2bd5be7

  Copy full SHA for 2bd5be7

Commits on Jan 16, 2020

• updating trion bid adapter to be us privacy and gdpr compliant

  

  Mike Groh

  committed
  914150a

  Copy full SHA for 914150a

• encoding consent strings for test

  

  Mike Groh

  committed
  cc017f9

  Copy full SHA for cc017f9

Commits on Jan 21, 2020

• Merge remote-tracking branch 'upstream/master'

  

  Mike Groh

  committed
  61dd262

  Copy full SHA for 61dd262