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

Merge marfeel-master on master #58

Merged
merged 1,049 commits into from
May 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1049 commits
Select commit Hold shift + click to select a range
f4db14c
Yieldmo unified id (#4041)
Aug 13, 2019
0511807
Add video support to LoopMe adapter (#4079)
EpanchinE Aug 13, 2019
74a6ea5
Criteo Adapter - Added support of deals (#4085)
leonardlabat Aug 15, 2019
874b99c
2.28.0 release
mkendall07 Aug 15, 2019
c1aa4e4
2.29.0-pre
mkendall07 Aug 15, 2019
d61756d
Add bid adapter for Sublime (#3960)
SublimeJeremy Aug 16, 2019
72ff0e4
Identity Link - Use ats library for retrieving envelope (#4077)
mamatic Aug 19, 2019
511a38b
OPT-1949 Update prebid.js to pass in window.href & add keyword proces…
raguilar-ias Aug 19, 2019
f622bdc
Fix #4059 - ensure native keys are not seen as custom targeting keys …
jsnellbaker Aug 20, 2019
7ee3eb2
New Adapter request : cosmos (#4096)
dev-cosmos Aug 20, 2019
dca695f
Banner e2e (#4092)
Fawke Aug 20, 2019
99e3e52
Add Meazy bid adapter (#4015)
Aug 20, 2019
b8565e7
Prebid 2.29.0 Release
Aug 20, 2019
6467bba
Increment pre version
Aug 20, 2019
c0c1b3e
enable withCredentials on unifiedId ajax call (#4090)
minh-daole-ttd Aug 21, 2019
2096980
Rubicon adapter doc: adding video example (#4091)
bretg Aug 21, 2019
35e4b2b
Collect info about which ad units receive bids (#4094)
bjorn-lw Aug 21, 2019
801f0fb
s2sTesting: random number moved to global (#3851)
bretg Aug 21, 2019
bc3987d
consolidate logic around common chunk inclusions (#4087)
snapwich Aug 21, 2019
e798c0c
Updates to RDN Adapter (#4080)
snapwich Aug 24, 2019
60501c8
Gamoshi: Add 9MediaOnline new adaptor alias (#4108)
Aug 26, 2019
d6ba289
remove comment since we're out of depcrecation phase (#4093)
Fawke Aug 27, 2019
d5ee713
GumGum: add DigiTrust module (#4109)
susyt Aug 27, 2019
11801ba
Add GDPR and UID module support to Undertone adapter (#4102)
omerko Aug 27, 2019
9c128af
Add placement support to beachfront adapter (#4117)
jsalis Aug 27, 2019
18543d6
fix typo on size parameter (#4122)
guiann Aug 28, 2019
761226f
Long form video price bucket bugfix (#4125)
jaiminpanchal27 Aug 28, 2019
2005af4
Prebid 2.30.0 release
Aug 28, 2019
099a723
Increment pre version
Aug 28, 2019
87e84b8
Optimera added optional device param (#4105). (#4106)
mcallari Aug 29, 2019
a7ad5ef
SupplyChain object support in Prebid (#4084)
pm-harshad-mane Aug 30, 2019
3fe149a
Auto detect if we can bust out of iframe (#15) (#4099)
epechuzal Sep 3, 2019
eaffc3d
Rubicon adapter: added sizes (#4147)
hdeodhar Sep 3, 2019
3f556dc
add logic to prefer prebid modules over external modules in build pro…
jsnellbaker Sep 3, 2019
a49d89b
Improve Digital adapter: adding bid floor, referrer, more native fiel…
jbartek25 Sep 3, 2019
80cbd2c
YIELDONE adapter - change urls to adapt https (#4139)
koji-eguchi Sep 3, 2019
e61b246
Added SupplyChain Object support and an onTimeout Callback (#4137)
telariaEng Sep 3, 2019
fe0c9e8
Revert "Added SupplyChain Object support and an onTimeout Callback (#…
Sep 3, 2019
deeb4c0
Nobid Prebid Adapter commit (#4050)
robdubois Sep 4, 2019
e897d47
update outstream prod url (#4104)
sumit116 Sep 4, 2019
7e43220
support pubcid and uids (#4143)
nwlosinski Sep 4, 2019
f125ac7
Fix misspelling and minor cleanup of schain docs (#4150)
Sep 4, 2019
777d031
Prebid 2.31.0 Release
bretg Sep 4, 2019
c716dd9
Increment pre version
bretg Sep 4, 2019
ff0a8a6
Rubicon: tuning logged messages (#4157)
bretg Sep 5, 2019
c47bb80
Rubicon Video COPPA fix (#4155)
umbrella-artem-seryak Sep 5, 2019
67e3a9c
Playground XYZ adapter - iframe usersync bug fix (#4141)
monofonik Sep 5, 2019
0cbe57c
update nvmrc file (#4162)
jsnellbaker Sep 5, 2019
7a0bf6e
update gulp-footer package (#4160)
jsnellbaker Sep 5, 2019
f828b84
Datablocks bid/analytics adapter (#4128)
htang555 Sep 6, 2019
2bdbb12
update logic of ad_types field in appnexusBidAdapter (#4065)
jsnellbaker Sep 6, 2019
02cd6e4
Shorten SomoAudience to just Somo (#4163)
SuprPhatAnon Sep 8, 2019
69107fe
Quantcast: Fix for empty video parameters (#4145)
dpapworth-qc Sep 8, 2019
97fab61
One Video adding Rewarded Video Feature (#4142)
DeepthiNeeladri Sep 8, 2019
25b6471
Module to pass User Ids to DFP (#4140)
pm-harshad-mane Sep 9, 2019
c520176
Buzzoola bid adapter (#4127)
VanCyric Sep 10, 2019
8b92b1f
E2e tests for Native and Outstream video Ad formats. (#4116)
Fawke Sep 10, 2019
276e1f7
Update LockerDome adUnitId bid param (#4176)
margsliu Sep 10, 2019
2d0b75c
fix several issues in appnexus video bids (#4154)
jsnellbaker Sep 10, 2019
7990f4b
S2s testing disable client side (#4123)
tjeastmond Sep 10, 2019
730c561
New option to Include deal KVPs when enableSendAllBids === false (#4136)
robertrmartinez Sep 10, 2019
958859a
Prebid 2.32.0 Release
jsnellbaker Sep 10, 2019
1b5f68f
increment pre version
jsnellbaker Sep 10, 2019
fa21ea0
Rubicon doc: changing video test zone (#4187)
bretg Sep 11, 2019
f3bcfb6
added schain support to sonobi adapter (#4173)
JonGoSonobi Sep 12, 2019
3915517
if schain config is not defined then error should not be thrown (#4165)
pm-harshad-mane Sep 13, 2019
e4cc081
Rubicon: updating test params (#4190)
bretg Sep 13, 2019
59532e4
myTargetBidAdapter: support currency config (#4188)
vfedoseev Sep 16, 2019
29066dd
Update README.md (#4193)
djrosenbaum Sep 16, 2019
f60799f
cedato bid adapter instream video support (#4153)
alexkh13 Sep 16, 2019
c456472
Added adxpremium prebid analytics adapter (#4181)
adxpremium Sep 16, 2019
b50a95f
feat(OAFLO-186): added support for schain (#4194)
jimee02 Sep 16, 2019
017a8f0
Sonobi - send entire userid payload (#4196)
JonGoSonobi Sep 16, 2019
94488e4
OpenX Adapter fix: updating outdated video examples (#4198)
jimee02 Sep 16, 2019
e981849
userId - Add support for refreshing the cached user id (#4082)
padurgeat Sep 17, 2019
17969da
Prebid 2.33.0 Release
Sep 17, 2019
3524709
Increment pre version
Sep 17, 2019
a3cd6e6
SupplyChainObject support and fires a pixel onTimeout (#4152)
telariaEng Sep 17, 2019
313bdc8
Feature/add profile parameter (#4185)
ujuettner Sep 17, 2019
ebf4272
EMXDigital Bid Adapter: Add video dimensions in request (#4174)
EMXDigital Sep 18, 2019
fa0019c
Added keywords parameter support in TrustX Bid Adapter (#4183)
PWyrembak Sep 18, 2019
53a13f2
rubicon: avoid passing unknown position (#4207)
bretg Sep 19, 2019
93874d8
correctly reference bidrequest and determine mediatype of bidresponse…
EMXDigital Sep 20, 2019
def7138
GumGum: only send gdprConsent when found (#4205)
susyt Sep 20, 2019
1e03b4b
LKQD: Use refererInfo.referer as fallback pageurl (#4210)
mrcrawfo Sep 20, 2019
f1642f1
[UserId] - ID5 - Fixed case when consentData is undefined (No CMP) (#…
padurgeat Sep 20, 2019
eb841b2
create stubs for localStorage in widespaceBidAdapter test file (#4208)
jsnellbaker Sep 23, 2019
e817865
added adId property to adRenderFailed event (#4097)
Sep 23, 2019
495baa9
OpenX Adapter: Forcing https requests and adding UserID module suppor…
jimee02 Sep 23, 2019
562a889
PubMatic to support userId sub-modules (#4191)
pm-harshad-mane Sep 23, 2019
f81b567
TripleLift support for UnifiedId and IdentityLink (#4197)
willchapin Sep 23, 2019
8544dbf
Added lemma adapter (#4126)
lm-abhijit Sep 23, 2019
5651800
Adkernel adapter new alias (#4221)
ckbo3hrk Sep 24, 2019
991b94d
Force https scheme for Criteo Bidder (#4227)
leonardlabat Sep 24, 2019
4be8495
Add Video Support for Datablocks Bid Adapter (#4195)
htang555 Sep 24, 2019
2ab711b
update adUnit, bidRequest and bidResponse object (#4180)
Fawke Sep 24, 2019
0ad0bd3
3 display banner and video vast support for rads (#4209)
onlsol Sep 24, 2019
925f1b1
UserId - Add SameSite and server-side pubcid support (#3869)
pycnvr Sep 25, 2019
112c953
added schain to appnexus bid adapter (#4229)
mkendall07 Sep 25, 2019
74ff666
update doubleclick url (#4179)
MikeSperone Sep 25, 2019
124a2be
Prebid 2.34.0 release
jsnellbaker Sep 25, 2019
0274410
increment pre version
jsnellbaker Sep 25, 2019
d79483b
Rubi Analytics handles > 1 bidResponse per bidRequest (#4224)
robertrmartinez Sep 26, 2019
25e5fd0
videoNow bid adapter (#4088)
sdbaron Sep 27, 2019
91146b6
djax new bidder adapter (#4192)
djaxbidder Sep 27, 2019
21f1275
Added Turk Telekom Bid Adapter (#4203)
turktelssp Sep 30, 2019
3ed4ba2
MicroAd: Use HTTPS in all requests (#4220)
strong-zero Sep 30, 2019
3921f98
Schain: avoiding Object.values as it is breaking on IE11 (#4238)
pm-harshad-mane Sep 30, 2019
696f1e9
3952 delay auction for ids (#4115)
mutdmour Sep 30, 2019
4691c7c
Feature: adUnitBidLimit (#3906)
Oct 1, 2019
fdc8e78
Update Rubicon Adapter netRevenue default (#4242)
Oct 2, 2019
88e3825
Removed AdastaMadia from alias (#4255)
Adasta2019 Oct 3, 2019
fbd6a0b
Update appnexusBidAdapter.js (#4251)
Adasta2019 Oct 3, 2019
976718f
IdentityLink - change expiration time to 30 days (#4239)
mamatic Oct 3, 2019
1aecd87
Add coppa support for AppNexus adapter (#4253)
mkendall07 Oct 3, 2019
4ac3582
add new longform e2e tests (#4206)
jsnellbaker Oct 7, 2019
214efe8
Konduit module (#4184)
konduit-dev Oct 7, 2019
bc855ed
Circle CI runs e2e tests on every push (#4200)
Fawke Oct 7, 2019
2121f18
Outcon bid adapter. (#4161)
TinchoF Oct 8, 2019
3ee0d97
Adding workflow to run end to end tests (#4230)
jaiminpanchal27 Oct 8, 2019
6af3e5f
update prebid path for e2e test pages (#4274)
jaiminpanchal27 Oct 8, 2019
6b16b73
Prebid 2.35.0 release
Oct 8, 2019
f7e5de7
Increment pre version
Oct 8, 2019
dceba37
Add usersync to adpone adapter (#4245)
seergiioo6 Oct 10, 2019
64f6718
Revert GumGum Adapter 2.28 resizing changes (#4277)
WayneYang1 Oct 10, 2019
57c6666
SpotX Bid Adapter: Support schain, ID5 object, Google consent object,…
codybonney Oct 11, 2019
842e45f
Update Rubicon Analytics Adapter `bidId` to match PBS (#4156)
Oct 11, 2019
b3371df
SmartRTB adapter update (#4246)
evanmsmrtb Oct 14, 2019
ba6c303
Support Vast Track (#4276)
tjeastmond Oct 14, 2019
aafd041
Added 1000x250 size (#4295)
hdeodhar Oct 14, 2019
3f3e743
prepare vidazoo adapter for v3.0 (#4291)
thewizarodofoz Oct 14, 2019
715f7c3
Improve Digital adapter: support schain (#4286)
jbartek25 Oct 14, 2019
b7d9f9f
LiveIntent Identity Module. (#4178)
jankoulaga Oct 14, 2019
e27fc40
updating liveintent eids source (#4300)
bretg Oct 14, 2019
4cf7461
modify targeting.js to allow bidCaching on marfeel
Oct 15, 2019
aacc79a
added comment to explain marfeel change
Oct 15, 2019
7823e5b
fix appnexusBidAdapter view-script regex (#4289)
jsnellbaker Oct 15, 2019
c3ba14c
33Across adding bidder specific extension field (#4298)
thomas-33across Oct 15, 2019
56b611f
PubMatic to support LiveIntent User Id sub-module (#4306)
pm-harshad-mane Oct 15, 2019
42684cd
Merge pull request #33 from Marfeel/MRF-58308/adaptBidCacheToMarfeel
pedrolopezmrf Oct 15, 2019
ae63dde
Finteza Analytics Adapter: fix cookies (#4292)
finteza Oct 15, 2019
3965d3a
Update LockerDome adapter to support Prebid 3.0 (#4301)
margsliu Oct 15, 2019
31b3c1d
Returning the `IdResponse` type with an obj + callback. Fix for 4304…
jankoulaga Oct 15, 2019
46bfb02
ShowHeroes adapter - expanded outstream support (#4222)
vadim-mazzherin Oct 15, 2019
e4d3ff5
[Orbidder-Adapter] Add bidRequestCount and remove bid.params.keyValue…
Oct 15, 2019
6fb6706
PulsePoint: remove usage of deprecated utils method / prep for 3.0 (#…
anand-venkatraman Oct 15, 2019
d549a40
Use isArray method (#4288)
jaiminpanchal27 Oct 15, 2019
fceb471
Add Parrable ID submodule (#4266)
eyas-ranjous Oct 15, 2019
29520f3
Prebid 2.36.0 Release
bretg Oct 15, 2019
f498ba8
Increment pre version
bretg Oct 15, 2019
b363e97
Support schain module and send bidfloor param in Sharethrough adapter…
madma Oct 15, 2019
493bd5e
Platform One Analytics Adapter (#4233)
hbanalytics Oct 15, 2019
e2b1677
aliases onn districtM
Oct 16, 2019
4ed8993
Merge pull request #34 from Marfeel/MRF-58308/fixPrebidWhileCaching
pedrolopezmrf Oct 16, 2019
44192a8
Fix parrable id integration example (#4317)
eyas-ranjous Oct 16, 2019
cb3c457
Improve Digital adapter: support for video (#4318)
jbartek25 Oct 16, 2019
fd865b1
Gamoshi: Update aliases list. Add support for userSync. (#4319)
Oct 16, 2019
0fed339
fix for userSync endpoint getting called with bidder alias names, ins…
Fawke Oct 17, 2019
315bd19
modify ixBidAdapater to always use the secure endpoint (#4323)
ix-prebid-support Oct 17, 2019
64bd851
PubMatic to support Parrable User Id sub-module (#4324)
pm-harshad-mane Oct 17, 2019
b89d006
VISX: currency validation & fix double escape of referer (#4299)
mk0x9 Oct 18, 2019
cde90dc
PubMatic to support coppa (#4336)
pm-harshad-mane Oct 21, 2019
ab91441
vuble: outstream has fullscreen option (#4320)
Roffray Oct 21, 2019
f919f58
EMXDigital: hotfix to resolve URIError from decodeURIComponent (#4333)
EMXDigital Oct 21, 2019
56d6c59
Specify second parameter for parseInt for pubmaticBidAdapter (#4347)
rumesh Oct 21, 2019
a65a11b
Remove usage of getTopWindowUrl in Prebid Adapter (#4341)
bmwcmw Oct 22, 2019
b5f3c99
Conversant Bid Adapter update for 3.0 (#4284)
pycnvr Oct 22, 2019
f92650f
Add cpmDistribution function for Google Analytics adapter (#4240)
muuki88 Oct 22, 2019
2318453
fixing SRA p_pos (#4337)
robertrmartinez Oct 22, 2019
23fad51
In Sonobi Adapter, only read sizes from bid.mediaTypes (#4311)
JonGoSonobi Oct 22, 2019
8b85edc
Fix mediaTypes (#4332)
TinchoF Oct 22, 2019
d4e09b4
Prebid 2.37.0 release
jsnellbaker Oct 22, 2019
f2ee258
increment pre version
jsnellbaker Oct 22, 2019
efc90a6
Add vast xml support and other minor changes to Beachfront adapter (#…
jsalis Oct 23, 2019
be6704b
Update smartrtbBidAdapter (#4362)
evanmsmrtb Oct 23, 2019
04b8105
Revert "Update smartrtbBidAdapter (#4362)" (#4368)
jsnellbaker Oct 23, 2019
02f6cbc
Add userSync in onetagBidAdapter (#4358)
onetag-dev Oct 23, 2019
6114a3d
Sovrn adapter updates: schain, digitrust, pixel syncing, and 3.0 upgr…
aprakash-sovrn Oct 23, 2019
e6b8859
use bidCaching by URL
Oct 24, 2019
02bba92
Merge pull request #35 from Marfeel/MRF-59330/bidCachingBuUrls
pedrolopezmrf Oct 24, 2019
f69ec24
Add bid adapter for ablida (#4256)
Oct 24, 2019
df020d7
AdKernel: added waardex_ak alias (#4290)
romanantropov Oct 24, 2019
ea2fc95
Revert "Sovrn adapter updates: schain, digitrust, pixel syncing, and …
msm0504 Oct 24, 2019
2376a7f
Vrtcal Markets Inc. Bid Adapter Addition (#4259)
vrtcal-dev Oct 24, 2019
6c908ce
Update schain path in ORTB path for spotxBidAdapter (#4377)
codybonney Oct 25, 2019
22dbb6f
use normal bids if cache is empty
Oct 25, 2019
bc3afca
Merge pull request #36 from Marfeel/fallbackForBidCachingByUrl
pedrolopezmrf Oct 25, 2019
59a3229
Update Grid Bid Adapter (#4379)
TheMediaGrid Oct 25, 2019
275c56e
TripleLift: Sending schain (#4375)
colbertk Oct 25, 2019
52e663a
DistrictmDMX: adding support for schain and remove content type to de…
stevealliance Oct 25, 2019
6aa49a6
Support for ID5 + receive meta data (#4352)
bjorn-lw Oct 25, 2019
f5db737
fix conflicts
Oct 28, 2019
8717ab8
update prebid to 2.17
Oct 28, 2019
016f823
remove try catch on get lastLocation
Oct 28, 2019
f9be9a7
remove add currency on prebidServer adapter
Oct 29, 2019
6d9d66d
Merge pull request #37 from Marfeel/fixLastLocation
pedrolopezmrf Oct 29, 2019
7abbaf3
add schain modules to modules.json
Nov 5, 2019
014c90e
Merge pull request #38 from Marfeel/MRF-55555/addSchainModule
pedrolopezmrf Nov 6, 2019
58ea9fc
added isBidCached method
joanmirallesmrf Nov 7, 2019
aa58ef3
filter by referer
joanmirallesmrf Nov 8, 2019
68c6782
new method getBidReferer
joanmirallesmrf Nov 8, 2019
64af640
update modules.json
Nov 11, 2019
8a56b50
Merge pull request #40 from Marfeel/MRF-60244/useTeadsAdapter
pedrolopezmrf Nov 11, 2019
e7389b2
changed bidsByReferrer logic
joanmirallesmrf Nov 12, 2019
7748d7b
remove script methods
joanmirallesmrf Nov 12, 2019
2e70957
bidsByReferrer as private
joanmirallesmrf Nov 12, 2019
0b0bd73
Merge pull request #39 from Marfeel/MRF-60086/Improve_bids_debugging_…
joanmirallesmrf Nov 13, 2019
4198a0c
added bid cached logic
joanmirallesmrf Nov 13, 2019
8f11534
isBidAlreadyRecieved method name
joanmirallesmrf Nov 13, 2019
87e15dd
refactoring
joanmirallesmrf Nov 14, 2019
9a66e4b
improved isBidAlreadyRecieved method
joanmirallesmrf Nov 14, 2019
a1b4e36
Merge pull request #41 from Marfeel/MRF-60086/Improve_bids_debugging_…
joanmirallesmrf Nov 15, 2019
ee690eb
new instrumentation hb_cached
joanmirallesmrf Dec 12, 2019
1552749
updated isBidCached method
joanmirallesmrf Dec 12, 2019
2a17d85
bidcahcing filter: removed targetingSet condition
joanmirallesmrf Dec 17, 2019
b24ed68
Merge pull request #42 from Marfeel/MRF-64046/Instrumentize_cached_im…
joanmirallesmrf Dec 17, 2019
1a84ad7
Merge pull request #43 from Marfeel/MRF-64514/Improve_bidcaching_logic
joanmirallesmrf Dec 17, 2019
f2d5895
MRF-63767 / Add ImproveDigital bidder
adriafolchmrf Dec 18, 2019
e41c7b7
Merge pull request #44 from Marfeel/MRF-63767/AddImproveDigitalBidder
adriafolchmrf Dec 19, 2019
2180b98
fix(prebid)Avoid cookie sync with invalid bidder names
raquelyustemrf Jan 3, 2020
448cd16
Merge pull request #45 from Marfeel/MRF-64713/avoid_cookie_sync_with_…
raquelyustemrf Jan 8, 2020
b3689b3
MRF-64855 / Remove AdUnit filter
adriafolchmrf Jan 8, 2020
46d20c5
Merge pull request #46 from Marfeel/MRF-64855/RemoveAdUnitFilter
adriafolchmrf Jan 9, 2020
5d5baa7
MRF-65239/FixBidCaching
adriafolchmrf Jan 14, 2020
96c41b4
fix bidcaching sizes
pedrolopezmrf Feb 26, 2020
54f170c
apply suggestions
pedrolopezmrf Feb 26, 2020
4e3ba94
Merge pull request #48 from Marfeel/MRF-66918/fixBidCachingSizes
pedrolopezmrf Feb 26, 2020
69e8b83
fix typo
pedrolopezmrf Feb 26, 2020
90b7ab0
remove conflicts dirt
pedrolopezmrf Feb 26, 2020
dbaf82b
fix bidcaching for 1x1
pedrolopezmrf Mar 4, 2020
0b429ef
add 1x1 size if allowed
pedrolopezmrf Mar 4, 2020
ea7532c
apply suggestions
pedrolopezmrf Mar 4, 2020
8abfaa9
fix test
pedrolopezmrf Mar 4, 2020
bd77f41
apply suggestions
pedrolopezmrf Mar 4, 2020
9bb7077
split describe
pedrolopezmrf Mar 4, 2020
6fe7d23
Merge pull request #49 from Marfeel/put1x1SizesBidCachingIf300x250
pedrolopezmrf Mar 4, 2020
5db1973
Revert "fix bidcaching for 1x1"
pedrolopezmrf Mar 4, 2020
9224f02
Merge pull request #50 from Marfeel/revert-49-put1x1SizesBidCachingIf…
pedrolopezmrf Mar 4, 2020
ee9e760
Revert "Revert "fix bidcaching for 1x1""
pedrolopezmrf Mar 5, 2020
87b0a9b
Merge pull request #51 from Marfeel/revert-50-revert-49-put1x1SizesBi…
pedrolopezmrf Mar 5, 2020
1677265
update ixBidAdapter
pedrolopezmrf Mar 10, 2020
9342941
Merge pull request #52 from Marfeel/MRF-63453/updateIndexAdapter
pedrolopezmrf Mar 10, 2020
beb3017
fix(bidcaching):remove teads from bidcaching
raquelyustemrf Mar 18, 2020
370648f
Merge with master
raquelyustemrf Mar 18, 2020
aea81a1
typo
raquelyustemrf Mar 18, 2020
d7bbfed
changes suggested
raquelyustemrf Mar 18, 2020
bfee107
added tests
raquelyustemrf Mar 19, 2020
d5205a3
Merge pull request #54 from Marfeel/MRF-67621/remove-teads-from-bid-c…
raquelyustemrf Mar 19, 2020
a07c55f
Added github actions in order to install prebid as a dependency (#55)
pedrolopezmrf May 22, 2020
52495a6
fix(actions) (#57)
pedrolopezmrf May 22, 2020
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: 0 additions & 19 deletions .babelrc

This file was deleted.

34 changes: 34 additions & 0 deletions .babelrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

let path = require('path');

function useLocal(module) {
return require.resolve(module, {
paths: [
__dirname
]
})
}

module.exports = {
"presets": [
[
useLocal('@babel/preset-env'),
{
"targets": {
"browsers": [
"chrome >= 61",
"safari >=8",
"edge >= 14",
"ff >= 57",
"ie >= 10",
"ios >= 8"
]
}
}
]
],
"plugins": [
path.resolve(__dirname, './plugins/pbjsGlobals.js'),
useLocal('babel-plugin-transform-object-assign')
]
};
128 changes: 86 additions & 42 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,93 @@
#
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
#

aliases:
- &environment
docker:
# specify the version you desire here
- image: circleci/node:8.9.0

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/mongo:3.4.4
working_directory: ~/Prebid.js

- &restore_dep_cache
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- &save_dep_cache
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

- &install
name: Install gulp cli
command: sudo npm install -g gulp-cli

- &run_unit_test
name: BrowserStack testing
command: gulp test --browserstack --nolintfix

- &run_endtoend_test
name: BrowserStack End to end testing
command: echo "127.0.0.1 test.localhost" | sudo tee -a /etc/hosts && gulp e2e-test --host=test.localhost

# Download and run BrowserStack local
- &setup_browserstack
name : Download BrowserStack Local binary and start it.
command : |
# Download the browserstack binary file
wget "https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip"
# Unzip it
unzip BrowserStackLocal-linux-x64.zip
# Run the file with user's access key
./BrowserStackLocal ${BROWSERSTACK_ACCESS_KEY} &

- &unit_test_steps
- checkout
- restore_cache: *restore_dep_cache
- run: npm install
- save_cache: *save_dep_cache
- run: *install
- run: *setup_browserstack
- run: *run_unit_test

- &endtoend_test_steps
- checkout
- restore_cache: *restore_dep_cache
- run: npm install
- save_cache: *save_dep_cache
- run: *install
- run: *setup_browserstack
- run: *run_endtoend_test

version: 2
jobs:
build:
docker:
# specify the version you desire here
- image: circleci/node:7.10
<<: *environment
steps: *unit_test_steps

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/mongo:3.4.4

working_directory: ~/Prebid.js

steps:
- checkout

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: npm install

- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

- run: sudo npm install -g gulp-cli
# Download and run BrowserStack local
- run:
name : Download BrowserStack Local binary and start it.
command : |
# Download the browserstack binary file
wget "https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip"
# Unzip it
unzip BrowserStackLocal-linux-x64.zip
# Run the file with user's access key
./BrowserStackLocal ${BROWSERSTACK_ACCESS_KEY} &
# run tests!
- run:
name: BrowserStack testing
command: gulp test --browserstack
e2etest:
<<: *environment
steps: *endtoend_test_steps

workflows:
version: 2
commit:
jobs:
- build
nightly:
triggers:
- schedule:
cron: "0 0 * * *"
filters:
branches:
only:
- master
jobs:
- e2etest
14 changes: 13 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

const allowedModules = require("./allowedModules");

module.exports = {
"env": {
"browser": true,
Expand All @@ -11,6 +14,9 @@ module.exports = {
}
},
"extends": "standard",
"plugins": [
"prebid"
],
"globals": {
"$$PREBID_GLOBAL$$": false
},
Expand All @@ -31,5 +37,11 @@ module.exports = {
"no-throw-literal": "off",
"no-undef": "off",
"no-useless-escape": "off",
}
},
"overrides": Object.keys(allowedModules).map((key) => ({
"files": key + "/**/*.js",
"rules": {
"prebid/validate-imports": ["error", allowedModules[key]]
}
}))
};
1 change: 1 addition & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ exemptLabels:
- security
- bug
- feature
- on hold
# 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
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Build
on:
push:
branches:
- marfeel-master

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: ⬇ Checkout
uses: actions/checkout@v2

- name: 🔧 Setup node
uses: actions/setup-node@v1
node-version: '12.x'
registry-url: 'https://npm.pkg.github.com'

- name: 📦 Install
uses: Marfeel/github-actions/common/actions/initialize@master
with:
gh-token: ${{ secrets.BOB_GITHUB_TOKEN }}

- name: 🛠 Build
run: gulp build --modules=modules.json

- name: ➗ Create prebid.ww.js from prebid.js
run: cp /build/dist/prebid.js /build/dist/prebid.ww.js

- name: ♻️ Adapt to web worker
run: sed -i 's/location/originalLocation/g' ./build/dist/prebid.ww.js

- name: 🚀 Publish
run: |
git config --local user.email 'tech@marfeel.com'
git config --local user.name 'GitHub Action'

npm publish

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ build/coverage/
.idea/
# if you remove the above rule, at least ignore the following:

# VS Code
.vscode/

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
registry=https://npm.pkg.github.com/marfeel
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0
8.9
2 changes: 2 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Marfeel Prebid
* @Marfeel/alot
6 changes: 3 additions & 3 deletions 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 Expand Up @@ -64,8 +64,8 @@ A test module might have the following general structure:
import { expect } from 'chai'; // may prefer 'assert' in place of 'expect'
import adapter from 'src/adapters/<adapter>';

describe('<Adapter>', () => {
it('<description of unit or feature being tested>', () => {
describe('<Adapter>', function () {
it('<description of unit or feature being tested>', function () {
// Arrange - set up preconditions and inputs
// Act - call or act on the code under test
// Assert - use chai to check that expected results have occurred
Expand Down
25 changes: 25 additions & 0 deletions PREBID_VERSIONING_DEPRECATION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Prebid versioning and deprecation policy

## Goals
Provide clear definitions and policy around versioning and breaking changes to APIs that are both publisher and demand partner facing.

- Limit the number of breaking changes.
- Ensure significant time for updates for breaking changes so that publisher or demand partners do not break.
- Provide a path to deprecation and reduce technical debt and increase security.
- Major versions should not be changed more than once per 30 days.

## Versioning

Follow semantic versioning so that all breaking changes occur within a major release. A breaking change includes both demand partner internal APIs* and publisher facing APIs (global APIs).

*Demand partner APIs may be excluded from breaking change policy at the core teams discretion if the changes are made so to be transparent to the bidders (such as internal refactoring).

## Deprecation process

- Open an issue with an "intent to implement" and "API impact" labels.
- Allow 2 weeks for discussion.
- Announce breaking change to the mailing list (TBD needs to be created).
- At least 2 core members needs to provide explicit approval for the deprecation.
- Open a PR against current master for console warning for possible breakage.
- Support the previous major version for a minimum of 30 days.
- Coordinate with the core team to ensure clean merging into feature branch if applicable (future major version branch).
10 changes: 8 additions & 2 deletions PR_REVIEW.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ For modules and core platform updates, the initial reviewer should request an ad
- 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.
- Below are some examples of bidder specific updates that should require docs update (in their dev-docs/bidders/bidder.md file):
- Add support for GDPR consentManagement module > add `gdpr_supported: true`
- Add support for userId module > add `userId: pubCommon, digitrust, newProviderHere`
- Add support for video and/or native mediaTypes > add `media_types: video, native`
- Add support for COPPA > add `coppa_supported: true`
- 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)
- Add the PR to the appropriate project board (I.E. 1.23.0 Release) for the week, [see](https://github.com/prebid/Prebid.js/projects)

### New Adapter or updates to adapter process
- Follow steps above for general review process. In addition, please verify the following:
Expand All @@ -39,9 +45,9 @@ For modules and core platform updates, the initial reviewer should request an ad
## 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.
- Review issues and PRs at least once per weekday for new items. Encourage a 48 "SLA" on PRs/issues assigned. Aim for touchpoint once every 48/hours.
- 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.
- For Issues: try to address questions and troubleshooting requests on your own, assigning them to others as needed. Please add labels as appropriate (I.E. bug, question, backlog etc).
- 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.
Expand Down
Loading