Fixed merge conflict

main
Elbert Alias 9 years ago
parent 296ffa169e
commit cc4f831964

@ -1,6 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- "4.2.1" - "4.2.2"
sudo: false sudo: false
before_install: before_install:
- export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR

@ -29,9 +29,9 @@ echo "Validating apps.json..."
jsonlint --quiet -V $WAPPALYZER_ROOT/schema.json $path/apps.json jsonlint --quiet -V $WAPPALYZER_ROOT/schema.json $path/apps.json
# echo "Validating regular expressions..." echo "Validating regular expressions..."
#
# wappalyzer validate-regex wappalyzer validate-regex
echo "Validating icons..." echo "Validating icons..."

@ -131,7 +131,7 @@
6 6
], ],
"headers": { "headers": {
"OracleCommerceCloud-Version": ".*\\;version:\\1" "OracleCommerceCloud-Version": "(.*)\\;version:\\1"
}, },
"html": "<[^>]+id=\"oracle-cc\"", "html": "<[^>]+id=\"oracle-cc\"",
"website": "cloud.oracle.com/commerce-cloud", "website": "cloud.oracle.com/commerce-cloud",
@ -421,7 +421,7 @@
"env": "^angular$", "env": "^angular$",
"script": [ "script": [
"angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+(\\-?rc[.\\d]*)*)/angular(\\.min)?\\.js\\;version:\\1", "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
"angular.*\\.js" "angular.*\\.js"
], ],
"website": "angularjs.org", "website": "angularjs.org",
@ -606,7 +606,7 @@
13 13
], ],
"env": "^jira$", "env": "^jira$",
"html": "Powered by\\s+<a href=[^>]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(\\.\\d+)?))?\\;version:\\1", "html": "Powered by\\s+<a href=[^>]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(?:\\.\\d+)?))?\\;version:\\1",
"implies": "Java", "implies": "Java",
"meta": { "meta": {
"ajs-version-number": "([\\d\\.]+)\\;version:\\1", "ajs-version-number": "([\\d\\.]+)\\;version:\\1",
@ -795,7 +795,7 @@
12 12
], ],
"implies": "Google Analytics", "implies": "Google Analytics",
"script": "boba(\\.min)?\\.js", "script": "boba(?:\\.min)?\\.js",
"website": "boba.space150.com", "website": "boba.space150.com",
"icon": "Boba.js.png" "icon": "Boba.js.png"
}, },
@ -1830,7 +1830,7 @@
"cats": [ "cats": [
36 36
], ],
"script": "googletagservices\\.com/tag/js/gpt(_mobile|)\\.js", "script": "googletagservices\\.com/tag/js/gpt(?:_mobile)?\\.js",
"website": "www.google.com/dfp", "website": "www.google.com/dfp",
"icon": "DoubleClick for Publishers (DFP).png" "icon": "DoubleClick for Publishers (DFP).png"
}, },
@ -2078,7 +2078,7 @@
], ],
"html": "<link[^>]+?href=\"[^\"]+epoch(?:\\.min)?\\.css", "html": "<link[^>]+?href=\"[^\"]+epoch(?:\\.min)?\\.css",
"implies": "D3", "implies": "D3",
"script": "epoch(\\.min)?\\.js", "script": "epoch(?:\\.min)?\\.js",
"website": "fastly.github.io/epoch", "website": "fastly.github.io/epoch",
"icon": "Epoch.png" "icon": "Epoch.png"
}, },
@ -2096,7 +2096,7 @@
27 27
], ],
"headers": { "headers": {
"Server": "Erlang( OTP/([\\-\\d\\.ABR]+))?\\;version:\\1" "Server": "Erlang( OTP/(?:[\\-\\d\\.ABR]+))?\\;version:\\1"
}, },
"website": "www.erlang.org", "website": "www.erlang.org",
"icon": "Erlang.png" "icon": "Erlang.png"
@ -2816,7 +2816,7 @@
12 12
], ],
"env": "^Hammer$", "env": "^Hammer$",
"script": "hammer(\\.min)?\\.js", "script": "hammer(?:\\.min)?\\.js",
"website": "hammerjs.github.io", "website": "hammerjs.github.io",
"icon": "Hammer.js.png" "icon": "Hammer.js.png"
}, },
@ -2920,7 +2920,7 @@
"env": "^Hogan$", "env": "^Hogan$",
"script": [ "script": [
"hogan-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "hogan-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"([\\d.]+)/hogan(\\.min)?\\.js\\;version:\\1" "([\\d.]+)/hogan(?:\\.min)?\\.js\\;version:\\1"
], ],
"website": "twitter.github.com/hogan.js", "website": "twitter.github.com/hogan.js",
"icon": "Hogan.js.png" "icon": "Hogan.js.png"
@ -3653,7 +3653,7 @@
"cats": [ "cats": [
12 12
], ],
"script": "lazy(\\.browser)?(\\.min)?\\.js", "script": "lazy(?:\\.browser)?(?:\\.min)?\\.js",
"website": "danieltao.com/lazy.js", "website": "danieltao.com/lazy.js",
"icon": "Lazy.js.png" "icon": "Lazy.js.png"
}, },
@ -4237,7 +4237,7 @@
1, 1,
6 6
], ],
"html": "(<script|link)[^>]*mg-(core|plugins|templates)", "html": "(?:<script|link)[^>]*mg-(?:core|plugins|templates)",
"implies": "PHP", "implies": "PHP",
"website": "moguta.ru", "website": "moguta.ru",
"icon": "Moguta.CMS.png" "icon": "Moguta.CMS.png"
@ -4992,7 +4992,7 @@
"cats": [ "cats": [
25 25
], ],
"script": "paths(\\.min)?\\.js", "script": "paths(?:\\.min)?\\.js",
"website": "github.com/andreaferretti/paths-js", "website": "github.com/andreaferretti/paths-js",
"icon": "Paths.js.png" "icon": "Paths.js.png"
}, },
@ -5451,7 +5451,7 @@
"html": "<[^>]+data-react", "html": "<[^>]+data-react",
"script": [ "script": [
"react(?:\\-with\\-addons)?(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "react(?:\\-with\\-addons)?(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+)/react(\\.min)?\\.js\\;version:\\1", "/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1",
"react.*\\.js" "react.*\\.js"
], ],
"website": "facebook.github.io/react", "website": "facebook.github.io/react",
@ -5513,7 +5513,7 @@
22 22
], ],
"headers": { "headers": {
"Server": "^Resin(?:/(\\S*))?;version=\\1" "Server": "^Resin(?:/(\\S*))?\\;version:\\1"
}, },
"implies": "Java", "implies": "Java",
"website": "caucho.com", "website": "caucho.com",
@ -5534,7 +5534,7 @@
], ],
"env": "^Rickshaw$", "env": "^Rickshaw$",
"implies": "D3", "implies": "D3",
"script": "rickshaw(\\.min)?\\.js", "script": "rickshaw(?:\\.min)?\\.js",
"website": "code.shutterstock.com/rickshaw/", "website": "code.shutterstock.com/rickshaw/",
"icon": "Rickshaw.png" "icon": "Rickshaw.png"
}, },
@ -5552,7 +5552,7 @@
12 12
], ],
"env": "^riot$", "env": "^riot$",
"script": "riot(?:\\+compiler)?(:?\\.min)?\\.js", "script": "riot(?:\\+compiler)?(?:\\.min)?\\.js",
"website": "muut.com/riotjs", "website": "muut.com/riotjs",
"icon": "Riot.png" "icon": "Riot.png"
}, },
@ -6120,7 +6120,7 @@
22 22
], ],
"headers": { "headers": {
"Server": "Snap/\\d+(\\.\\d+)+" "Server": "Snap/([.\\d]+)\\;version:\\1"
}, },
"implies": "Haskell", "implies": "Haskell",
"website": "snapframework.com", "website": "snapframework.com",
@ -6214,7 +6214,7 @@
"cats": [ "cats": [
19 19
], ],
"html": "<p class=\"footer\">&copy; [-\\d]+ Splunk Inc\\.(?: Splunk ([\\d\\.]+( build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1", "html": "<p class=\"footer\">&copy; [-\\d]+ Splunk Inc\\.(?: Splunk ([\\d\\.]+(?: build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1",
"meta": { "meta": {
"author": "Splunk Inc\\;confidence:50" "author": "Splunk Inc\\;confidence:50"
}, },
@ -6393,7 +6393,7 @@
], ],
"env": "^swal$", "env": "^swal$",
"html": "<link[^>]+?href=\"[^\"]+sweet-alert(?:\\.min)?\\.css", "html": "<link[^>]+?href=\"[^\"]+sweet-alert(?:\\.min)?\\.css",
"script": "sweet-alert(\\.min)?\\.js", "script": "sweet-alert(?:\\.min)?\\.js",
"website": "tristanedwards.me/sweetalert", "website": "tristanedwards.me/sweetalert",
"icon": "SweetAlert.png" "icon": "SweetAlert.png"
}, },
@ -6436,8 +6436,12 @@
"cats": [ "cats": [
19 19
], ],
<<<<<<< HEAD
"env": "^SyntaxHighlighter$", "env": "^SyntaxHighlighter$",
"html": "(<script|<link)[^>]*sh(Core|Brush|ThemeDefault)", "html": "(<script|<link)[^>]*sh(Core|Brush|ThemeDefault)",
=======
"html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
>>>>>>> 266a1e2b853d7e64e40b3ab4e8f6d2d442a6734b
"website": "github.com/syntaxhighlighter", "website": "github.com/syntaxhighlighter",
"icon": "SyntaxHighlighter.png" "icon": "SyntaxHighlighter.png"
}, },
@ -6740,7 +6744,7 @@
25 25
], ],
"env": "^twemoji$", "env": "^twemoji$",
"script": "twemoji(\\.min)?\\.js", "script": "twemoji(?:\\.min)?\\.js",
"website": "twitter.github.io/twemoji/", "website": "twitter.github.io/twemoji/",
"icon": "Twitter Emoji (Twemoji).png" "icon": "Twitter Emoji (Twemoji).png"
}, },
@ -6759,7 +6763,7 @@
], ],
"env": "^typeahead$", "env": "^typeahead$",
"implies": "jQuery\\;confidence:50", "implies": "jQuery\\;confidence:50",
"script": "(typeahead|bloodhound)(\\.jquery|\\.bundle)?(\\.min)?\\.js", "script": "(?:typeahead|bloodhound)\\.(?:jquery|bundle)?(?:\\.min)?\\.js",
"website": "twitter.github.io/typeahead.js", "website": "twitter.github.io/typeahead.js",
"icon": "Twitter typeahead.js.png" "icon": "Twitter typeahead.js.png"
}, },
@ -7094,7 +7098,7 @@
"env": "^Vue$", "env": "^Vue$",
"script": [ "script": [
"vue(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "vue(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+)/vue(\\.min)?\\.js\\;version:\\1", "/([\\d.]+)/vue(?:\\.min)?\\.js\\;version:\\1",
"vue.*\\.js\\;confidence:20" "vue.*\\.js\\;confidence:20"
], ],
"website": "vuejs.org", "website": "vuejs.org",
@ -7147,7 +7151,7 @@
22 22
], ],
"headers": { "headers": {
"Server": "^Warp/(\\d+(?:\\.\\d+)+)?$;version:\\1" "Server": "^Warp/(\\d+(?:\\.\\d+)+)?$\\;version:\\1"
}, },
"implies": "Haskell", "implies": "Haskell",
"website": "www.stackage.org/package/warp", "website": "www.stackage.org/package/warp",
@ -7419,7 +7423,7 @@
"cats": [ "cats": [
38 38
], ],
"html": "<title>Wowza Media Server \\d+ ((\\w+ Edition )?\\d+\\.[\\d\\.]+( build\\d+)?)?\\;version:\\1", "html": "<title>Wowza Media Server \\d+ ((?:\\w+ Edition )?\\d+\\.[\\d\\.]+(?: build\\d+)?)?\\;version:\\1",
"website": "www.wowza.com", "website": "www.wowza.com",
"icon": "Wowza Media Server.png" "icon": "Wowza Media Server.png"
}, },
@ -7447,7 +7451,7 @@
"cats": [ "cats": [
22 22
], ],
"html": "<title>XAMPP( Version ([\\d\\.]+))?</title>\\;version:\\1\\;confidence:90", "html": "<title>XAMPP(?: Version ([\\d\\.]+))?</title>\\;version:\\1\\;confidence:90",
"implies": [ "implies": [
"Apache", "Apache",
"MySQL", "MySQL",
@ -7487,7 +7491,7 @@
"env": "^XRegExp$", "env": "^XRegExp$",
"script": [ "script": [
"xregexp(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "xregexp(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+)/xregexp(\\.min)?\\.js\\;version:\\1", "/([\\d.]+)/xregexp(?:\\.min)?\\.js\\;version:\\1",
"xregexp.*\\.js" "xregexp.*\\.js"
], ],
"website": "xregexp.com", "website": "xregexp.com",
@ -8023,7 +8027,7 @@
"env": "^jQuery$", "env": "^jQuery$",
"script": [ "script": [
"jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"/([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
"jquery.*\\.js" "jquery.*\\.js"
], ],
"website": "jquery.com", "website": "jquery.com",
@ -8034,7 +8038,7 @@
26 26
], ],
"implies": "jQuery", "implies": "jQuery",
"script": "jquery\\.mobile(?:-([\\d.]+rc\\d))?.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1", "script": "jquery\\.mobile(?:-([\\d.]+rc\\d))?.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
"website": "jquerymobile.com", "website": "jquerymobile.com",
"icon": "jQuery Mobile.png" "icon": "jQuery Mobile.png"
}, },
@ -8054,7 +8058,7 @@
"implies": "jQuery", "implies": "jQuery",
"script": [ "script": [
"jquery-ui(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "jquery-ui(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"([\\d.]+)/jquery-ui(\\.min)?\\.js\\;version:\\1", "([\\d.]+)/jquery-ui(?:\\.min)?\\.js\\;version:\\1",
"jquery-ui.*\\.js" "jquery-ui.*\\.js"
], ],
"website": "jqueryui.com", "website": "jqueryui.com",
@ -8472,7 +8476,7 @@
25 25
], ],
"env": "^Shine$", "env": "^Shine$",
"script": "shine(\\.min)?\\.js", "script": "shine(?:\\.min)?\\.js",
"website": "bigspaceship.github.io/shine.js/", "website": "bigspaceship.github.io/shine.js/",
"icon": "shine.js.png" "icon": "shine.js.png"
}, },
@ -8586,7 +8590,7 @@
], ],
"env": "^vis$", "env": "^vis$",
"html": "<link[^>]+?href=\"[^\"]+vis(?:\\.min)?\\.css", "html": "<link[^>]+?href=\"[^\"]+vis(?:\\.min)?\\.css",
"script": "vis(\\.min)?\\.js", "script": "vis(?:\\.min)?\\.js",
"website": "visjs.org", "website": "visjs.org",
"icon": "vis.js.png" "icon": "vis.js.png"
}, },
@ -8648,7 +8652,7 @@
"env": "^yepnope$", "env": "^yepnope$",
"script": [ "script": [
"yepnope-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "yepnope-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
"([\\d.]+)/yepnope(\\.min)?\\.js\\;version:\\1", "([\\d.]+)/yepnope(?:\\.min)?\\.js\\;version:\\1",
"yepnope.*\\.js" "yepnope.*\\.js"
], ],
"website": "yepnopejs.com", "website": "yepnopejs.com",

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Loading…
Cancel
Save