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.

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

Staged nightly #341

Merged
merged 85 commits into from
Jul 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
c006a6a
Increment pre version
May 22, 2019
a7953e4
Refactor bid response - remove unnecessary properties (#3807)
May 27, 2019
3f5a598
change in Aardvark adapter to handle additional data (#3821)
musikele May 27, 2019
96aae26
Updated the bidder code in the test ad unit. (#3844)
telariaEng May 27, 2019
d7af6db
Update rtbhouseBidAdapter.md (#3857)
Kamoris May 27, 2019
3f1b739
Added optional dealId parameter to bid response. (#3858)
dpapworth-qc May 27, 2019
0ee3cc6
adding Outstream mediaType to EMX Digital (#3840)
EMXDigital May 28, 2019
445df80
Adding bidfloor to video imp req (#3863)
robertrmartinez May 28, 2019
c1f6ce4
Rhythmone Adapter - Multiple ad size support, rewrite tests, update d…
May 28, 2019
dc3134c
minor updates to consentManagement tests (#3849)
jsnellbaker May 28, 2019
e88dec1
auction key limiter feature (#3825)
jsnellbaker May 28, 2019
a2f8500
aardvark tdid support (#3860)
aleksatr May 29, 2019
bec741d
We want to remove bidfloor if not set by pb (#3866)
robertrmartinez May 29, 2019
efd5ed6
mgid adapter: add support of currency.adServerCurrency (#3850)
Gaudeamus May 29, 2019
7094e08
Prebid 2.17.0 Release
May 29, 2019
dc8f6d5
Increment pre version
May 29, 2019
582ecdf
adxcgBidAdapter - added pubcid (#3824)
adxcgcom May 30, 2019
7aa0e0d
getCpmInNewCurrency to use current value of bid.cpm and bid.currency …
pm-harshad-mane Jun 3, 2019
ac65812
always adding originalCpm and originalCurrency to bid object (#3856)
pm-harshad-mane Jun 3, 2019
db167c0
new size Rubicon (#3877)
Jun 3, 2019
2f208f8
BIDDER_CODE check removed (#3862)
AdmixerTech Jun 4, 2019
2a10388
Bugfix add bid parameters if not present (#3808)
arneschulz1984 Jun 4, 2019
1f9937e
Remove useless bidderCode in bid response (#3864)
guiann Jun 5, 2019
3ac37f8
Use actual global object name in log message (#3874)
Rooke Jun 5, 2019
2cf6498
Digitrust submodule (#3867)
goosemanjack Jun 5, 2019
45e5be7
changed name company (#3875)
mhlm Jun 5, 2019
81932cd
New STAQ analytics adapter (#3772)
mquirion Jun 5, 2019
8b6fbd7
Prebid 2.18.0 release
Jun 5, 2019
a40835c
Increment pre version
Jun 5, 2019
5a4b25a
removed the non-working setting on table (#3890)
pm-harshad-mane Jun 7, 2019
3cb7342
Implement Appier Analytics Adapter. (#3871)
kd-appier Jun 10, 2019
cacb6e7
Adding aliases for adsparc and safereach to aardvark adapter (#3848)
naegelin Jun 10, 2019
2794cd8
Add slimCut bid adapter (#3880)
mcamustlr Jun 12, 2019
5715a02
feat(unruly-bid-adapter): use bidResponse siteId when configuring the…
paprikka Jun 12, 2019
9598148
[BID-3479] - Add BidResponse.meta.dspid for OpenX (#3895)
lambdarho Jun 12, 2019
96d46b1
kargo session id (#3897)
samuelhorwitz Jun 12, 2019
98db99c
allow endpoint configuration for rdn adapter (#3902)
snapwich Jun 12, 2019
83aa229
aardvark adapter, add width & height params (#3892)
aleksatr Jun 13, 2019
a9dc896
cache buster for user sync (#3838)
nwlosinski Jun 13, 2019
efe74f8
Add bidFloor to Yieldmo Adapter (#3886)
HolzAndrew Jun 13, 2019
40f032c
Add beachfront bidder params to set outstream player settings (#3868)
jsalis Jun 13, 2019
b617aa3
Adding Scaleable Analytics Adapter (#3846)
cconnors1515 Jun 13, 2019
1dc47c8
Fix filepath reference (#3905)
betancourtl Jun 13, 2019
81e8718
Prebid 2.19.0 Release
bretg Jun 13, 2019
20d8c8b
Increment pre version
bretg Jun 13, 2019
842cc19
digiTrustIdSystem.js add the synchronous behavior to facade call of D…
goosemanjack Jun 17, 2019
1c1035a
Feature/remove on set targeting (#3919)
ujuettner Jun 18, 2019
4b84beb
FeedAd bidder adapter (#3891)
couchcrew-thomas Jun 18, 2019
6e7eb3b
Fix #3813 move auctionEnd events so it always executes when auction c…
jsnellbaker Jun 18, 2019
bd5f2a0
fix import paths for various adapters (#3921)
jsnellbaker Jun 18, 2019
e53dad0
add --analyze arg for webpack bundle analyzing (#3914)
snapwich Jun 18, 2019
f6239de
Standardize permission bits (#3872)
Jun 18, 2019
6baa819
Prebid 2.20.0 release
jsnellbaker Jun 18, 2019
7e5bda2
increment pre version
jsnellbaker Jun 18, 2019
92fb453
always secure (#3922)
pm-harshad-mane Jun 18, 2019
ce095e0
GumGum: adds tradedesk id param (#3896)
susyt Jun 20, 2019
bbd73ce
Digitrust support in PBS bid adapter and Rubicon bid adapter (#3935)
msm0504 Jun 21, 2019
de8381f
ID5 userId submodule (#3798)
padurgeat Jun 24, 2019
37232c7
EMX Digital: Device info and Video parameter updates (#3929)
EMXDigital Jun 24, 2019
75aca43
update placementId to be number instead of string (#3941)
snapwich Jun 24, 2019
b6aaf64
[33Across adapter] Map ad unit path to element id (#3920)
glebglushtsov Jun 25, 2019
9d2f06c
New Adapter: bidglass (#3861)
dliebner Jun 25, 2019
e64360c
Prebid.js Video (#3901)
ix-prebid-support Jun 25, 2019
8e198bb
Add Outstream Renderer for Yieldlab Adapter (#3910)
mirkorean Jun 25, 2019
64a258a
Standardized COPPA support (#3936)
msm0504 Jun 25, 2019
e55684b
Adding privacy_supported flag (#3943)
jaiminpanchal27 Jun 25, 2019
5e1d889
Prebid 2.21.0 Release
Jun 25, 2019
426676c
Increment pre version
Jun 25, 2019
6e02649
Fix import paths in adapters (#3946)
hashedhyphen Jun 26, 2019
5cdd5a3
ozone adapter 2.1 - bug fix for multi bids + GDPR parameter handling…
afsheenb Jun 26, 2019
7b70c14
added cur to ortb
Jun 27, 2019
99a165a
Revert "added cur to ortb"
Jun 27, 2019
cec25d5
Added 640x320 size (#3954)
hdeodhar Jun 28, 2019
bac5e3b
OpenX should run only banner auction if it is multi format solution (…
deivydas Jun 28, 2019
2bd04a1
Update creative.html (#3955)
robertrmartinez Jun 28, 2019
9c73631
Revert addition of video support to IX adapter as it is still in test…
ix-certification Jul 1, 2019
be76682
Update emoteevBidAdapter.js (#3928)
piotr-yuxuan Jul 1, 2019
113cfe9
Submodule system using hooks (#3924)
snapwich Jul 2, 2019
1087329
Gamoshi: Add adasta new bidder alias (#3949)
sa1omon Jul 2, 2019
d418f61
Added bid adapter for seedtag (#3915)
cabama Jul 2, 2019
f605931
33Across: Update GDPR handling (#3944)
curlyblueeagle Jul 2, 2019
0a96baf
Prebid 2.22.0 Release
jsnellbaker Jul 2, 2019
531b34a
automate-creation of modules.json file
pm-pramod-pisal Jul 3, 2019
f1ed468
test commit for pull request 50
pm-pramod-pisal Jul 3, 2019
2fa1777
Merge pull request #340 from PubMatic-OpenWrap/prebid_upgrade_2_22_0_…
pm-shashank-jain Jul 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ commit your changes, and [open a pull request](https://help.github.com/articles/
master branch.

Pull requests must have 80% code coverage before beign considered for merge.
Additional details about the process can be found [here](./pr_review.md).
Additional details about the process can be found [here](./PR_REVIEW.md).

## Issues
[prebid.org](http://prebid.org/) contains documentation that may help answer questions you have about using Prebid.js.
Expand Down
15 changes: 14 additions & 1 deletion gulpHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ const MANIFEST = 'package.json';
const through = require('through2');
const _ = require('lodash');
const gutil = require('gulp-util');
const submodules = require('./modules/.submodules.json');

const MODULE_PATH = './modules';
const BUILD_PATH = './build/dist';
const DEV_PATH = './build/dev';
const ANALYTICS_PATH = '../analytics';


// get only subdirectories that contain package.json with 'main' property
function isModuleDirectory(filePath) {
try {
Expand Down Expand Up @@ -39,7 +41,9 @@ module.exports = {
.replace(/\/>/g, '\\/>');
},
getArgModules() {
var modules = (argv.modules || '').split(',').filter(module => !!module);
var modules = (argv.modules || '')
.split(',')
.filter(module => !!module);

try {
if (modules.length === 1 && path.extname(modules[0]).toLowerCase() === '.json') {
Expand All @@ -56,6 +60,15 @@ module.exports = {
});
}

Object.keys(submodules).forEach(parentModule => {
if (
!modules.includes(parentModule) &&
modules.some(module => submodules[parentModule].includes(module))
) {
modules.unshift(parentModule);
}
});

return modules;
},
getModules: _.memoize(function(externalModules) {
Expand Down
222 changes: 222 additions & 0 deletions integrationExamples/gpt/digitrust_Full.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
<html>
<head>
<title>Full DigiTrust Prebid Sample</title>
<script>
(function(window, document) {
if (!window.__cmp) {
window.__cmp = (function() {
var listen = window.attachEvent || window.addEventListener;
listen('message', function(event) {
window.__cmp.receiveMessage(event);
}, false);

function addLocatorFrame() {
if (!window.frames['__cmpLocator']) {
if (document.body) {
var frame = document.createElement('iframe');
frame.style.display = 'none';
frame.name = '__cmpLocator';
document.body.appendChild(frame);
} else {
setTimeout(addLocatorFrame, 5);
}
}
}
addLocatorFrame();

var commandQueue = [];
var cmp = function(command, parameter, callback) {
if (command === 'ping') {
if (callback) {
callback({
gdprAppliesGlobally: !!(window.__cmp && window.__cmp.config && window.__cmp.config.storeConsentGlobally),
cmpLoaded: false
});
}
} else {
commandQueue.push({
command: command,
parameter: parameter,
callback: callback
});
}
};
cmp.commandQueue = commandQueue;
cmp.receiveMessage = function(event) {
var data = event && event.data && event.data.__cmpCall;
if (data) {
commandQueue.push({
callId: data.callId,
command: data.command,
parameter: data.parameter,
event: event
});
}
};
cmp.config = {
//
// Modify config values here
//
// globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
// customPurposeListLocation: './purposes.json',
// globalConsentLocation: './portal.html',
// storeConsentGlobally: false,
// storePublisherData: false,
logging: 'debug'//,
// localization: {},
// forceLocale: 'en-us'
};
return cmp;
}());
var t = document.createElement('script');
t.async = false;
t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js';
var tag = document.getElementsByTagName('head')[0];
tag.appendChild(t);
}
})(window, document);
// window.__cmp('showConsentTool');
</script>

<script>
var FAILSAFE_TIMEOUT = 2000;

var adUnits = [
{
code: 'test-div',
sizes: [[300,250],[300,600],[728,90]],
bids: [
{
bidder: 'rubicon',
params: {
accountId: '1001',
siteId: '113932',
zoneId: '535510'
}
}
]
}
];

var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
</script>
<script src="../../build/dev/prebid.js" async></script>

<script>
var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function() {
googletag.pubads().disableInitialLoad();
});

pbjs.que.push(function() {
pbjs.setConfig({
debug: true,
consentManagement: {
cmpApi: 'iab',
timeout: 1000,
allowAuctionWithoutConsent: true
},
usersync: {
userIds: [{
name: "digitrust",
params: {
init: {
member: 'example_member_id',
site: 'example_site_id'
},
callback: function (digiTrustResult) {
// This callback can be used by publisher page to react to error conditions
// Or pass the DigiTrust ID on.
// If the Prebid userId system already has a managed copy of the DigiTrust ID
// this callback will not be invoked.
var elem = document.getElementById('idDiv');
var msg;
if (digiTrustResult.success) {
console.log('Success in Digitrust init');
if (digiTrustResult.identity && digiTrustResult.identity.id != null) {
msg = 'DigiTrust Id (encrypted): ' + digiTrustResult.identity.id;
elem.innerHTML = msg;
console.log(msg);
}
else {
console.error('Digitrust gave success, but no identity returned');
}
}
else {
console.error('Digitrust init failed');
} }
},
storage: {
type: "html5",
name: "pbjsdigitrust",
expires: 60
}
}]
}
});
pbjs.addAdUnits(adUnits);
pbjs.requestBids({
bidsBackHandler: sendAdserverRequest
});
});

function sendAdserverRequest() {
if (pbjs.adserverRequestSent) return;
pbjs.adserverRequestSent = true;
googletag.cmd.push(function() {
pbjs.que.push(function() {
pbjs.setTargetingForGPTAsync();
googletag.pubads().refresh();
});
});
}

setTimeout(function() {
sendAdserverRequest();
}, FAILSAFE_TIMEOUT);
</script>

<script>
(function () {
var gads = document.createElement('script');
gads.async = true;
gads.type = 'text/javascript';
var useSSL = 'https:' == document.location.protocol;
gads.src = (useSSL ? 'https:' : 'http:') +
'//www.googletagservices.com/tag/js/gpt.js';
var node = document.getElementsByTagName('script')[0];
node.parentNode.insertBefore(gads, node);
})();
</script>

<script>
googletag.cmd.push(function() {
googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
googletag.pubads().enableSingleRequest();
googletag.enableServices();
});
</script>
</head>

<body>
<h2>DigiTrust Prebid Full Sample</h2>


<p>
This sample shows the simplest integration path for using DigiTrust ID with Prebid.
You can use DigiTrust ID without integrating the entire DigiTrust suite.
</p>

<div id="idDiv"></div>

<div id='test-div'>
<script>
googletag.cmd.push(function () { googletag.display('test-div'); });
</script>
</div>
<script src="https://cdn.digitru.st/prod/1/digitrust.min.js"></script>

</body>
</html >
Loading