Fixed merge conflict

main
Elbert Alias 9 years ago
commit 57f8a63adc

@ -56,7 +56,7 @@ for ( app in json.apps ) {
//Report error
if(amountOfCaptureGroups > amountOfCaptureGroupsNeeded) {
throw new Error('The pattern uses more capture groups than needed. Use non-capturing roups where appropriate.\n' + app + ': ' + type + ': ' + pattern);
throw new Error('The pattern uses more capture groups than needed. Use non-capturing groups where appropriate.\n' + app + ': ' + type + ': ' + pattern);
}else if(amountOfCaptureGroups < amountOfCaptureGroupsNeeded){
throw new Error('The version string references more capture groups than there are in the pattern! Remove any incorrect back references from the version string and/or add the missing capture groups to the pattern.\n' + app + ': ' + type + ': ' + pattern);
} else if(highestBackReference > amountOfCaptureGroups){

@ -1,5 +1,68 @@
{
"apps": {
"apps": {
"Strato": {
"cats": [
6
],
"html": "<a href=\"http://www.strato.de/\" target=\"_blank\">",
"website": "shop.strato.com",
"icon": "strato.png"
},
"Modified": {
"cats": [
6
],
"meta": {
"generator": "\\(c\\) by modified eCommerce Shopsoftware ------ http://www.modified-shop.org"
},
"icon": "modified.png",
"website": "www.modified-shop.org/"
},
"Mietshop": {
"cats": [
6
],
"meta": {
"generator": "Mietshop"
},
"html": "<a href=\"https://ssl.mietshop.d",
"website": "www.mietshop.de/",
"icon": "mietshop.png"
},
"EPages": {
"headers": {
"X-Powered-By": "epages 6"
},
"cats": [
6
],
"html": "<div class=\"BoxContainer\">",
"website": "www.epages.com/",
"icon": "epages.png"
},
"AfterBuy": {
"cats": [
6
],
"html": [
"<dd>This OnlineStore is brought to you by ViA-Online GmbH Afterbuy. Information and contribution at https://www.afterbuy.de</dd>"
],
"icon": "after-buy.png",
"script": "shop-static\\.afterbuy\\.de",
"website": "www.afterbuy.de"
},
"Xonic": {
"cats": [
6
],
"html": ["Powered by <a href=\"http://www.xonic-solutions.de/index.php\" target=\"_blank\">xonic-solutions Shopsoftware</a>"],
"meta": {
"keywords": "xonic-solutions"
},
"script": "core/jslib/jquery\\.xonic\\.js\\.php",
"website": "www.xonic-solutions.de",
"icon": "xonic.png"
},
"1C-Bitrix": {
"cats": [
1
@ -65,6 +128,28 @@
"icon": "3ware.png",
"website": "www.3ware.com"
},
"a-blog cms": {
"cats": [
1
],
"icon": "a-blog cms.png",
"implies": "PHP",
"meta": {
"generator": "a-blog cms"
},
"website": "www.a-blogcms.jp"
},
"anchorCache": {
"cats": [
23
],
"meta": {
"generator": "anchorCache"
},
"icon": "anchorCache.png",
"implies": "PHP",
"website": "www.anchorcache.eu"
},
"AMPcms": {
"cats": [
1
@ -293,17 +378,6 @@
],
"website": "blogengine.ru"
},
"AfterBuy": {
"cats": [
6
],
"html": [
"<dd>This OnlineStore is brought to you by ViA-Online GmbH Afterbuy. Information and contribution at https://www.afterbuy.de</dd>"
],
"icon": "after-buy.png",
"script": "shop-static\\.afterbuy\\.de",
"website": "www.afterbuy.de"
},
"Airee": {
"cats": [
31
@ -403,21 +477,6 @@
},
"website": "anchorcms.com"
},
"Angular Material": {
"cats": [
18
],
"env": "^angular$",
"icon": "Angular.svg",
"implies": [
"AngularJS"
],
"script": [
"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
"angular-material.*\\.js"
],
"website": "material.angularjs.org"
},
"AngularJS": {
"cats": [
12
@ -431,6 +490,21 @@
],
"website": "angularjs.org"
},
"Angular Material": {
"cats": [
18
],
"env": "^angular$",
"icon": "Angular.svg",
"implies": [
"AngularJS"
],
"script": [
"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
"angular-material.*\\.js"
],
"website": "material.angularjs.org"
},
"Apache": {
"cats": [
22
@ -642,14 +716,6 @@
"script": "^https?://edge\\.avangate\\.net/",
"website": "avangate.com"
},
"BEM": {
"cats": [
12
],
"html": "<[^>]+data-bem",
"icon": "BEM.png",
"website": "www.en.bem.info"
},
"BIGACE": {
"cats": [
1
@ -709,6 +775,14 @@
"implies": "Python",
"website": "docs.python.org/2/library/basehttpserver.html"
},
"BEM": {
"cats": [
12
],
"html": "<[^>]+data-bem",
"icon": "BEM.png",
"website": "www.en.bem.info"
},
"BigDump": {
"cats": [
3
@ -721,13 +795,13 @@
],
"website": "www.ozerov.de/bigdump.php"
},
"BigCommerce": {
"Bigcommerce": {
"cats": [
6
],
"env": "^compareProducts$",
"html": "<link href=[^>]+cdn\\d+\\.bigcommerce\\.com/v",
"icon": "BigCommerce.svg",
"icon": "Bigcommerce.png",
"script": "cdn\\d+\\.bigcommerce\\.com/v",
"url": "mybigcommerce\\.com",
"website": "www.bigcommerce.com"
@ -928,6 +1002,16 @@
"icon": "C++.png",
"website": "isocpp.org"
},
"Caddy": {
"cats": [
22
],
"headers": {
"Server": "^Caddy$"
},
"icon": "caddy.svg",
"website": "caddyserver.com"
},
"CFML": {
"cats": [
27
@ -1015,16 +1099,6 @@
"icon": "CacheFly.png",
"website": "www.cachefly.com"
},
"Caddy": {
"cats": [
22
],
"headers": {
"Server": "^Caddy$"
},
"icon": "caddy.svg",
"website": "caddyserver.com"
},
"CakePHP": {
"cats": [
18
@ -1978,17 +2052,6 @@
"implies": "ELOG",
"website": "midas.psi.ch/elog"
},
"EPages": {
"cats": [
6
],
"headers": {
"X-Powered-By": "epages 6"
},
"html": "<div class=\"BoxContainer\">",
"icon": "epages.png",
"website": "www.epages.com/"
},
"EPiServer": {
"cats": [
1
@ -2879,17 +2942,6 @@
"icon": "default.png",
"website": "???"
},
"HTTP/2": {
"cats": [
19
],
"excludes": "SPDY",
"headers": {
"X-Firefox-Spdy": "h2"
},
"icon": "default.png",
"website": "http2.github.io"
},
"Hammer.js": {
"cats": [
12
@ -3017,6 +3069,17 @@
},
"website": "hotarucms.org"
},
"HTTP/2": {
"cats": [
19
],
"headers": {
"X-Firefox-Spdy": "h2"
},
"icon": "default.png",
"excludes": "SPDY",
"website": "http2.github.io"
},
"HubSpot": {
"cats": [
32
@ -3026,17 +3089,6 @@
"icon": "HubSpot.png",
"website": "hubspot.com"
},
"Hugo": {
"cats": [
1,
11
],
"icon": "Hugo.png",
"meta": {
"generator": "Hugo ([\\d.]+)?\\;version:\\1"
},
"website": "gohugo.io"
},
"Hybris": {
"cats": [
6
@ -3049,6 +3101,17 @@
"implies": "Java",
"website": "hybris.com"
},
"Hugo": {
"cats": [
1,
11
],
"icon": "Hugo.png",
"meta": {
"generator": "Hugo ([\\d.]+)?\\;version:\\1"
},
"website": "gohugo.io"
},
"IBM Coremetrics": {
"cats": [
10
@ -3122,6 +3185,15 @@
"script": "^https?://(?:[^/]+\\.)?i(?:oam|v)wbox\\.de/",
"website": "infonline.de"
},
"Ink": {
"cats": [
18
],
"html": "<link [^>]*href=\"[^\"]+ink(?:\\.min)?\\.css",
"icon": "Ink.png",
"script": "ink.*\\.js",
"website": "ink.sapo.pt"
},
"IPB": {
"cats": [
2
@ -3224,15 +3296,6 @@
"icon": "default.png",
"website": "indyproject.org"
},
"Ink": {
"cats": [
18
],
"html": "<link [^>]*href=\"[^\"]+ink(?:\\.min)?\\.css",
"icon": "Ink.png",
"script": "ink-all(?:\\.min)?.js",
"website": "ink.sapo.pt"
},
"InstantCMS": {
"cats": [
1
@ -3841,15 +3904,6 @@
"script": "^https?://cdn\\.linksmart\\.com/linksmart_([\\d.]+?)(?:\\.min)?\\.js\\;version:\\1",
"website": "linksmart.com"
},
"List.js": {
"cats": [
12
],
"env": "^List$",
"icon": "List.js.png",
"script": "^list\\.(?:min\\.)?js$",
"website": "www.listjs.com"
},
"LiteSpeed": {
"cats": [
22
@ -4281,17 +4335,6 @@
},
"website": "sharepoint.microsoft.com"
},
"Mietshop": {
"cats": [
6
],
"html": "<a href=\"https://ssl.mietshop.d",
"icon": "mietshop.png",
"meta": {
"generator": "Mietshop"
},
"website": "www.mietshop.de/"
},
"Milligram": {
"cats": [
18
@ -4375,16 +4418,6 @@
"script": "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
"website": "www.modernizr.com"
},
"Modified": {
"cats": [
6
],
"icon": "modified.png",
"meta": {
"generator": "\\(c\\) by modified eCommerce Shopsoftware ------ http://www.modified-shop.org"
},
"website": "www.modified-shop.org/"
},
"Moguta.CMS": {
"cats": [
1,
@ -4538,14 +4571,14 @@
"cats": [
1
],
"html": "<link [^>]*href=\"[^>]*\\/mt-content\\/[^>]*\\.css",
"icon": "MotoCMS.svg",
"script": ".*\\/mt-includes\\/[asetj]{2,6}\\/.*\\.js.*",
"html": "<link [^>]*href=\"[^>]*\\/mt-content\\/[^>]*\\.css",
"implies": [
"PHP",
"AngularJS",
"jQuery"
],
"script": ".*\\/mt-includes\\/[asetj]{2,6}\\/.*\\.js.*",
"website": "motocms.com"
},
"Movable Type": {
@ -4729,13 +4762,6 @@
"icon": "Nginx.svg",
"website": "nginx.org"
},
"Node.js": {
"cats": [
27
],
"icon": "node.js.png",
"website": "nodejs.org"
},
"OWL Carousel": {
"cats": [
5,
@ -5444,7 +5470,7 @@
"^priceDisplayMethod$\\;confidence:25",
"^priceDisplayPrecision$\\;confidence:25"
],
"html": "Powered by <a\\s+[^>]+>PrestaShop",
"html":"Powered by <a\\s+[^>]+>PrestaShop",
"icon": "PrestaShop.png",
"implies": "PHP",
"meta": {
@ -5463,13 +5489,11 @@
"website": "projectwonderful.com"
},
"Prospector": {
"cats": [
36
],
"html": "<[^>]+data-name=['\"]prospectscript",
"icon": "Prospector.png",
"script": "processprospector\\.js",
"website": "prospector.io"
"website": "prospector.io",
"cats": [ 36 ],
"html": "<[^>]+data-name=['\"]prospectscript",
"script": "processprospector\\.js",
"icon": "Prospector.png"
},
"Prototype": {
"cats": [
@ -5489,14 +5513,6 @@
"script": "protovis.*\\.js",
"website": "mbostock.github.com/protovis"
},
"PubMatic": {
"cats": [
36
],
"icon": "PubMatic.png",
"script": "https?://[^/]*\\.pubmatic\\.com",
"website": "www.pubmatic.com/"
},
"Public CMS": {
"cats": [
1
@ -5509,6 +5525,14 @@
"implies": "Java",
"website": "www.publiccms.com"
},
"PubMatic": {
"cats": [
36
],
"icon": "PubMatic.png",
"script": "https?://[^/]*\\.pubmatic\\.com",
"website": "www.pubmatic.com/"
},
"Pure CSS": {
"cats": [
18
@ -5548,7 +5572,7 @@
"website": "www.quantcast.com"
},
"Question2Answer": {
"cats": [
"cats" : [
15
],
"html": "<!-- Powered by Question2Answer",
@ -5948,10 +5972,10 @@
"cats": [
19
],
"excludes": "HTTP/2",
"headers": {
"X-Firefox-Spdy": "\\d\\.\\d"
},
"excludes": "HTTP/2",
"icon": "SPDY.png",
"website": "chromium.org/spdy"
},
@ -6077,16 +6101,6 @@
"icon": "Scientific Linux.png",
"website": "scientificlinux.org"
},
"Segment": {
"cats": [
10
],
"env": "^analytics$",
"html": "<script[\\s\\S]*cdn\\.segment\\.com/analytics.js[\\s\\S]*script>",
"icon": "Segment.png",
"script": "cdn\\.segment\\.com/analytics\\.js",
"website": "segment.com"
},
"Select2": {
"cats": [
12
@ -6221,21 +6235,6 @@
"script": "mediacdn\\.shopatron\\.com",
"website": "ecommerce.shopatron.com"
},
"Shopery": {
"cats": [
6
],
"headers": {
"X-Shopery": ""
},
"icon": "Shopery.svg",
"implies": [
"PHP",
"Symfony",
"Elcodi"
],
"website": "shopery.com"
},
"Shopify": {
"cats": [
6
@ -6265,7 +6264,6 @@
"cats": [
6
],
"html": "<title>Shopware ([\\d\\.]+) [^<]+\\;version:\\1\\;confidence:90",
"icon": "Shopware.png",
"implies": [
"PHP",
@ -6275,6 +6273,7 @@
"meta": {
"application-name": "Shopware"
},
"html": "<title>Shopware ([\\d\\.]+) [^<]+\\;version:\\1\\;confidence:90",
"script": "(?:(shopware)|/web/cache/[0-9]{10}_.+)\\.js\\;version:\\1?4:5",
"website": "shopware.com"
},
@ -6645,14 +6644,6 @@
"icon": "Store Systems.png",
"website": "store-systems.de"
},
"Strato": {
"cats": [
6
],
"html": "<a href=\"http://www.strato.de/\" target=\"_blank\">",
"icon": "strato.png",
"website": "shop.strato.com"
},
"Stripe": {
"cats": [
41
@ -6686,20 +6677,6 @@
},
"website": "subrion.com"
},
"Sulu": {
"cats": [
1
],
"headers": {
"X-Generator": "Sulu/?(.+)?$\\;version:\\1"
},
"icon": "Sulu.svg",
"implies": [
"PHP",
"Symfony"
],
"website": "sulu.io"
},
"SumoMe": {
"cats": [
5,
@ -6787,6 +6764,17 @@
"icon": "SyntaxHighlighter.png",
"website": "github.com/syntaxhighlighter"
},
"ThinkPHP": {
"cats": [
18
],
"headers": {
"X-Powered-By": "ThinkPHP"
},
"implies": "PHP",
"icon": "ThinkPHP.png",
"website": "www.thinkphp.cn"
},
"TWiki": {
"cats": [
8
@ -6906,17 +6894,6 @@
],
"website": "thelia.net"
},
"ThinkPHP": {
"cats": [
18
],
"headers": {
"X-Powered-By": "ThinkPHP"
},
"icon": "ThinkPHP.png",
"implies": "PHP",
"website": "www.thinkphp.cn"
},
"TiddlyWiki": {
"cats": [
1,
@ -7715,16 +7692,6 @@
"icon": "Wolf CMS.png",
"website": "www.wolfcms.org"
},
"Woltlab Community Framework": {
"cats": [
18
],
"html": "var WCF_PATH[^>]+",
"icon": "Woltlab Community Framework.png",
"implies": "PHP",
"script": "WCF\\..*\\.js",
"website": "www.woltlab.com"
},
"WooCommerce": {
"cats": [
6
@ -7891,20 +7858,6 @@
"icon": "Xitami.png",
"website": "xitami.com"
},
"Xonic": {
"cats": [
6
],
"html": [
"Powered by <a href=\"http://www.xonic-solutions.de/index.php\" target=\"_blank\">xonic-solutions Shopsoftware</a>"
],
"icon": "xonic.png",
"meta": {
"keywords": "xonic-solutions"
},
"script": "core/jslib/jquery\\.xonic\\.js\\.php",
"website": "www.xonic-solutions.de"
},
"XpressEngine": {
"cats": [
1
@ -8154,17 +8107,6 @@
"icon": "Zope.png",
"website": "zope.org"
},
"a-blog cms": {
"cats": [
1
],
"icon": "a-blog cms.png",
"implies": "PHP",
"meta": {
"generator": "a-blog cms"
},
"website": "www.a-blogcms.jp"
},
"actionhero.js": {
"cats": [
1,
@ -8189,17 +8131,6 @@
"script": "amcharts.*\\.js",
"website": "amcharts.com"
},
"anchorCache": {
"cats": [
23
],
"icon": "anchorCache.png",
"implies": "PHP",
"meta": {
"generator": "anchorCache"
},
"website": "www.anchorcache.eu"
},
"basket.js": {
"cats": [
12
@ -8638,6 +8569,13 @@
],
"website": "code.google.com/p/modwsgi"
},
"Node.js": {
"cats": [
27
],
"icon": "node.js.png",
"website": "nodejs.org"
},
"nopCommerce": {
"cats": [
6
@ -8858,6 +8796,16 @@
"script": "(?:scriptaculous|protoaculous)\\.js",
"website": "script.aculo.us"
},
"Segment": {
"cats": [
10
],
"env": "^analytics$",
"icon": "Segment.png",
"script": "cdn\\.segment\\.com/analytics\\.js",
"html": "<script[\\s\\S]*cdn\\.segment\\.com/analytics.js[\\s\\S]*script>",
"website": "segment.com"
},
"shine.js": {
"cats": [
25
@ -8887,6 +8835,20 @@
"icon": "swift.engine.png",
"website": "mittec.ru/default"
},
"Sulu": {
"cats": [
1
],
"headers": {
"X-Generator": "Sulu/?(.+)?$\\;version:\\1"
},
"icon": "Sulu.svg",
"implies": [
"PHP",
"Symfony"
],
"website": "sulu.io"
},
"three.js": {
"cats": [
25
@ -9000,6 +8962,16 @@
"icon": "webpack.svg",
"website": "webpack.github.io"
},
"Woltlab Community Framework": {
"cats": [
18
],
"html": "var WCF_PATH[^>]+",
"script": "WCF\\..*\\.js",
"implies": "PHP",
"website": "www.woltlab.com",
"icon": "Woltlab Community Framework.png"
},
"xCharts": {
"cats": [
25
@ -9031,6 +9003,30 @@
"icon": "xui.png",
"script": "[^a-z]xui.*\\.js",
"website": "xuijs.com"
},
"List.js": {
"cats": [
12
],
"env": "^List$",
"icon": "List.js.png",
"script": "^list\\.(?:min\\.)?js$",
"website": "www.listjs.com"
},
"Shopery": {
"cats": [
6
],
"headers": {
"X-Shopery": ""
},
"icon": "Shopery.svg",
"implies": [
"PHP",
"Symfony",
"Elcodi"
],
"website": "shopery.com"
}
},
"categories": {

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" viewBox="-67.5 342.9 72.8 108.5"><style>.st0{fill:#ED5153;}</style><path d="M-31.1 342.9l5 8.7c1 1.8 1 4 0 5.8l-29.8 51.7 14.1 24.4c2.2 3.8 6.3 6.2 10.7 6.2 4.4 0 8.5-2.4 10.7-6.2l14.1-24.4-3.7-6.6-16 27.7c-1 1.8-3 2.9-5 2.9-2.1 0-4-1.1-5-2.9l-12.3-21.1 27.7-48 5 8.7c1 1.8 1 4 0 5.8l-19.3 33.5 3.8 6.6 21-36.4 13.8 23.9c2.1 3.7 2.1 8.2 0 11.9l-14 24.3c-2.1 3.7-8.8 12-20.8 12s-18.6-8.3-20.8-12l-14-24.3c-2.1-3.7-2.1-8.2 0-11.9l34.8-60.3" class="st0"/></svg>

After

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 109.5 124.5" style="enable-background:new 0 0 109.5 124.5;" xml:space="preserve">
<style type="text/css">
.st0{fill:#95BF47;}
.st1{fill:#5E8E3E;}
.st2{fill:#FFFFFF;}
</style>
<g>
<path class="st0" d="M95.9,24.2c-0.1-0.6-0.6-1-1.1-1c-0.5,0-10-0.7-10-0.7s-6.6-6.6-7.4-7.3c-0.7-0.7-2.2-0.5-2.7-0.3
c-0.1,0-1.5,0.4-3.7,1.1c-2.2-6.4-6.1-12.3-13-12.3c-0.2,0-0.4,0-0.6,0C55.4,1.1,53,0,50.9,0C34.8,0,27.1,20.1,24.7,30.3
c-6.2,1.9-10.7,3.3-11.2,3.5c-3.5,1.1-3.6,1.2-4,4.5C9.1,40.7,0,111.2,0,111.2l71,13.3l38.5-8.3C109.5,116.2,96,24.9,95.9,24.2z
M67,17.2c-1.8,0.6-3.8,1.2-6,1.9c0-0.4,0-0.8,0-1.3c0-4-0.6-7.2-1.4-9.7C63.2,8.5,65.5,12.5,67,17.2z M55.2,8.8
c1,2.5,1.6,6,1.6,10.8c0,0.2,0,0.5,0,0.7c-3.9,1.2-8.2,2.5-12.4,3.8C46.8,15,51.3,10.5,55.2,8.8z M50.4,4.3c0.7,0,1.4,0.2,2.1,0.7
c-5.1,2.4-10.7,8.5-13,20.7c-3.4,1.1-6.7,2.1-9.8,3C32.4,19.4,38.9,4.3,50.4,4.3z"/>
<path class="st1" d="M94.8,23.2c-0.5,0-10-0.7-10-0.7s-6.6-6.6-7.4-7.3c-0.3-0.3-0.6-0.4-1-0.5L71,124.5l38.5-8.3
c0,0-13.5-91.3-13.6-91.9C95.8,23.6,95.2,23.3,94.8,23.2z"/>
<path class="st2" d="M57.9,44.5l-4.7,14.1c0,0-4.2-2.2-9.2-2.2c-7.5,0-7.8,4.7-7.8,5.9c0,6.4,16.8,8.9,16.8,24
c0,11.9-7.5,19.5-17.7,19.5c-12.2,0-18.4-7.6-18.4-7.6l3.3-10.8c0,0,6.4,5.5,11.8,5.5c3.5,0,5-2.8,5-4.8c0-8.4-13.8-8.8-13.8-22.6
c0-11.6,8.3-22.9,25.2-22.9C54.7,42.6,57.9,44.5,57.9,44.5z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB