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

Master updated upstream #2

Merged
merged 468 commits into from
May 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
468 commits
Select commit Hold shift + click to select a range
85e9451
adkernel adapter additional bid parameters (#2105)
ckbo3hrk Feb 6, 2018
3ca1693
must explicitly list pre1api for it to be included in build (#2097)
snapwich Feb 6, 2018
413abfb
Unit test fixes (#2111)
jaiminpanchal27 Feb 6, 2018
15ad83a
Prebid.js 1.3.0 Release
jaiminpanchal27 Feb 6, 2018
c053d04
Increment pre version
jaiminpanchal27 Feb 6, 2018
77fd5d2
Omit app and device if not present rather than send false (#2116)
snapwich Feb 7, 2018
1611159
Prebid 1.3.1 Release
jaiminpanchal27 Feb 7, 2018
63f9411
Increment pre version
jaiminpanchal27 Feb 7, 2018
f73db9e
fix bug where hooked functions w/ no hooks weren't ran immediately (#…
snapwich Feb 8, 2018
8bd9595
Added support for NURL and ADM as backup (#2112)
optimatic58 Feb 8, 2018
7e1abbe
Fix sovrn dealid (#2119)
Feb 8, 2018
ace5903
Add adapter for IAS (#2056)
katzhang-ias Feb 8, 2018
cfe1f72
Replace event string with constant (#2128)
matthewlane Feb 9, 2018
c31cc52
Update maintainer email (#2132)
MelodyLi2017 Feb 9, 2018
a2741f0
Add adapter for GAMMA SSP (#2092)
gammassp Feb 12, 2018
ef4354b
Remove unneeded lint exceptions (#2129)
matthewlane Feb 12, 2018
b16071c
Option to use a configurable vendor preset for s2sConfig (#2073)
jsnellbaker Feb 12, 2018
0923c91
remote.html is being deprecated in AMP. Pointer to the Prebid Server …
hhhjort Feb 12, 2018
1899a2b
Remove deprecated method reference (#2130)
matthewlane Feb 12, 2018
dab30a3
fix bug with privateSizes (#2141)
Feb 13, 2018
64bc038
added advertiserId and networkId for rubiconBidAdapter (#2086)
snapwich Feb 13, 2018
9cb9f2a
Update test stack POC (#2014)
jaiminpanchal27 Feb 13, 2018
2973f76
size mapping throws warning if mediaQuery missing (#2114)
snapwich Feb 14, 2018
f4fd825
Add package-lock.json for node v9 builds (#2144)
snapwich Feb 14, 2018
45154a0
AOL adapter: Fixed broken user matching in iframes (#2125)
vzhukovsky Feb 15, 2018
3b7c0ef
Fix bug in UndertoneBidAdapter (#2027)
omerko Feb 15, 2018
e44b108
Update to sovrn custom params as well as site object construction (#…
aprakash-sovrn Feb 15, 2018
2acd3c5
Update AdGeneration native impression trackers (#2151)
banakemi Feb 15, 2018
c38e9a2
Update PR_REVIEW.md
harpere Feb 15, 2018
513b89c
consolidated referrer logic and added pageUrl support from config in …
snapwich Feb 15, 2018
178955e
Fix stub syntax to work with test stack update (#2153)
matthewlane Feb 15, 2018
1b2475e
Add debug info to DOM for prebid creatives (#2158)
Feb 16, 2018
2d1d0e0
Adding Orbitsoft module for Prebid 1.0 (#2108)
Indra-sensei Feb 16, 2018
c6f448b
Add Publisher Common ID module (#2150)
pycnvr Feb 20, 2018
de9c345
added currency.defaultRates to use when currency file fails to load (…
snapwich Feb 20, 2018
5c025a1
Fix bidfloor param check in rxrtb adapter (#2157)
prebidRxRTB Feb 20, 2018
a455757
Add support for OpenRTB protocol and endpoint (#2102)
matthewlane Feb 20, 2018
4bfc941
Prebid 1.4.0 Release
jsnellbaker Feb 20, 2018
d131109
Update appnexusBidAdapter so clients can distinguish between managed …
jmfbird Feb 20, 2018
1d76429
Increment pre version
jsnellbaker Feb 20, 2018
853a762
Quantum Advertising Adapter (#2051)
sami-elasticad Feb 22, 2018
448d4db
only do video caching if we don't already have a videoCacheKey (#2143)
snapwich Feb 22, 2018
32dccd4
Update NasmediaAdmixer adapter (#2164)
NasmediaWebtech Feb 22, 2018
2775840
[Edit BidAdapter] rxrtb adapter for Perbid.js 1.0 (#2182)
prebidRxRTB Feb 22, 2018
31b0e92
only count bid timeouts if bidder didn't call done. fixes #2146 (#2154)
snapwich Feb 23, 2018
737ca04
Change bidderCode for DAN Marketplace Bid Adapter (#2183)
danmarketplace Feb 23, 2018
0ddebdf
Update Adyoulike Adapter to prebid 1.0 (#2077)
Feb 23, 2018
37ead27
Update Innity Adapter to Prebid.js v1.0 (#2180)
engtat Feb 23, 2018
324d530
[NEW Adapter] RTBHouseBidAdapter (#2184)
piwanczak Feb 23, 2018
fd7b24a
Add multiple bids request (#2136)
Millerrok Feb 23, 2018
9d55719
Update Vertoz adapter for Prebid 1.0 (#2104)
mohit546 Feb 23, 2018
c0ff4af
AdGeneration bugfix (#2191)
banakemi Feb 28, 2018
f169a85
RockYou Adapter: Update for multiple ad unit support (#2198)
cameronhotchkies Feb 28, 2018
1a3eeee
when position is not available, use "unknown" as the default position…
moonshells Mar 1, 2018
f40508c
ADSS-169 (#2187)
bruscantini Mar 2, 2018
cf13cc5
AT-5462 (#2188)
bruscantini Mar 2, 2018
dfc3c8f
Yieldbot Prebid.js 1.0 adapter (#2135)
elljoh Mar 2, 2018
bc9c29b
Remove bracket and object spacing lint exceptions (#2168)
matthewlane Mar 2, 2018
240fa95
VAST support in adform adapter (#2173)
braizhas Mar 2, 2018
c1d368b
Fix lint error (#2208)
matthewlane Mar 2, 2018
f7ee794
fix mediaType being overwritten by undefined in rubicon bid adapter (…
snapwich Mar 2, 2018
c92a590
Auctionmanager spec refactor pr (#2155)
kitwestneat Mar 2, 2018
95fe0a5
Update position default value in rubicon (#2214)
moonshells Mar 2, 2018
c54a179
Audience Network: allow native bids for non-IAB sizes (#2203)
lovell Mar 6, 2018
b82f852
Smartyads Adapter 1.x (#2080)
isss1650 Mar 6, 2018
ae341f9
Add banner support to Beachfront adapter (#2117)
jsalis Mar 6, 2018
355a6bf
Add FairTrade Bid Adapter (#2147)
VaticSSP Mar 6, 2018
fa55342
Adding PR_REVIEW guideline (#2159)
bretg Mar 6, 2018
1454f2b
33Across Bid Adapter: updated user sync endpoint (#2193)
curlyblueeagle Mar 6, 2018
b315a52
Feature/stale bot (#2192)
Mar 6, 2018
94c4023
Gamma Support UserSync Endpoint (#2216)
gammassp Mar 6, 2018
2204cf8
InSkin Bid Adapter: remove referrer field from request body (#2217)
jgrimes Mar 6, 2018
5232bc2
Update Vidazoo domain (#2223)
thewizarodofoz Mar 6, 2018
7904c5b
Add vuble adapter (#2201)
Roffray Mar 6, 2018
768cb62
Fix uncahced video bids from multi-response array triggering callback…
matthewlane Mar 6, 2018
04cca6e
Fix cross-platform test failures (#2228)
matthewlane Mar 6, 2018
f7b7521
Prebid 1.5.0 Release
matthewlane Mar 7, 2018
02ebe3a
Increment pre version
matthewlane Mar 7, 2018
b0260d5
Add Invibes Adapter (#2202)
rcheptanariu Mar 7, 2018
3cf7395
Fix #2229 - Edge cookie string form (#2236)
elljoh Mar 7, 2018
8f20009
PBS adapter not sending app or device (#2206)
Mar 8, 2018
f7813d5
Update Lifestreet adapter to 1.0 (#2197)
Lifestreet Mar 8, 2018
5486b63
Update Platform.io Adapter (#2230)
varashellov Mar 12, 2018
205b926
create RELEASE_SCHEDULE.md (#2255)
bretg Mar 12, 2018
58a5af0
use b64EncodeUnicode to encode strings with unicode chars in them (#2…
lestopher Mar 13, 2018
dfcae6b
Fix: add mediatype in bid response (#2260)
Roffray Mar 13, 2018
3b26c3a
Add billing url (burl) support (#2246)
matthewlane Mar 13, 2018
6ddbfd0
Added ad id to a4g bid (#2250)
adilets Mar 13, 2018
cd050b6
vastUrl is set based on nurl for video. (#2249)
muncha Mar 13, 2018
4fee47d
Updated adUnitCode (#2262)
adilets Mar 14, 2018
5ed5dcd
update params for test bid (#2267)
Millerrok Mar 15, 2018
2f6076e
Add vastUrl for Gamma Adapter Video (#2261)
gammassp Mar 15, 2018
717b439
Add e-planning analytics adapter (#2211)
matimar Mar 15, 2018
7d10bc7
Audience Network: Add 'pbv' and 'cb' query params (#2252)
lovell Mar 17, 2018
1c862a8
Updated Bid params (#2275)
adilets Mar 19, 2018
3e7df0d
Yieldbot impression image creation fix (#2277)
elljoh Mar 19, 2018
292b554
message formatting (#2285)
vedantseta Mar 19, 2018
6aa8c18
Update to Rubicon Adapter for mediaTypes support (#2272)
idettman Mar 19, 2018
b9906c3
Update for Media.net adapter (#2232)
vedantseta Mar 19, 2018
6382fe6
Update Yieldlab adapter and add official maintainer (#2231)
mirkorean Mar 19, 2018
c314596
add hb_cache_id, hb_uuid should be deprecated and replaced by hb_cach…
moonshells Mar 19, 2018
28e58ff
Add Content Ignite adapter (#2268)
jdrucey Mar 19, 2018
a577521
firing new adRenderFailed event when renderAd() fails (#2210)
vedantseta Mar 20, 2018
6ab7b54
Add Oneplanetonly Bid Adapter (#2269)
marliotto Mar 20, 2018
4fbf447
PBS videoCacheKey and vastUrl (#2101)
moonshells Mar 20, 2018
8aec362
Unit test fixes (#2301)
jaiminpanchal27 Mar 20, 2018
b8bdfec
Prebid 1.6.0 Release
jaiminpanchal27 Mar 20, 2018
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
216f01c
Increment pre version
jsnellbaker Apr 3, 2018
bd5aaef
New adapter madvertise (#2163)
NLopezMad Apr 4, 2018
dea95d2
Use adUnitCode instead of obsolete placementCode (#2290)
ckbo3hrk Apr 4, 2018
b67f5b4
Integrate browserstack with travis (#2349)
jaiminpanchal27 Apr 4, 2018
229ffa6
run unit-tests for pr and non-pr (#2358)
jaiminpanchal27 Apr 5, 2018
3dfe8c4
test for travis (#2360)
mkendall07 Apr 5, 2018
3901a1e
RealVu Analytics Adapter (#2313)
tchibirev Apr 5, 2018
3e52deb
Update AdGeneration adapter (#2343)
banakemi Apr 5, 2018
e28da06
ADSS-275 Read and send the pv param on bid requests (#2340)
mxcoder Apr 5, 2018
01decf4
fix local browserstack run (#2366)
jaiminpanchal27 Apr 6, 2018
275e67d
Smart: User sync (#2310)
ytyukhnin Apr 9, 2018
c738ab5
Added bid pool and fixed getAllWinningBids function (#2328)
jaiminpanchal27 Apr 10, 2018
d8a81fc
Rubicon Adapter - Multiple media types bug fix (#2347)
idettman Apr 10, 2018
684ad75
uppercase all keys for AST macros (#2373)
mkendall07 Apr 10, 2018
0bf6c7d
Rubicon analytics (#2278)
snapwich Apr 10, 2018
f7202e4
remove unneeded window.screen test from rubicon analytics
snapwich Apr 10, 2018
bbcdba5
pin ajv as its new uri-js dependency causes issues in safari
snapwich Apr 10, 2018
9dd9280
Create rtbdemandAdkBidAdapter.js (#2323)
rtbdemand Apr 11, 2018
cea9243
Create rtbdemandAdkBidAdapter.md (#2324)
rtbdemand Apr 11, 2018
1f7c177
Added LKQD prebid adapter with associated documentation and tests (#2…
mrcrawfo Apr 12, 2018
188f78d
fix undefined value (#2387)
jaiminpanchal27 Apr 12, 2018
76e079a
Video Support Update (#2342)
jimee02 Apr 12, 2018
95bd54d
Update pubwiseAnalyticsAdapter.js (#2379)
GLStephen Apr 12, 2018
9303d57
33Across: Complete user sync implementation (#2334)
curlyblueeagle Apr 12, 2018
c805507
Smart: New parameters for in-app ads (#2325)
ytyukhnin Apr 13, 2018
f5900ff
Add SARA-HB Bid Adapter (#2172)
SARA-HB Apr 13, 2018
055d3fb
ADSS-281 implement getUserSyncs and putting checks for empty ad serve…
bruscantini Apr 13, 2018
7455976
Sonobi Video Support (#2297)
JonGoSonobi Apr 13, 2018
335f59a
Dynamic priceType at adform adapter (#2384)
Pupis Apr 13, 2018
2ed32db
fiix size in prebidserver (#2364)
snapwich Apr 13, 2018
6d2ed31
fix sonobi adapter to use polyfilled Object find
snapwich Apr 13, 2018
49ee97d
fixes #2353 - not appending hb_uuid and hb_cache_id (#2363)
mkendall07 Apr 13, 2018
395ceb1
Add: Vuble Analytics Adapter (#2331)
mifefr Apr 13, 2018
033d733
Widespace adapter (#2283)
mizmaar3 Apr 13, 2018
77b57f1
Create rtbdemandAdkBidAdapter_spec.js (#2352)
rtbdemand Apr 16, 2018
a32070e
add support for video bids to use an impression tracking URL (#2365)
jsnellbaker Apr 16, 2018
825ab83
Smart: Add prebid version in the data payload (#2394)
Spacedragoon Apr 16, 2018
fa6e221
Added VIS.X Bidder Adapter (#2359)
Apr 16, 2018
1557315
Add Unruly Bid Adapter (#2326)
Apr 16, 2018
4d1249c
Unit test failures (#2405)
jaiminpanchal27 Apr 16, 2018
a589ac2
Removed the ability for to override any standard query parameters (#2…
jimee02 Apr 16, 2018
a76420c
deprecate loadScript and add loadExternalScript (#2391)
mkendall07 Apr 17, 2018
1b29d1f
Add analytics adapter by Sigmoid (#2316)
sigmoidanalytics Apr 17, 2018
bddef91
Add outstream renderer to Beachfront adapter (#2403)
jsalis Apr 17, 2018
a2035a2
EbdrAdapter add usersync (#2407)
jlzhangdev Apr 17, 2018
9954c6f
convert AN bid params to underscore formatting for pbs (#2385)
jsnellbaker Apr 17, 2018
c21f82d
send appnexus usePaymentRule info to prebid-server ortb request (#2351)
jsnellbaker Apr 17, 2018
eed0655
send travis-ci notifications to slack (#2404)
mkendall07 Apr 17, 2018
a67da48
Make eslint aware of the custom import paths (#2292)
terebentina Apr 17, 2018
8633be2
Prebid 1.8.0 Release
jaiminpanchal27 Apr 17, 2018
13585d9
Increment Pre Version
jaiminpanchal27 Apr 17, 2018
4a8c8c2
Add user sync callback for OpenX adaptor (#2409)
haohany Apr 18, 2018
c1e6e1d
add server response time to bids in prebid server (#2398)
snapwich Apr 18, 2018
2e27a33
Analytic Adaptor by YuktaMedia (#2392)
shrikantpatwari Apr 18, 2018
1a7dac7
Add type conversion for openx parameters (#2408)
haohany Apr 20, 2018
a48df1e
add gdpr support to rubicon video in rubiconBidAdapter (#2426)
moonshells Apr 20, 2018
204daae
Media.net Adapter Improvements (#2344)
vedantseta Apr 20, 2018
372899b
Add New Adapter dgadsBidAdapter (#2429)
r-sato Apr 24, 2018
d94404c
Size Bugfix (#2414)
sami-elasticad Apr 24, 2018
34f34d8
Rubicon adapter GDPR support (#2406)
idettman Apr 24, 2018
28f6795
typo (#2441)
sekindo Apr 24, 2018
bb9bc18
Initial Consumable Bidder Adapter commit (#2381)
naffis Apr 26, 2018
96878ef
Audience Network: Fix bid request validation for fullwidth (#2417)
dlackty Apr 26, 2018
baea840
updated rubicon adapter sync endpoint (#2454)
harpere Apr 26, 2018
5c14e9c
Added new types of traffic Colossus SSP adapter (#2281)
Apr 26, 2018
fae4048
Update ReadPeak adapter (#2369)
kurrestahlberg Apr 27, 2018
e82c58a
Rubicon Adapter GDPR Update for gdprApplies flag (#2456)
idettman Apr 27, 2018
ebf5e61
Update adform adapter's dynamic price type (#2460)
Pupis Apr 27, 2018
e558950
Parse bid sizes on the `mediaTypes` object (#2435)
jsalis Apr 27, 2018
1ed012a
add getUserSyncs function in clickforceBidAdapter (#2383)
MIGOdanis Apr 27, 2018
b1f043d
added missing dfpAdServerVideo.js dfp vast tag generation uri compone…
Slind14 Apr 30, 2018
2d0f6ca
Do client-side user syncs when using the OpenRTB endpoint (#2410)
haohany Apr 30, 2018
9ac6ddd
Sonobi Adapter - Added debugging and analytics query params. (#2463)
JonGoSonobi Apr 30, 2018
12cf662
Add New Adapter admaticBidAdapter (#2390)
hakanarik Apr 30, 2018
b1f8741
Getintent adapter: support multisize bids (#2453)
kprokopchik Apr 30, 2018
59e0042
[FEAT] support mediaTypes.banner.sizes (#2444)
wuleo Apr 30, 2018
3767129
fix sonobi tests for device size so it works in browserstack
snapwich Apr 30, 2018
603f5f0
fix sonobi to use polyfilled find to correct browserstack tests
snapwich Apr 30, 2018
77d0e06
fixing getintent to use utils.isInteger to fix browserstack tests
snapwich Apr 30, 2018
d28c4a8
[1.x] Populate crid with values from demand if present (#2424)
aprakash-sovrn May 1, 2018
a0fee37
PulsePoint Adapter GDPR support (#2471)
anand-venkatraman May 1, 2018
027abc7
getting publisher url fix (#2472)
sekindo May 1, 2018
4a149cf
OpenX Adapter: Support out of order bids. (#2452)
jimee02 May 1, 2018
247ea80
GDPR consentManagement module (#2213)
jsnellbaker May 1, 2018
4dcb046
added whitelist for loading external JS + tests (#2430)
mkendall07 May 1, 2018
64f342a
Add note about headerbid expert (#2367)
matthewlane May 1, 2018
a4913ea
Prebid 1.9.0 Release
jsnellbaker May 1, 2018
ab0386d
Increment Prebid version
jsnellbaker May 1, 2018
9416e75
GDPR support for Sovrn Adapter (#2475)
May 1, 2018
0654474
send rp_secure to frank for video bids (#2476)
moonshells May 1, 2018
bea6ab0
add feature to bridgewellBidAdapter (#2480)
wuleo May 3, 2018
59db2fe
Update Platformio Adapter (#2468)
varashellov May 3, 2018
e247211
Only send OpenX BO beacon once per page load (#2484)
haohany May 3, 2018
04d6601
Update the consent param in userSync as per IAB Spec (#2494)
PubMatic-OpenWrap May 4, 2018
723669a
Fix typos in comment, cosolidated -> consolidated (#2493)
pskupinski May 4, 2018
4e80a29
Add LockerDome bid adapter (#2477)
pskupinski May 4, 2018
3116d7f
One Video Adapter (#2445)
ankur-modi May 4, 2018
cf1dc79
Update babel plugins (#2447)
jaiminpanchal27 May 7, 2018
53fbc7d
Add GDPR support to Beachfront adapter (#2474)
jsalis May 7, 2018
a348d8f
New Adapter onetagBidAdapter (#2461)
onetag-dev May 7, 2018
9529185
New optional parameter - subId (#2495)
rade-popovic May 7, 2018
9bbd122
add support to handle native js pixels for AN adapter (#2487)
jsnellbaker May 7, 2018
121df8f
Merge branch 'master' of https://github.com/prebid/Prebid.js
LucaConfa May 8, 2018
2dd6e1a
A4G Adapter GDPR support (#2501)
adilets May 8, 2018
b1b969f
support extra params (#2502)
thewizarodofoz May 8, 2018
e638efc
IndexExchange Display Bid Adapter + GDPR Support (#2496)
ix-prebid-support May 8, 2018
ea91035
Sharethrough: GDPR compliance + getUserSyncs (#2503)
chriscpan May 8, 2018
a81ef72
bugfix (#2510)
jaiminpanchal27 May 8, 2018
208960c
Prebid 1.10.0 Release
jaiminpanchal27 May 8, 2018
eadfd86
Increment pre version
jaiminpanchal27 May 8, 2018
3d96d9e
Sonobi Adapter - Added referrer param. Fixed timeout error in userSyn…
JonGoSonobi May 10, 2018
877a58c
add support for latLong in rubicon adapter (#2508)
snapwich May 11, 2018
fdadd14
OpenX Adapter: GDPR Support (#2504)
jimee02 May 11, 2018
2249778
Add new Adapter brainyBidAdapter (#2458)
May 11, 2018
e8729b8
Merge branch 'master' of https://github.com/prebid/Prebid.js into mas…
LucaConfa May 14, 2018
843d90e
update with upstream master
LucaConfa May 14, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 17 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
{
"presets": ["es2015"],
"plugins": ["transform-object-assign", "transform-es3-property-literals", "transform-es3-member-expression-literals"]
"presets": [
["env", {
"targets": {
"browsers": [
"chrome >= 61",
"safari >=8",
"edge >= 14",
"ff >= 57",
"ie >= 10",
"ios >= 8"
]
}
}]
],
"plugins": [
"transform-object-assign"
]
}
10 changes: 7 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ module.exports = {
"browser": true,
"commonjs": true
},
"settings": {
"import/resolver": {
"node": {
"moduleDirectory": ["node_modules", "./"]
}
}
},
"extends": "standard",
"globals": {
"$$PREBID_GLOBAL$$": false
Expand All @@ -21,12 +28,9 @@ module.exports = {
// See Issue #1111.
"camelcase": "off",
"eqeqeq": "off",
"no-control-regex": "off",
"no-return-assign": "off",
"no-throw-literal": "off",
"no-undef": "off",
"no-use-before-define": "off",
"no-useless-escape": "off",
"standard/no-callback-literal": "off",
}
};
4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
- [ ] Refactoring (no functional changes, no api changes)
- [ ] Build related changes
- [ ] CI related changes
- [ ] Does this change affect user-facing APIs or examples documented on http://prebid.org?
- [ ] Other

## Description of change
Expand All @@ -32,6 +33,9 @@ Be sure to test the integration with your adserver using the [Hello World](/inte
- contact email of the adapter’s maintainer
- [ ] official adapter submission

For any changes that affect user-facing APIs or example code documented on http://prebid.org, please provide:

- A link to a PR on the docs repo at https://github.com/prebid/prebid.github.io/

## Other information
<!-- References to related PR or issue #s, @mentions of the person or team responsible for reviewing changes, etc. -->
19 changes: 19 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 14
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
- bug
- feature
# Label to use when marking an issue as stale
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
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
35 changes: 23 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
sudo: required
dist: trusty

language: node_js

node_js:
- "7.0"

# See https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-the-Chrome-addon-in-the-headless-mode
- '7.0'
env:
- BROWSERSTACK_USERNAME=info184
addons:
chrome: stable

chrome: stable,
browserstack:
username: info184
access_key:
secure: Ru286R4pMcEIRKwb2AoaaJY6lEKIzeZraxY7CtbOP4ykNk7uqsnyitk4QwxpCCh0n35b71m30okW6ZmZnl0lJXhOMdYoSOYBAnUw2Vn7Y93oMSKIC5dc2/qmtF1t2b1qX65/Ont2iJUj+UY8VQw5Hk2vIT4/5wifYPBnV5ILK4AI7SVk/ma7OzK4rkp3WThlouddctAd7tx4O3YIyJKDi9lkfcMA0pnH4OZSOlDClRLIy50Q1NE+iyqHtWFZK1TwJ+IhQbSsCLbuyQJBRnyJJEftNmtrs5MCZt/9pwFDj7c8+o11F6HCsTBYFkehFRfbKnmhCc1G+bsNXY8OxIWwEHeuVmSGK7TDPYcPPQBc03mcQ1fY/IPNQOdsVJ/n8RsG2u0IU2CF2hhkuNFzeov7dOHljanc45NKOrLdjwzP1aZCAUvLquOTzvmdF23nJhMs8UO+Du4kTK5VfmKyz1MC91E40a0Q15+O4qmS39rNOlwhxPJSfuxxL1jKVPJ7PsFbTkGM8M/XPJ6dyGLufy225HjdLdJTAOa5BZ4st+nXH/AzqHzy6a2I5vTmAz1j4gHLgVU+iNxAkX8znb25s3Rs1ZuFVj+aBSBmNoQA1FA5f/uXWeruTdDig7ksp+XdjsjLm9Md8cWwYaEn04FYj1ztJrylrEMfnc0Kcs6zQ3fll1g=
before_install:
- npm install -g gulp
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &

script:
- gulp run-tests
- npm install -g gulp
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
script: |-
if [[ ${TRAVIS_PULL_REQUEST} == "false" ]]; then
gulp test --browserstack
else
gulp run-tests
fi
notifications:
slack:
on_success: never
on_failure: always
on_pull_requests: false
secure: C4O77VtABLE5DiPDeKGqUcsBdTBMNjQRLc8iBfSp231e95K1rA/JXJJEQN/lVhhiFJyPhxueE0i6cR0zD8uAMC8HRShGGfPjEZ7f6glawPzap2wFwjAyVkknYV+BMKcX0jvn7CiSKBj+zTbHQfn/Uj3nMSbDZQIdbNDiFGh4NuDr3/Yd/efhsw/miExlSPSWqGVCKV3WPpTrU3BRpLNDq4sZMXP9ORZxGK7ER3tsMiD2z05YpvC+mibESJxaY0qsuQu1y1Gu65QLPe5ocw405btJwqYn+b4YFpUd2GbLNhjtLzsc+OKrD0DWuEI0bxePQUYDga5wR6g4cdZaXU3ixDjee7sJbDeVJAuykGlfZ4A1k+fQIgPs3s9XMHaeG9AfDhFiZ/UoNdonzos1iSa/Y1TzHIXp1wnbHKT5HUWWPFNb5PzJxHEtHbm3jwOH4iK8VAq94ec16M2aqUAj7muiqcrTlYa5rs6jRlXo/TRymFnbQRdBT7eLmLNDQD35yR1Y+4mxHqKi+3189yG9RE+uwIlB+9HZFgNbioOApB+jarKC6M0qEgn0bHxkpJBP8JmNCA84U0ZUzyPvuMGsRbisAmKoUsU8C6cq59QDfBTcCTvKXK6r+6f23iRGieoGSbTxYQj46QkykpbWU0WstQDQsZL3L316uZecOVZmWKBRxPs=
3 changes: 0 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a
- _Assert_: check that the expected results have occurred
- e.g., use Chai assertions to check that the expected output is equal to the actual output
- Test the public interface, not the internal implementation
- If using global `pbjs` data structures in your test, take care to not completely overwrite them with your own data as that may affect other tests relying on those structures, e.g.:
- **OK**: `pbjs._bidsRequested.push(bidderRequestObject);`
- **NOT OK**: `pbjs._bidsRequested = [bidderRequestObject];`
- If you need to check `adloader.loadScript` in a test, use a `stub` rather than a `spy`. `spy`s trigger a network call which can result in a `script error` and cause unrelated unit tests to fail. `stub`s will let you gather information about the `adloader.loadScript` call without affecting external resources
- When writing tests you may use ES2015 syntax if desired

Expand Down
15 changes: 2 additions & 13 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -176,18 +176,7 @@

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2013 APPNEXUS INC
Copyright 2017 PREBID.ORG, INC

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -199,4 +188,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
48 changes: 48 additions & 0 deletions PR_REVIEW.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
## Summary
We take PR review seriously. Please read https://medium.com/@mrjoelkemp/giving-better-code-reviews-16109e0fdd36#.xa8lc4i23 to understand how a PR review should be conducted. Be rational and strict in your review, make sure you understand exactly what the submitter's intent is. Anyone in the community can review a PR, but a Prebid Org member is also required. A Prebid Org member should take ownership of a PR and do the initial review.

If the PR is for a standard bid adapter or a standard analytics adapter, just the one review from a core member is sufficient. The reviewer will check against [required conventions](http://prebid.org/dev-docs/bidder-adaptor.html#required-adapter-conventions) and may merge the PR after approving and confirming that the documentation PR against prebid.org is open and linked to the issue.

For modules and core platform updates, the initial reviewer should request an additional team member to review as a sanity check. Merge should only happen when the PR has 2 `LGTM` from the core team and a documentation PR if required.

### General PR review Process
- Checkout the branch (these instructions are available on the github PR page as well).
- Verify PR is a single change type. Example, refactor OR bugfix. If more than 1 type, ask submitter to break out requests.
- Verify code under review has at least 80% unit test coverage. If legacy code has no unit test coverage, ask for unit tests to be included in the PR.
- Verify tests are green in Travis-ci + local build by running `gulp serve` | `gulp test`
- Verify no code quality violations are present from linting (should be reported in terminal)
- Review for obvious errors or bad coding practice / use best judgement here.
- If the change is a new feature / change to core prebid.js - review the change with a Tech Lead on the project and make sure they agree with the nature of change.
- If the change results in needing updates to docs (such as public API change, module interface etc), add a label for "needs docs" and inform the submitter they must submit a docs PR to update the appropriate area of Prebid.org **before the PR can merge**. Help them with finding where the docs are located on prebid.org if needed.
- If all above is good, add a `LGTM` comment and request 1 additional core member to review.
- Once there is 2 `LGTM` on the PR, merge to master
- Ask the submitter to add a PR for documentation if applicable.
- Add a line into the [draft release](https://github.com/prebid/Prebid.js/releases) notes for this submission. If no draft release is available, create one using [this template]( https://gist.github.com/mkendall07/c3af6f4691bed8a46738b3675cb5a479)

### New Adapter or updates to adapter process
- Follow steps above for general review process. In addition, please verify the following:
- Verify that bidder has submitted valid bid params and that bids are being received.
- Verify that bidder is not manipulating the prebid.js auction in any way or doing things that go against the principles of the project. If unsure check with the Tech Lead.
- Verify that the bidder is being as efficient as possible, ideally not loading an external library, however if they do load a library it should be cached.
- Verify that code re-use is being done properly and that changes introduced by a bidder don't impact other bidders.
- If the adapter being submitted is an alias type, check with the bidder contact that is being aliased to make sure it's allowed.
- If the adapter is triggering any user syncs make sure they are using the user sync module in the Prebid.js core.
- Requests to the bidder should support HTTPS
- Responses from the bidder should be compressed (such as gzip, compress, deflate)
- Bid responses may not use JSONP: All requests must be AJAX with JSON responses
- All user-sync (aka pixel) activity must be registered via the provided functions
- Adapters may not use the $$PREBID_GLOBAL$$ variable
- All adapters must support the creation of multiple concurrent instances. This means, for example, that adapters cannot rely on mutable global variables.
- Adapters may not globally override or default the standard ad server targeting values: hb_adid, hb_bidder, hb_pb, hb_deal, or hb_size, hb_source, hb_format.
- After a new adapter is approved, let the submitter know they may open a PR in the [headerbid-expert repository](https://github.com/prebid/headerbid-expert) to have their adapter recognized by the [Headerbid Expert extension](https://chrome.google.com/webstore/detail/headerbid-expert/cgfkddgbnfplidghapbbnngaogeldmop). The PR should be to the [bidder patterns file](https://github.com/prebid/headerbid-expert/blob/master/bidderPatterns.js), adding an entry with their adapter's name and the url the adapter uses to send and receive bid responses.

## Ticket Coordinator

Each week, Prebid Org assigns one person to keep an eye on incoming issues and PRs. That person should:
- Review issues and PRs at least once per weekday for new items.
- For PRs: assign PRs to individuals on the PR review list. Try to be equitable -- not all PRs are created equally. Use the "Assigned" field and add the "Needs Review" label.
- For Issues: try to address questions and troubleshooting requests on your own, assigning them to others as needed.
- Issues that are questions or troubleshooting requests may be closed if the originator doesn't respond within a week to requests for confirmation or details.
- Issues that are bug reports should be left open and assigned to someone in PR rotation to confirm or deny the bug status.
- It's polite to check with others before assigning them large tasks.
- If possible, check in on older items and see if they can be unstuck.
22 changes: 10 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ Working examples can be found in [the developer docs](http://prebid.org/dev-docs

$ git clone https://github.com/prebid/Prebid.js.git
$ cd Prebid.js
$ yarn install

Prebid supports the `yarn` npm client. This is an alternative to using `npm` for package management, though `npm install` will continue to work as before.

For more info, see [the Yarn documentation](https://yarnpkg.com).
$ npm install

*Note:* You need to have `NodeJS` 4.x or greater installed.

Expand Down Expand Up @@ -60,11 +56,8 @@ For example, when running the serve command: `gulp serve --modules=openxBidAdapt
Building with just these adapters will result in a smaller bundle which should allow your pages to load faster.

**Build standalone prebid.js**
Prebid now supports the `yarn` npm client. This is an alternative to using `npm` for package management, though `npm` will continue to work as before.

For more info about yarn see https://yarnpkg.com

- Clone the repo, run `yarn install`
- Clone the repo, run `npm install`
- Then run the build:

$ gulp build --modules=openxBidAdapter,rubiconBidAdapter,sovrnBidAdapter
Expand All @@ -82,11 +75,11 @@ With `modules.json` containing the following
]
```

**Build prebid.js using Yarn for bundling**
**Build prebid.js using npm for bundling**

In case you'd like to explicitly show that your project uses `prebid.js` and want a reproducible build, consider adding it as an `yarn` dependency.
In case you'd like to explicitly show that your project uses `prebid.js` and want a reproducible build, consider adding it as an `npm` dependency.

- Add `prebid.js` as a `yarn` dependency of your project: `yarn add prebid.js`
- Add `prebid.js` as a `npm` dependency of your project: `npm install prebid.js`
- Run the `prebid.js` build under the `node_modules/prebid.js/` folder

$ gulp build --modules=path/to/your/list-of-modules.json
Expand All @@ -113,6 +106,11 @@ To run the unit tests:
```bash
gulp test
```
To run tests for a single file:

```bash
gulp test --file "path/to/spec/file.js"
```

To generate and view the code coverage reports:

Expand Down
22 changes: 22 additions & 0 deletions RELEASE_SCHEDULE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Release Schedule

We push a new release of Prebid.js every other week on Tuesday. During the adoption phase for 1.x, we are releasing updates for 1.x and 0.x at the same time.

While the releases will be available immediately for those using direct Git access,
it will be about a week before the Prebid Org [Download Page](http://prebid.org/download.html) will be updated.

You can determine what is in a given build using the [releases page](https://github.com/prebid/Prebid.js/releases)

Announcements regarding releases will be made to the #headerbidding-dev channel in subredditadops.slack.com.

# FAQs

**1. Is there flexibility in the 2-week schedule?**

If a major bug is found in the current release, a maintenance patch will be done as soon as possible.

It is unlikely that we will put out a maintenance patch at the request of a given bid adapter or module owner.

**2. What Pull Requests make it into a release?**

Every PR that's merged into master will be part of a release. Here are the [PR review guidelines](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md).
Loading