Fixed merge conflicts

main
ElbertF 13 years ago
commit 5d76f18685

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -32,11 +32,11 @@
26: { name: 'Mobile Framework', plural: 'Mobile Frameworks' },
27: { name: 'Programming Language', plural: 'Programming Languages' },
28: { name: 'Operating System', plural: 'Operating Systems' },
29: { name: 'Search Engine', plural: 'Search Engines'}
29: { name: 'Search Engine', plural: 'Search Engines'}
};
w.apps = {
'1und1': { cats: { 1: 6 }, url: /\/shop\/catalog\/browse\?sessid\=/ },
'1und1': { cats: { 1: 6 }, url: /\/shop\/catalog\/browse\?sessid\=/ },
'1C-Bitrix': { cats: { 1: 1 }, html: /<link[^>]+components\/bitrix/i, script: /1c\-bitrix/i },
'2z Project': { cats: { 1: 1 }, meta: { 'generator': /2z project/i } },
'AddThis': { cats: { 1: 5 }, script: /addthis\.com\/js/, env: /^addthis$/ },
@ -51,6 +51,7 @@
'ATG Web Commerce': { cats: { 1: 6 }, headers: { 'X-ATG-Version': /ATG/i }, html: /<[^>]+_DARGS/ },
'Atlassian Confluence': { cats: { 1: 8 }, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/confluence/i },
'Atlassian Jira': { cats: { 1: 13 }, env: /^jira$/i, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/jira/i, implies: [ 'Java' ] },
'Alloy': { cats: { 1: 12 }, env: /^AUI$/ },
'AWStats': { cats: { 1: 10 }, meta: { 'generator': /AWStats/i } },
'Banshee': { cats: { 1: 1, 2: 18 }, html: /Built upon the <a href=("|')[^>]+banshee-php\.org/i },
'Backbone.js': { cats: { 1: 12 }, script: /backbone.*\.js/, env: /^Backbone$/ },
@ -145,11 +146,11 @@
'Hiawatha': { cats: { 1: 22 }, headers: { 'Server': /Hiawatha/i } },
'Highcharts': { cats: { 1: 25 }, script: /highcharts.*\.js/, env: /^Highcharts$/ },
'Hotaru CMS': { cats: { 1: 1 }, meta: { 'generator': /Hotaru CMS/i } },
'Hybris': { cats: { 1: 6 }, html: /\/sys_master\/|\/hybr\//, header: { 'Set-Cookie': /_hybris/ }, implies: [ 'Java' ] },
'Hybris': { cats: { 1: 6 }, html: /\/sys_master\/|\/hybr\//, header: { 'Set-Cookie': /_hybris/ }, implies: [ 'Java' ] },
'IIS': { cats: { 1: 22 }, headers: { 'Server': /IIS/i }, implies: [ 'Windows Server' ] },
'Indexhibit': { cats: { 1: 1 }, html: /<link [^>]+ndxz-studio/i },
'InstantCMS': { cats: { 1: 1 }, meta: { 'generator': /InstantCMS/i } },
'Intershop': { cats: { 1: 6 }, url: /is-bin|INTERSHOP/i, script: /is-bin|INTERSHOP/i },
'Intershop': { cats: { 1: 6 }, url: /is-bin|INTERSHOP/i, script: /is-bin|INTERSHOP/i },
'IPB': { cats: { 1: 2 }, script: /jscripts\/ips_/, env: /^IPBoard/, html: /<link[^>]+ipb_[^>]+\.css/ },
'iWeb': { cats: { 1: 20 }, meta: { 'generator': /iWeb/i } },
'Jalios': { cats: { 1: 1 }, meta: { 'generator': /Jalios/i } },
@ -174,6 +175,7 @@
'Koobi': { cats: { 1: 1 }, meta: { 'generator': /Koobi/i } },
'lighttpd': { cats: { 1: 22 }, headers: { 'Server': /lighttpd/i } },
'LiveJournal': { cats: { 1: 11 }, url: /^(www.)?.+\.livejournal\.com/i },
'Liferay': { cats: { 1: 1 }, env: /^Liferay$/, headers: { 'Liferay-Portal': /.*/i } },
'Lotus Domino': { cats: { 1: 22 }, headers: { 'Server': /Lotus\-Domino/i } },
'Magento': { cats: { 1: 6 }, script: /\/(js\/mage|skin\/frontend\/(default|enterprise))\//, env: /^(Mage|VarienForm)$/, implies: [ 'PHP '] },
'Mambo': { cats: { 1: 1 }, meta: { 'generator': /Mambo/i } },
@ -211,7 +213,7 @@
'OpenCart': { cats: { 1: 6 }, html: /(Powered By <a href=("|')[^>]+OpenCart|route = getURLVar\(("|')route)/i },
'openEngine': { cats: { 1: 1 }, html: /<meta[^>]+openEngine/i },
'OpenGSE': { cats: { 1: 22 }, headers: { 'Server': /GSE/i } },
'OpenLayers': { cats: { 1: 5 }, script: /openlayers/, env:/^OpenLayers$/ },
'OpenLayers': { cats: { 1: 5 }, script: /openlayers/, env:/^OpenLayers$/ },
'Open Web Analytics': { cats: { 1: 10 }, html: /<!-- (Start|End) Open Web Analytics Tracker -->/, env: /^_?owa_/i },
'Optimizely': { cats: { 1: 10 }, env: /^optimizely/ },
'Oracle Recommendations On Demand': { cats: { 1: 10 }, script: /atgsvcs.+atgsvcs\.js/ },
@ -244,7 +246,7 @@
'Python': { cats: { 1: 27 } },
'Quantcast': { cats: { 1: 10 }, script: /edge\.quantserve\.com\/quant\.js/, env: /^quantserve$/ },
'Quick.Cart': { cats: { 1: 6 }, html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
'ReallyCMS' : { cats: { 1: 1 }, meta: { 'generator': /ReallyCMS/ } },
'ReallyCMS': { cats: { 1: 1 }, meta: { 'generator': /ReallyCMS/ } },
'Red Hat': { cats: { 1: 28 }, headers: { 'Server': /Red Hat/i, 'X-Powered-By': /Red Hat/i } },
'Raphael': { cats: { 1: 25 }, script: /raphael.*\.js/, env: /^Raphael$/ },
'reCAPTCHA': { cats: { 1: 16 }, script: /(api\-secure\.recaptcha\.net|recaptcha_ajax\.js)/, html: /<div[^>]+id=("|')recaptcha_image/, env: /^Recaptcha$/ },
@ -254,7 +256,7 @@
'RequireJS': { cats: { 1: 12 }, script: /require.*\.js/ , env: /^requirejs$/},
'Ruby': { cats: { 1: 27 }, headers: { 'Server': /(Mongrel|WEBrick|Ruby|mod_rails|mod_rack|Phusion.Passenger)/i, 'X-Powered-By': /(mod_rails|mod_rack|Phusion.Passenger)/i } },
'S.Builder': { cats: { 1: 1 }, meta: { 'generator': /S\.Builder/i } },
's9y': { cats: { 1: 1 }, meta: { 'generator': /Serendipity/i } },
's9y': { cats: { 1: 1 }, meta: { 'generator': /Serendipity/i, 'Powered-By': /Serendipity/i } },
'script.aculo.us': { cats: { 1: 12 }, script: /(scriptaculous|protoaculous)\.js/, env: /^Scriptaculous$/ },
'Sencha Touch': { cats: { 1: 26, 2: 12}, script: /sencha\-touch.*\.js/ },
'Seoshop': { cats: { 1: 6 }, html: /http:\/\/www\.getseoshop\.com/ },
@ -336,7 +338,7 @@
'YaBB': { cats: { 1: 2 }, html: /Powered by <a href=("|')[^>]+yabbforum/i },
'Yahoo! Web Analytics': { cats: { 1: 10 }, script: /d\.yimg\.com\/mi\/ywa\.js/ },
'Yandex.Metrika': { cats: { 1: 10 }, script: /mc\.yandex\.ru\/metrika\/watch\.js/ },
'YouTube': { cats: { 1: 14 }, html: /<(param|embed)[^>]+youtube\.com\/v/i },
'YouTube': { cats: { 1: 14 }, html: /<(param|embed|iframe)[^>]+youtube(-nocookie)?\.com\/(v|embed)/i },
'YUI Doc': { cats: { 1: 4 }, html: /<html[^>]* yuilibrary\.com\/rdf\/[0-9.]+\/yui\.rdf/i },
'YUI': { cats: { 1: 12 }, script: /\/yui\/|yui\.yahooapis\.com/, env: /^YAHOO$/ },
'Zen Cart': { cats: { 1: 6 }, meta: { 'generator': /Zen Cart/i } },