Merge branch 'master' into patch-1

bin/wappalyzer-build

@@ -24,7 +24,7 @@ node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZ
 
 echo "Compressing PNG and SVG icons..."
 
-node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons 2>&1 > /dev/null
 
 echo "Converting SVG icons to PNG..."
 

bin/wappalyzer-validate-regex

@@ -80,7 +80,7 @@ for ( app in json.apps ) {
 		}
 	});
 
-	if ( /[a-z]+:\/\//i.test(json.apps[app].website) ) {
-		throw new Error('Do not include the protocol in the website URL\n' + app + ': ' + json.apps[app].website);
+	if ( !/^https?:\/\//i.test(json.apps[app].website) ) {
+		throw new Error('Invalid website URL\n' + app + ': ' + json.apps[app].website);
 	}
 }

src/drivers/bookmarklet/driver.js

@@ -13,7 +13,7 @@
 		d             = window.document,
 		container     = d.getElementById('wappalyzer-container'),
 		domain        = window.top.location.host,
-		url           = window.top.location.href,
+		url           = window.top.location.href.replace(/#.*$/, ''),
 		hasOwn        = Object.prototype.hasOwnProperty;
 
 	w.driver = {

src/drivers/chrome/js/driver.js

@@ -218,7 +218,7 @@
 		 */
 		ping: function() {
 			if ( Object.keys(w.ping.hostnames).length && parseInt(localStorage['tracking'], 10) ) {
-				w.driver.post('http://ping.wappalyzer.com/ping/v2/', w.ping);
+				w.driver.post('http://ping.wappalyzer.com/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 

src/drivers/chrome/manifest.json

@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context",
 	"description": "Identifies software on the web",
-	"version": "2.50",
+	"version": "2.51",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

src/drivers/firefox/driver.js

@@ -450,8 +450,7 @@
 					}).post();
 				};
 
-				//post('http://ping.wappalyzer.com/ping/v2/', w.ping);
-				post('http://wappalyzer.local/ping/v3/', w.ping);
+				post('http://ping.wappalyzer.com/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 

src/drivers/firefox/package.json

@@ -2,13 +2,13 @@
   "name": "wappalyzer",
   "title": "Wappalyzer",
 	"homepage": "https://wappalyzer.com",
-	"icon": "images/icon48_hot.png",
-	"icon64": "images/icon64_hot.png",
+	"icon": "images/icon48.png",
+	"icon64": "images/icon64.png",
   "id": "wappalyzer@crunchlabz.com",
   "description": "Identifies software on the web",
   "author": "Elbert Alias",
   "license": "GPLv3",
-  "version": "3.2.8",
+  "version": "3.2.10",
 	"main": "driver.js",
 	"preferences": [{
 		"name": "tracking",

src/drivers/phantomjs/driver.js

@@ -88,7 +88,7 @@
 
 						apps.push({
 							name: app,
-							confidence: wappalyzer.detected[url][app].confidenceTotal,
+							confidence: wappalyzer.detected[url][app].confidenceTotal.toString(),
 							version:    wappalyzer.detected[url][app].version,
 							icon:       wappalyzer.apps[app].icon,
 							categories: cats

src/drivers/phantomjs/package.json

@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {

src/icons/default.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
+    <title>Favicon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Favicons" transform="translate(-164.000000, -377.000000)">
+            <g id="Group-Copy-2" transform="translate(75.000000, 359.000000)">
+                <g id="Favicon" transform="translate(89.000000, 18.000000)">
+                    <g id="Logo-Mark">
+                        <polygon id="Fill-1-Copy" fill="#1C0172" points="2.43005371 6.96862793 0.0947772033 8.57397113 0.094533725 8.92865155 7.03719459 13.9881979 13.9794902 8.92889897 13.9799772 8.57434227 11.8363037 6.93737793"></polygon>
+                        <polygon id="Fill-2-Copy" fill="#4608AD" points="7.03719459 3.71134021e-05 0.0948989424 5.05933608 0.094533725 5.41401649 7.03719459 10.4736866 13.9794902 5.41426392 13.9798555 5.05958351"></polygon>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>