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

Eng 811 #4

Merged
merged 30 commits into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
07821c7
Increment Pre Version
jaiminpanchal27 Mar 20, 2018
4226643
add optional param to bridgewellBidAdapter (#2289)
wuleo Mar 21, 2018
57e2480
NEW adapter AdtelligentBidAdapter (#2137)
Millerrok Mar 22, 2018
8719aef
Smart Ad Server: Fix bug when multi bids (#2170)
Spacedragoon Mar 23, 2018
85cdf7b
Serverbid Bid Adapter: Added archon alias (#2293)
jgrimes Mar 26, 2018
4012c7e
if cache markup is not enabled, set it to the default value 0 (#2302)
moonshells Mar 26, 2018
63159da
Enhance location detection within utils (#2167)
Mar 26, 2018
bae04f4
Update stalebot labels (#2319)
matthewlane Mar 26, 2018
469d586
Changing default currency file to https (#2306)
bretg Mar 26, 2018
feafdcf
Support aliases in prebidServer (#2257)
matthewlane Mar 26, 2018
bc94b71
[FEAT] adunit sizes support (#2320)
wuleo Mar 27, 2018
1b9d022
EngageBDR New Bid Adapter (#2309)
jlzhangdev Mar 28, 2018
a34dbe2
Add video targeting to Beachfront adapter (#2321)
jsalis Mar 29, 2018
7407a44
Platform.io video support (#2318)
varashellov Mar 30, 2018
e6d1fa8
Fixes #2258 - cpm bucketing error (#2305)
mkendall07 Mar 30, 2018
0397649
Add CLICKFORCE Bid Adapter (updated to new spec) (#2053)
MIGOdanis Apr 2, 2018
4bdc91c
Adding onTimeout function in Adapter Spec (#2279)
vedantseta Apr 2, 2018
4930622
Log error returned by PBS (#2335)
jaiminpanchal27 Apr 2, 2018
a6b42d4
Fixes #2276 - video.playerSize and Size Mapping not working together …
jsnellbaker Apr 3, 2018
749e3c4
fix issue #2315 sizeMapping not working with s2s requests (#2332)
jsnellbaker Apr 3, 2018
61c0bee
InSkin Bid Adapter: add user syncing (#2287)
jgrimes Apr 3, 2018
f463545
Fixes issue #2327 - getBidLandScapeTargeting not using adUnitCode arg…
jsnellbaker Apr 3, 2018
d8c2a48
initial commit to fix issue #2291 (#2308)
jsnellbaker Apr 3, 2018
b633478
Add: vuble adapter handles dealId (#2322)
Roffray Apr 3, 2018
f2d15b6
change utils.js unit tests to fix browserstack errors (#2337)
jsnellbaker Apr 3, 2018
3d21e42
change find method to polyfill version (#2338)
jsnellbaker Apr 3, 2018
e57969b
Prebid 1.7.0 Release
jsnellbaker Apr 3, 2018
a37cab5
Merge tag '1.7.0' into ENG-811
aecook Apr 13, 2018
e4ec95b
ENG-811
aecook Apr 13, 2018
99595f5
Merge branch 'master' into ENG-811
aecook Apr 13, 2018
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
3 changes: 2 additions & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ exemptLabels:
- pinned
- security
- bug
- feature
# Label to use when marking an issue as stale
staleLabel: wontfix
staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
Expand Down
194 changes: 97 additions & 97 deletions integrationExamples/gpt/hello_world.html
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
<!--
This page calls a single bidder for a single ad slot. It can be considered a "hello world" example for using
Prebid with the Google Publisher Tag.
It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
bids array inside the adUnits, and it will use your adapter to load an ad.
NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
set an alias in your /etc/hosts file so that you can load this page from a different domain.
-->

<html>
<head>
<script>
var PREBID_TIMEOUT = 700;

var adUnits = [{
code: 'div-gpt-ad-1460505748561-0',
sizes: [[300, 250], [300,600]],

// Replace this object to test a new Adapter!
bids: [{
bidder: 'appnexusAst',
params: {
placementId: '10433394'
}
}]

}];

var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];

</script>

<script type="text/javascript" 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.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();
}, PREBID_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('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());

googletag.pubads().enableSingleRequest();
googletag.enableServices();
});
</script>
</head>

<body>
<h2>Prebid.js Test</h2>
<h5>Div-1</h5>
<div id='div-gpt-ad-1460505748561-0'>
<script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
</script>
</div>
</body>
<!--
This page calls a single bidder for a single ad slot. It can be considered a "hello world" example for using
Prebid with the Google Publisher Tag.
It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
bids array inside the adUnits, and it will use your adapter to load an ad.
NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
set an alias in your /etc/hosts file so that you can load this page from a different domain.
-->
<html>
<head>
<script>
var PREBID_TIMEOUT = 700;
var adUnits = [{
code: 'div-gpt-ad-1460505748561-0',
sizes: [[300, 250], [300,600]],
// Replace this object to test a new Adapter!
bids: [{
bidder: 'appnexusAst',
params: {
placementId: '10433394'
}
}]
}];
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
</script>
<script type="text/javascript" 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.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();
}, PREBID_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('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
googletag.pubads().enableSingleRequest();
googletag.enableServices();
});
</script>
</head>
<body>
<h2>Prebid.js Test</h2>
<h5>Div-1</h5>
<div id='div-gpt-ad-1460505748561-0'>
<script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
</script>
</div>
</body>
</html>
Loading