Skip to content

Commit be708d9

Browse files
committed
Merge branch 'master' into 33across_analytics_adapter
* master: Colossus Bid Adapter: gpp support (prebid#10096) Increment version to 8.1.0-pre Prebid 8.0.0 release Prebid 8: initial release (prebid#10071) Increment version to 7.54.1-pre Prebid 7.54.0 release Update topicsFpdModule.js (prebid#9990) Added GPP support (prebid#10094) Teads Bid Adapter:Remove auctionId from since it is not used anymore (prebid#10098) HypeLab Bid Adapter: Initial Release (prebid#10003) Oxxion Rtd Module: listen onBidResponseEvent instead of onAuctionEndEvent (prebid#10083) PubMatic Analytics Adapter : Added extra fields in tracker for analytics (prebid#10090) AdHash Bidder Adapter: update for brand safety (prebid#10087) videojsVideoProvider: use contrib-ads event names (prebid#10081) Increment version to 7.54.0-pre Prebid 7.53.0 release Add bidgency alias (prebid#10077) Weborama RTD Module : start Bidder specific handling removal (prebid#10005) ZetaGlobalSspBidAdapter: change logic around mediaType (prebid#10074) add tmax to sovrnBidAdapter (prebid#10059) Mediasquare Bid Adapter: Avoid to run bidwon event on video impressions (prebid#10068) FreePass User ID Module : initial release (prebid#9814) Conceptx Bid Adapter : initial release (prebid#9835) beOp BidAdapter: FirstPartyData management and ingest Permutive segments (prebid#9947) StroeerCore Bid Adapter: add price floor support (prebid#9962) YieldlabBidAdapter updated native asset mapping (prebid#9989) Mediasquare Bid Adapter: handle context for video bids (prebid#10055) Add new alias - Apester (prebid#10057) Criteo Bid Adapter: Pass outstream video renderer method (prebid#10054) Add: Viously GVL ID (prebid#10061) 1plus x RTD Adapter: remove bidder specific handling enforcement (DC 3634) (prebid#10001) Sirdata RTD Module : bidder specific handling removal (prebid#9970) feat: pass video.plcmt [PB-1736] (prebid#10058) Update adkernelBidAdapter.js (prebid#10056) Eskimi Bid Adapter: Added support for video (prebid#9985) Richaudience Bid Adapter : add compability with GPID (prebid#9928) Add GVL ID for pairId userId submodule. (prebid#10053) Update nexx360BidAdapter.js (prebid#10042) Logicad Bid Adapter: Add topics and uach support (prebid#10045) change session_id fallback to bidderRequestId (prebid#10047) ZetaGlobalSsp Bid Adapter : process array of sizes (prebid#10039) AdagioBidAdapter: change outstream renderer (prebid#10035) update greenbids analytics endpoint (prebid#10037) ID5 User Id module - get whole ext object from server response (prebid#10036) Criteo Bid Adapter : Bump fastbid version to 136 (prebid#9973) UID2 & EUID Modules: Add support for EUID and prefer localStorage for both modules. (prebid#9968) Schain module: do not share schain objects across different bid requests (prebid#10021) airgridRtdProvider: use provided tag insertion method `loadExternalScript` (prebid#9901) Increment version to 7.53.0-pre Prebid 7.52.0 release Yahoo ConnectId - fixed tests. (prebid#10033) Core & Multiple modules: activity controls (prebid#9802) Yahoo ConnectId - gpp consent module usage. (prebid#10022) Yahoo bid adapter: User sync pixels, consent signals update (prebid#10028) Core: fix `markWinningBidAsUsed` to set bid as winning and not just rendered (prebid#10014) Adriver Id System: add cfa param to url (prebid#10024) Undertone Bid Adapter : added GPP and video placements (prebid#10016) Oxxion Analytics Adapter : initial adapter release (prebid#9682) Connect id : storage duration updates and no longer require puid or he to be set (prebid#9965) Update ad generation adapter 1.6.0: update userSync (prebid#9984) fix module type (prebid#10019) Stv Bid Adapter: add schain support (prebid#10010) GrowthCode RTD : initial release (prebid#9852) ShareThrough Bid Adapter : fix playerSize (prebid#10011) chore: update default video placement value [PB-1560] (prebid#9948) Smartadserver Bid Adapter: support GPID (prebid#10004) Criteo Adapter: Add support of bcat/badv/bapp (prebid#10013) Zeta Global SSP Bid Adapter: Added support for video.plcmt (prebid#10009) Pair Id System: less noisy errors (prebid#9998) Increment version to 7.52.0-pre Prebid 7.51.0 release Appnexus Bid Adapter: added uol as an alias (prebid#10002) Adquery Bid Adapter : added bid request: version and bidPageUrl (prebid#9946) MinuteMedia Bid Adapter: support sua and plcmt params (prebid#9997) Adkernel Bid Adapter: add didnadisplay alias (prebid#10000) Adrino Bid Adapter: pass adUnitCode to adserver (prebid#9993)
2 parents f0c005a + 1e82414 commit be708d9

File tree

481 files changed

+12593
-20674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

481 files changed

+12593
-20674
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ "master" ]
16+
branches: [ "master"]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ "master" ]
19+
branches: [ "master"]
2020
schedule:
2121
- cron: '22 11 * * 0'
2222

integrationExamples/gpt/captifyRtdProvider_example.html

Lines changed: 0 additions & 167 deletions
This file was deleted.

integrationExamples/gpt/growthcode.html

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
<script async src="../../build/dev/prebid.js"></script>
88
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
99
<script>
10-
var FAILSAFE_TIMEOUT = 3300;
11-
var PREBID_TIMEOUT = 1000;
10+
var FAILSAFE_TIMEOUT = 33000;
11+
var PREBID_TIMEOUT = 10000;
1212

1313
var adUnits = [{
14+
debugging: {
15+
enabled: true
16+
},
1417
code: 'div-gpt-ad-1460505748561-0',
1518
mediaTypes: {
1619
banner: {
@@ -23,6 +26,11 @@
2326
params: {
2427
placementId: 13144370
2528
}
29+
},{
30+
bidder: 'criteo',
31+
params: {
32+
zoneId: 497747
33+
},
2634
}],
2735
}];
2836

@@ -67,12 +75,15 @@
6775
pbjs.setConfig({
6876
debugging: {
6977
enabled: true,
70-
bids: [{
71-
bidder: 'appnexus',
72-
adUnitCode: '/19968336/header-bid-tag-0',
73-
cpm: 1.5,
74-
adId: '111111',
75-
ad: '<html><body><img src="https://files.prebid.org/creatives/prebid300x250.png"></body></html>'
78+
},
79+
realTimeData: {
80+
auctionDelay: 1000,
81+
dataProviders: [{
82+
name: 'growthCodeRtd',
83+
waitForIt: true,
84+
params: {
85+
pid: 'TEST01',
86+
}
7687
}]
7788
},
7889
userSync: {
@@ -81,7 +92,7 @@
8192
storage: {
8293
type: "html5",
8394
name: "_sharedID", // create a cookie with this name
84-
expires: 365 // expires in 1 years
95+
expires: 365 // expires in 1 year
8596
}
8697
},{
8798
name: 'growthCodeId',

integrationExamples/gpt/userId_example.html

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,17 +251,31 @@
251251
{
252252
"name": "uid2",
253253
"params": {
254+
"uid2ApiBase": "https://operator-integ.uidapi.com", // Omit this setting for production
254255
"uid2Token": {
255-
"advertising_token": "example token",
256-
"refresh_token": "aslkdjaslkjdaslkhj",
257-
"identity_expires": Date.now() + 60*1000,
256+
"advertising_token": "advertising token goes here",
257+
"refresh_token": "refresh token goes here",
258+
"identity_expires": Date.now() + 60*1000, // These timestamps should be from the token generate response
258259
"refresh_from": Date.now() - 10*1000,
259260
"refresh_expires": Date.now() + 12*60*60*1000,
260-
"refresh_response_key": null
261+
"refresh_response_key": "refresh key goes here"
261262
}
262263
}
263-
}
264-
,
264+
},
265+
{
266+
"name": "euid",
267+
"params": {
268+
"euidApiBase": "https://integ.euid.eu", // Omit this setting for production
269+
"euidToken": {
270+
"advertising_token": "advertising token goes here",
271+
"refresh_token": "refresh token goes here",
272+
"identity_expires": Date.now() + 60*1000, // These timestamps should be from the token generate response
273+
"refresh_from": Date.now() - 10*1000,
274+
"refresh_expires": Date.now() + 12*60*60*1000,
275+
"refresh_response_key": "refresh key goes here"
276+
}
277+
}
278+
},
265279
{
266280
"name": "imuid",
267281
"params": {

0 commit comments

Comments
 (0)