Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -0,0 +1 @@
+wappalyzer.xpi

chrome/content/apps.js

@@ -50,7 +50,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
 		'Chamilo':               { cats: { 1: 21 }, html: /<meta name=("|')generator("|') [^>]+Chamilo/i, headers: { 'X-Powered-By': /Chamilo/ } },
 		'Cherokee':              { cats: { 1: 22 }, headers: { 'Server': /Cherokee/i } },
-		'ClickHeat':             { cats: { 1: 10 }, html: /<script[^>]*src=[^>]+clickheat[^>]*\.js/i, env: '/^clickHeatBrowser$/' }, 
+		'ClickHeat':             { cats: { 1: 10 }, html: /<script[^>]*src=[^>]+clickheat[^>]*\.js/i, env: '/^clickHeatBrowser$/' },
 		'ClickTale':             { cats: { 1: 10 }, html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/ },
 		'Clicky':                { cats: { 1: 10 }, html: /<script src=("|')http:\/\/static\.getclicky\.com/i },
 		'CMS Made Simple':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+CMS Made Simple/i },
@@ -144,6 +144,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Mynetcap':              { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Mynetcap/i },
 		'Nedstat':               { cats: { 1: 10 }, html: /sitestat\(("|')http:\/\/nl\.sitestat\.com/ },
 		'Nginx':                 { cats: { 1: 22 }, headers: { 'Server': /nginx/i } },
+		'NOIX':                  { cats: { 1: 19 }, html: /<[^>]+(src|href)=[^>]*(\/media\/noix)|<!\-\- NOIX/i },
 		'nopCommerce':           { cats: { 1:  6 }, html: /(<!\-\-Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)/i },
 		'OneStat':               { cats: { 1: 10 }, html: /var p=("|')http("|')\+\(d\.URL\.indexOf\('https:'\)==0\?'s':''\)\+("|'):\/\/stat\.onestat\.com\/stat\.aspx\?tagver/i },
 		'OpenCart':              { cats: { 1:  6 }, html: /(Powered By <a href=("|')[^>]+OpenCart|route = getURLVar\(("|')route)/i },

chrome/content/wappalyzer.js

@@ -11,6 +11,7 @@ var wappalyzer = (function() {
 		customApps:     '',
 		debug:          false,
 		enableTracking: true,
+		githubUrl:      'https://github.com/ElbertF/Wappalyzer',
 		history:        {},
 		hitCount:       0,
 		homeUrl:        'http://wappalyzer.com/',

chrome/content/wappalyzer.xul

@@ -32,12 +32,13 @@
 			<menupopup id="wappalyzer-menu">
 				<menuitem label="&wappalyzer.options;" oncommand="
 					window.openDialog('chrome://wappalyzer/content/options.xul', 'wappalyzer-options', 'chrome, dialog, centerscreen');
-					"/>
+					" image="chrome://wappalyzer/skin/options.png"/>
 				<menuseparator/>
-				<menuitem label="&wappalyzer.donate;"   oncommand="wappalyzer.openTab(wappalyzer.homeUrl + 'donate/');"/>
+				<menuitem label="&wappalyzer.donate;"       oncommand="wappalyzer.openTab(wappalyzer.homeUrl + 'donate/');"            image="chrome://wappalyzer/skin/donate.png"/>
-				<menuitem label="&wappalyzer.feedback;" oncommand="wappalyzer.openTab(wappalyzer.homeUrl + '?redirect=feedback');"/>
+				<menuitem label="&wappalyzer.feedback;"     oncommand="wappalyzer.openTab(wappalyzer.homeUrl + '?redirect=feedback');" image="chrome://wappalyzer/skin/feedback.png"/>
-				<menuitem label="&wappalyzer.twitter;"  oncommand="wappalyzer.openTab(wappalyzer.twitterUrl);"/>
+				<menuitem label="&wappalyzer.forkOnGithub;" oncommand="wappalyzer.openTab(wappalyzer.githubUrl);"                      image="chrome://wappalyzer/skin/github.ico"/>
-				<menuitem label="&wappalyzer.home;"     oncommand="wappalyzer.openTab(wappalyzer.homeUrl);"/>
+				<menuitem label="&wappalyzer.twitter;"      oncommand="wappalyzer.openTab(wappalyzer.twitterUrl);"                     image="chrome://wappalyzer/skin/twitter.ico"/>
+				<menuitem label="&wappalyzer.home;"         oncommand="wappalyzer.openTab(wappalyzer.homeUrl);"                        image="chrome://wappalyzer/skin/icon16x16_hot.ico"/>
 			</menupopup>
 		</hbox>
 	</hbox>

chrome/locale/en-US/wappalyzer.dtd

@@ -1,5 +1,6 @@
 <!ENTITY wappalyzer.title          "Wappalyzer">
 <!ENTITY wappalyzer.feedback       "Feedback">
+<!ENTITY wappalyzer.forkOnGithub   "Fork on Github">
 <!ENTITY wappalyzer.options        "Settings">
 <!ENTITY wappalyzer.custom         "Custom code">
 <!ENTITY wappalyzer.enableTracking "Allow anonymous application data collection for research">