Merge remote-tracking branch 'upstream/master'

main
Alessandro Lepore 12 years ago
commit 3eab6d9eea

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

@ -528,7 +528,7 @@
"Drupal": {
"cats": [ 1 ],
"script": "drupal\\.js",
"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
"env": "^Drupal$",
"implies": [ "PHP" ]
@ -688,7 +688,7 @@
"env": "^WebFonts$"
},
"Google Maps": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
},
"Google PageSpeed": {
@ -1194,6 +1194,9 @@
"node.js": {
"cats": [ 27 ]
},
"Nokia Maps": {
"cats": [ 35 ]
},
"NOIX": {
"cats": [ 19 ],
"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@ -1232,7 +1235,7 @@
"implies": [ "Java" ]
},
"OpenLayers": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "openlayers",
"env": "^OpenLayers$"
},
@ -1734,7 +1737,7 @@
"Twitter Bootstrap": {
"cats": [ 18 ],
"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
"html": "<link[^>]+bootstrap[^>"]+css",
"html": "<link[^>]+bootstrap[^>\"]+css",
"env": "^Twipsy$\\;confidence:50"
},
"Typekit": {

@ -528,7 +528,7 @@
"Drupal": {
"cats": [ 1 ],
"script": "drupal\\.js",
"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
"env": "^Drupal$",
"implies": [ "PHP" ]
@ -688,7 +688,7 @@
"env": "^WebFonts$"
},
"Google Maps": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
},
"Google PageSpeed": {
@ -1194,6 +1194,9 @@
"node.js": {
"cats": [ 27 ]
},
"Nokia Maps": {
"cats": [ 35 ]
},
"NOIX": {
"cats": [ 19 ],
"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@ -1232,7 +1235,7 @@
"implies": [ "Java" ]
},
"OpenLayers": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "openlayers",
"env": "^OpenLayers$"
},
@ -1734,7 +1737,7 @@
"Twitter Bootstrap": {
"cats": [ 18 ],
"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
"html": "<link[^>]+bootstrap[^>"]+css",
"html": "<link[^>]+bootstrap[^>\"]+css",
"env": "^Twipsy$\\;confidence:50"
},
"Typekit": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

@ -528,7 +528,7 @@
"Drupal": {
"cats": [ 1 ],
"script": "drupal\\.js",
"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
"env": "^Drupal$",
"implies": [ "PHP" ]
@ -688,7 +688,7 @@
"env": "^WebFonts$"
},
"Google Maps": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
},
"Google PageSpeed": {
@ -1194,6 +1194,9 @@
"node.js": {
"cats": [ 27 ]
},
"Nokia Maps": {
"cats": [ 35 ]
},
"NOIX": {
"cats": [ 19 ],
"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@ -1232,7 +1235,7 @@
"implies": [ "Java" ]
},
"OpenLayers": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "openlayers",
"env": "^OpenLayers$"
},
@ -1734,7 +1737,7 @@
"Twitter Bootstrap": {
"cats": [ 18 ],
"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
"html": "<link[^>]+bootstrap[^>"]+css",
"html": "<link[^>]+bootstrap[^>\"]+css",
"env": "^Twipsy$\\;confidence:50"
},
"Typekit": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

@ -528,7 +528,7 @@
"Drupal": {
"cats": [ 1 ],
"script": "drupal\\.js",
"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
"env": "^Drupal$",
"implies": [ "PHP" ]
@ -688,7 +688,7 @@
"env": "^WebFonts$"
},
"Google Maps": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
},
"Google PageSpeed": {
@ -1194,6 +1194,9 @@
"node.js": {
"cats": [ 27 ]
},
"Nokia Maps": {
"cats": [ 35 ]
},
"NOIX": {
"cats": [ 19 ],
"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@ -1232,7 +1235,7 @@
"implies": [ "Java" ]
},
"OpenLayers": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "openlayers",
"env": "^OpenLayers$"
},
@ -1734,7 +1737,7 @@
"Twitter Bootstrap": {
"cats": [ 18 ],
"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
"html": "<link[^>]+bootstrap[^>"]+css",
"html": "<link[^>]+bootstrap[^>\"]+css",
"env": "^Twipsy$\\;confidence:50"
},
"Typekit": {

@ -49,6 +49,8 @@
<preference id="wappalyzer-cat32" name="extensions.wappalyzer.cat32" type="bool"/>
<preference id="wappalyzer-cat33" name="extensions.wappalyzer.cat33" type="bool"/>
<preference id="wappalyzer-cat34" name="extensions.wappalyzer.cat34" type="bool"/>
<preference id="wappalyzer-cat35" name="extensions.wappalyzer.cat35" type="bool"/>
<preference id="wappalyzer-cat36" name="extensions.wappalyzer.cat36" type="bool"/>
<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
</preferences>
@ -96,7 +98,7 @@
</columns>
<rows>
<row>
<checkbox preference="wappalyzer-cat31" label="&wappalyzer.cat36;"/><!-- Advertising networks-->
<checkbox preference="wappalyzer-cat36" label="&wappalyzer.cat36;"/><!-- Advertising networks-->
<checkbox preference="wappalyzer-cat10" label="&wappalyzer.cat10;"/><!-- Analytics -->
<checkbox preference="wappalyzer-cat11" label="&wappalyzer.cat11;"/><!-- Blogs -->
<checkbox preference="wappalyzer-cat23" label="&wappalyzer.cat23;"/><!-- Cache tools -->

@ -40,3 +40,6 @@ pref('extensions.wappalyzer.cat30', true);
pref('extensions.wappalyzer.cat31', true);
pref('extensions.wappalyzer.cat32', true);
pref('extensions.wappalyzer.cat33', true);
pref('extensions.wappalyzer.cat34', true);
pref('extensions.wappalyzer.cat35', true);
pref('extensions.wappalyzer.cat36', true);

@ -50,7 +50,7 @@
<!ENTITY wappalyzer.cat30 "Web mail">
<!ENTITY wappalyzer.cat31 "CDN">
<!ENTITY wappalyzer.cat32 "Marketing Automation">
<!ENTITY wappalyzer.cat33 "Web Server Extension">
<!ENTITY wappalyzer.cat34 "Database">
<!ENTITY wappalyzer.cat35 "Map">
<!ENTITY wappalyzer.cat36 "Advertizing Network">
<!ENTITY wappalyzer.cat33 "Web Server Extensions">
<!ENTITY wappalyzer.cat34 "Databases">
<!ENTITY wappalyzer.cat35 "Maps">
<!ENTITY wappalyzer.cat36 "Advertizing Networks">

@ -50,7 +50,7 @@
<!ENTITY wappalyzer.cat30 "Web Mail">
<!ENTITY wappalyzer.cat31 "CDN">
<!ENTITY wappalyzer.cat32 "Marketing Automation">
<!ENTITY wappalyzer.cat33 "Web Server Extension">
<!ENTITY wappalyzer.cat34 "Database">
<!ENTITY wappalyzer.cat35 "Map">
<!ENTITY wappalyzer.cat36 "Advertising Network">
<!ENTITY wappalyzer.cat33 "Web Server Extensions">
<!ENTITY wappalyzer.cat34 "Databases">
<!ENTITY wappalyzer.cat35 "Maps">
<!ENTITY wappalyzer.cat36 "Advertising Networks">

@ -50,7 +50,7 @@
<!ENTITY wappalyzer.cat30 "Web Mail">
<!ENTITY wappalyzer.cat31 "CDN">
<!ENTITY wappalyzer.cat32 "Marketing Automation">
<!ENTITY wappalyzer.cat33 "Web Server Extension">
<!ENTITY wappalyzer.cat34 "Database">
<!ENTITY wappalyzer.cat35 "Map">
<!ENTITY wappalyzer.cat36 "Advertizing Network">
<!ENTITY wappalyzer.cat33 "Web Server Extensions">
<!ENTITY wappalyzer.cat34 "Databases">
<!ENTITY wappalyzer.cat35 "Maps">
<!ENTITY wappalyzer.cat36 "Advertizing Networks">

@ -50,7 +50,7 @@
<!ENTITY wappalyzer.cat30 "Web Mail">
<!ENTITY wappalyzer.cat31 "CDN">
<!ENTITY wappalyzer.cat32 "Logiciel de marketing">
<!ENTITY wappalyzer.cat33 "Web Server Extension">
<!ENTITY wappalyzer.cat34 "Database">
<!ENTITY wappalyzer.cat35 "Map">
<!ENTITY wappalyzer.cat36 "Advertizing Network">
<!ENTITY wappalyzer.cat33 "Web Server Extensions">
<!ENTITY wappalyzer.cat34 "Databases">
<!ENTITY wappalyzer.cat35 "Maps">
<!ENTITY wappalyzer.cat36 "Advertizing Networks">

@ -49,7 +49,7 @@
<!ENTITY wappalyzer.cat30 "Web Mail">
<!ENTITY wappalyzer.cat31 "CDN">
<!ENTITY wappalyzer.cat32 "Marketing Automatisering">
<!ENTITY wappalyzer.cat33 "Web Server Extentie">
<!ENTITY wappalyzer.cat34 "Database">
<!ENTITY wappalyzer.cat35 "Map">
<!ENTITY wappalyzer.cat36 "Advertizing Network">
<!ENTITY wappalyzer.cat33 "Web Server Extenties">
<!ENTITY wappalyzer.cat34 "Databases">
<!ENTITY wappalyzer.cat35 "Landkaarten">
<!ENTITY wappalyzer.cat36 "Advertentie Netwerken">

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

@ -528,7 +528,7 @@
"Drupal": {
"cats": [ 1 ],
"script": "drupal\\.js",
"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
"env": "^Drupal$",
"implies": [ "PHP" ]
@ -688,7 +688,7 @@
"env": "^WebFonts$"
},
"Google Maps": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
},
"Google PageSpeed": {
@ -1194,6 +1194,9 @@
"node.js": {
"cats": [ 27 ]
},
"Nokia Maps": {
"cats": [ 35 ]
},
"NOIX": {
"cats": [ 19 ],
"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@ -1232,7 +1235,7 @@
"implies": [ "Java" ]
},
"OpenLayers": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "openlayers",
"env": "^OpenLayers$"
},
@ -1734,7 +1737,7 @@
"Twitter Bootstrap": {
"cats": [ 18 ],
"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
"html": "<link[^>]+bootstrap[^>"]+css",
"html": "<link[^>]+bootstrap[^>\"]+css",
"env": "^Twipsy$\\;confidence:50"
},
"Typekit": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

@ -528,7 +528,7 @@
"Drupal": {
"cats": [ 1 ],
"script": "drupal\\.js",
"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
"env": "^Drupal$",
"implies": [ "PHP" ]
@ -688,7 +688,7 @@
"env": "^WebFonts$"
},
"Google Maps": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
},
"Google PageSpeed": {
@ -1194,6 +1194,9 @@
"node.js": {
"cats": [ 27 ]
},
"Nokia Maps": {
"cats": [ 35 ]
},
"NOIX": {
"cats": [ 19 ],
"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@ -1232,7 +1235,7 @@
"implies": [ "Java" ]
},
"OpenLayers": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "openlayers",
"env": "^OpenLayers$"
},
@ -1734,7 +1737,7 @@
"Twitter Bootstrap": {
"cats": [ 18 ],
"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
"html": "<link[^>]+bootstrap[^>"]+css",
"html": "<link[^>]+bootstrap[^>\"]+css",
"env": "^Twipsy$\\;confidence:50"
},
"Typekit": {

@ -528,7 +528,7 @@
"Drupal": {
"cats": [ 1 ],
"script": "drupal\\.js",
"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
"env": "^Drupal$",
"implies": [ "PHP" ]
@ -688,7 +688,7 @@
"env": "^WebFonts$"
},
"Google Maps": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
},
"Google PageSpeed": {
@ -1194,6 +1194,9 @@
"node.js": {
"cats": [ 27 ]
},
"Nokia Maps": {
"cats": [ 35 ]
},
"NOIX": {
"cats": [ 19 ],
"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@ -1232,7 +1235,7 @@
"implies": [ "Java" ]
},
"OpenLayers": {
"cats": [ 5 ],
"cats": [ 35 ],
"script": "openlayers",
"env": "^OpenLayers$"
},
@ -1742,7 +1745,7 @@
"Twitter Bootstrap": {
"cats": [ 18 ],
"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
"html": "<link[^>]+bootstrap[^>"]+css",
"html": "<link[^>]+bootstrap[^>\"]+css",
"env": "^Twipsy$\\;confidence:50"
},
"Typekit": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

Loading…
Cancel
Save