From 18733b6c5f755cbd6fe36f8c051e8bee16af0ecd Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Fri, 22 Dec 2017 15:03:13 +1100 Subject: [PATCH] Manual PR merges --- src/apps.json | 60 +++++++++++++- src/drivers/webextension/html/options.html | 90 ++++++++++----------- src/drivers/webextension/js/content.js | 1 + src/icons/CNV.png | Bin 0 -> 1798 bytes src/icons/revslider.png | Bin 0 -> 1974 bytes 5 files changed, 104 insertions(+), 47 deletions(-) create mode 100644 src/icons/CNV.png create mode 100644 src/icons/revslider.png diff --git a/src/apps.json b/src/apps.json index 94c5e1395..ee5929a32 100644 --- a/src/apps.json +++ b/src/apps.json @@ -9,6 +9,17 @@ "url": "/shop/catalog/browse\\?sessid=", "website": "http://1and1.com" }, + "Google Analytics Enhanced eCommerce": { + "cats": [ + "10" + ], + "js": { + "gaplugins.EC" + }, + "icon": "Google Analytics.svg", + "script": "google-analytics\\.com\\/plugins\\/ua\\/ec.js", + "website": "https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-ecommerce" + }, "1C-Bitrix": { "cats": [ "1" @@ -3526,6 +3537,17 @@ "url": "^https?://sites\\.google\\.com", "website": "http://sites.google.com" }, + "CNV Platform": { + "cats": [ + "1" + ], + "headers": { + "Set-Cookie": "cnv_session" + }, + "icon": "CNV.png", + "implies": "laravel", + "website": "https://cnv.vn" + }, "Google Tag Manager": { "cats": [ "42" @@ -3534,7 +3556,10 @@ "googletag": "", "google_tag_manager": "" }, - "html": "googletagmanager\\.com/ns\\.html[^>]+>", + "html": [ + "googletagmanager\\.com/ns\\.html[^>]+>", + "" + ], "icon": "Google Tag Manager.png", "website": "http://www.google.com/tagmanager" }, @@ -4466,7 +4491,8 @@ "icon": "Jekyll.png", "html": [ "Powered by ]*>Jekyll]* href=[\\'\"][^']+revslider[/\\w-]+\\.css\\?ver=([0-9.]+)[\\'\"]\\;version:\\1" + ], + "script": "/revslider/[/\\w-]+/js", + "implies": "WordPress", + "website": "https://revolution.themepunch.com/" + }, "OpenX": { "cats": [ "36" diff --git a/src/drivers/webextension/html/options.html b/src/drivers/webextension/html/options.html index 650568ecf..66179fd52 100644 --- a/src/drivers/webextension/html/options.html +++ b/src/drivers/webextension/html/options.html @@ -2,7 +2,7 @@ - + Wappalyzer options @@ -14,58 +14,58 @@ - + - +
-
- -
+
+ +
-
-

Options

+
+

Options

-

- - - -

+

+ + + +

- + +
- + diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js index 49c21f5e7..7ffb4ba12 100644 --- a/src/drivers/webextension/js/content.js +++ b/src/drivers/webextension/js/content.js @@ -1,4 +1,5 @@ /** global: browser */ +/** global: XMLSerializer */ if ( typeof browser !== 'undefined' && typeof document.body !== 'undefined' ) { try { diff --git a/src/icons/CNV.png b/src/icons/CNV.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e2592249bb29acb751230d723d020cccc1f199 GIT binary patch literal 1798 zcmV+h2l@DkP)2`o3j?PI+Yq_!rP&EaZm&$QDGDPvgz*?Xr)m_^%K>1gJ z-RV$1{T85V>wx>y8RZ;lQrr%F1Ki%mJ^3vsz*SM*N5tX_y5>CKxYy(UDMm5nDNr7f z4_Iyi8-RYTkTWDk5(1eLcx-V#{q{iD2)7i+DC(9>As}80XaSldT>mG+yuTOt3}^&8 zrAR+#Oa!cK4fqI|_*zEPVD=l<-dB7skpH<2?0JVTu%ypy3F9Wn#Eno&9>)P*h zRa7tWdfW{bg`L@kI9~C~{d_D6bz#J#d4r{Vy@c%D zq#_DD1`HGfYX=<$W>8Y2;3wRApM-Ti}T&WFudy_uxUIjCBGq69=MD*7xY;A<17H!4Y)-9(hjh>}>OEV2nW zU}zg|QNP18r6P0&s1vdOoS0&L#I@rn@@d2U11##de`*O(HAzH*pdm8s0($H2a{#}K zM93_fShaHOoG1Y~35L<`z)n=HK&=1EOfx%0_MvL^f&eo|bgg3;6GaqdpPxiS@Zz5_B3>JE5E3L|8wB6Q(@i zI#C}8<132@s7{Cgk>%}4u+t+30vs_|;oTz93KRJws~$U>xhe}Fe?JwnwIC*X~5?Yy?Ll$o0yRuLdYnNIOesaWoR4plphs*R3Q z`7Y!-S5xS!!)_aDl@AC+sSUKWk)@OX>ru6Xz%pPXp*KU9)*}||Dd6J8VfcI#$ZJ0q zy99O{6m?q6lyw7GIL4nW0hNTx=4TCIuozhB^|(*9@szoS&?c&RKm)2)D;%l~=!)Op z7pK!fyLJ!=fL|Q>?fX&GsS22!x0x<(MnZdv=IcY1HOoF5`27uzBS$^vaR2}S07*qoM6N<$f>s_Yp#T5? literal 0 HcmV?d00001 diff --git a/src/icons/revslider.png b/src/icons/revslider.png new file mode 100644 index 0000000000000000000000000000000000000000..3b2cd2ac5c3a6b021c96568dac8918bdf6976610 GIT binary patch literal 1974 zcmV;n2TAyeP)xh<2l(58a6RP|<}b`qYKKbzv8ZqNr$>AgCa^P_SE6TeQ2HxwUDj zm1dfzSz4Ntc^Mr?of)s?rE(=@)?2xmjyj$_&+xo2XP$YSi|>qu_`n~98E4*~=YHN9 zUAazo7G+1lD3rZar~6HZzYL60KowLs$^o4kgB*h#gB*h#gB*h#gZu&@O(+8@7nOs0 zfyzS_qDp*x4GXGv!v@IbulGejR-zg=ZiLp$m!Yem0Qzh;80_lqXIRDnPU;z|;ZpfG4e+O+55#adv5qv#^4hMAT^-#TL4Ok_w`R~Px z>T|P~FNZ8{*%60imTL_Ofx-TM&~iHS@}P3|Z1r^;H*LcI!l3$iIzry(Zf_Y$$l7`H zptqp`0(Bhd)(wXaLG8?$;OOpld5l@|9=>NPk8#ULK)zYO-lJYDAaR|y?%-1#8Zf#^AMl^h>KbC2`^EWKtpyLjq-~) za|Zsv$Nxkz$jbuYH4Yd_0Haa2Sl!&U%PV9NLNc(&94?(Jo77!%ARyoU{FC$ojOWfd z0YeDj6%T;XTrsGu)vLjdF7E9Z5%MtyW009d&v}d%X@#sn*(C|%ZDuC?&f!7{U^s{S z+mi+N?saBVUrsSXW)Q$^u4gDc&$xwJAse@CbI*d9d~VK|;TD78LJUR{xEKyt6B_DQ zc`3of^OOMUxdrvSU1V*aQ7dEzT1-6E(a|n08cyQy8c8xYIHUsD5EbQj4P}s-+;Z6* zFo*xl<(alv3nX(@)_000an&j(V3+`?xTpdbMIhr)ot2ef@90p~=SBUUonTtALbaft zH2k?d9yLSOFJ9~hXz%KBT93xyRl$Nc1vkBoibdT;-Q&8?>)r!i15uwV^{l@w8 z)kH%_wtQkmaeVU|via~~_rf0+r@|>Q7$IcQTLR!+0+>WB$fOi{W6z!`YLVUT57 zO9&fSQ>RUX+q^E)LLVW?qBO}czyuDMMB?iiISy)~a>m^8HFpZ05P?m5iw{CTV>?$d7 zvtSXA!{R_$vgP=3zl-;qm>4z5Bns9`B`&G}X7Mu7DkL3tns5!G0E%$MBpx+cvgODT zzX01!Ca1MzNrqZ5g8;JfV3;};ebeEdzX z%^W@5RaGu-N&!nqESiP6GB}X9bSgh}N{vAZn98%LECv<8n%%plFI$H(D!QoxSW2vD z(K{PkC=1r-;4B#A-eoH@{zkujv}*YDUN zEfb#|QgPkp2M@r47Rtrde)gnEPRr@Xje}yGW?mjR03A6wE{kKgZ3Fho{s0DKTPH#e z4h%rmg$pnsX}`1_cF&|?&mL(O6_bo7z+pk!e*MMeV#;vK&5}&!+_}(+3*B@p-&?3AIz?$t>m}u&8%5T7AQiB^m^P)v=^Po3CU*oVm5TjNineLNG zCqwHXEfacSCzB`4g9f3{i_NwOXVnGyCaj6ib7?#tlSvH}0kei!I*EXVLJZ2vgms8I z7}Wcd1sp1wTah-~N++XqGcO2Wfn+BmYqm@M%%VZNb!XsU%3SzFXw{UxXpUqjQ|O@= zEt7OHpY_up1`bCd>H1!DQJQ2-9=aH<77Qq)m0xr=S^oM0D650!VbsA9`^St3Rp z(#kDl9HQ=taW@oTpdm-~w+Zl{)u&_Mn;5O%3qins%