Migrations
/
wappalyzer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge

Browse Source
main
q-- 12 years ago committed by Elbert Alias
parent 2eea1dd4cc
commit b707593e8d
8 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File

30
.gitattributes vendored
Unescape View File

@ -1,19 +1,19 @@
# End-of-line normalization # End-of-line normalization
* text=auto * text=auto
*.cmd text eol=lf *.cmd text eol=lf
*.sh text eol=lf *.sh text eol=lf
*.md text eol=lf *.md text eol=lf
*.json text eol=lf *.json text eol=lf
*.js text eol=lf *.js text eol=lf
*.html text eol=lf *.html text eol=lf
*.css text eol=lf *.css text eol=lf
*.manifest text eol=lf *.manifest text eol=lf
*.rdf text eol=lf *.rdf text eol=lf
*.xul text eol=lf *.xul text eol=lf
*.dtd text eol=lf *.dtd text eol=lf
*.properties text eol=lf *.properties text eol=lf
*.php text eol=lf *.php text eol=lf
*.png binary *.png binary
*.gif binary *.gif binary

4
drivers/bookmarklet/json
Unescape View File

@ -1582,11 +1582,7 @@
"Tumblr": { "Tumblr": {
"cats": [ 11 ], "cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com", "html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/" "url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" } "headers": { "X-Tumblr-Usec": ".*" }
}, },
"Twilight CMS": { "Twilight CMS": {

4
drivers/chrome/apps.json
Unescape View File

@ -1582,11 +1582,7 @@
"Tumblr": { "Tumblr": {
"cats": [ 11 ], "cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com", "html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/" "url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" } "headers": { "X-Tumblr-Usec": ".*" }
}, },
"Twilight CMS": { "Twilight CMS": {

4
drivers/firefox-jetpack/data/apps.json
Unescape View File

@ -1582,11 +1582,7 @@
"Tumblr": { "Tumblr": {
"cats": [ 11 ], "cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com", "html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/" "url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" } "headers": { "X-Tumblr-Usec": ".*" }
}, },
"Twilight CMS": { "Twilight CMS": {

4
drivers/firefox/content/apps.json
Unescape View File

@ -1582,11 +1582,7 @@
"Tumblr": { "Tumblr": {
"cats": [ 11 ], "cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com", "html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/" "url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" } "headers": { "X-Tumblr-Usec": ".*" }
}, },
"Twilight CMS": { "Twilight CMS": {

4
drivers/html/apps.json
Unescape View File

@ -1582,11 +1582,7 @@
"Tumblr": { "Tumblr": {
"cats": [ 11 ], "cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com", "html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/" "url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" } "headers": { "X-Tumblr-Usec": ".*" }
}, },
"Twilight CMS": { "Twilight CMS": {

4
drivers/php/apps.json
Unescape View File

@ -1582,11 +1582,7 @@
"Tumblr": { "Tumblr": {
"cats": [ 11 ], "cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com", "html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/" "url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" } "headers": { "X-Tumblr-Usec": ".*" }
}, },
"Twilight CMS": { "Twilight CMS": {

2
share/apps.json
Unescape View File

@ -1582,7 +1582,7 @@
"Tumblr": { "Tumblr": {
"cats": [ 11 ], "cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com", "html": "<iframe src=\\\"[^>]+tumblr\\.com",
"url": "^(www.)?[^/]+\\.tumblr\\.com", "url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
"headers": { "X-Tumblr-Usec": ".*" } "headers": { "X-Tumblr-Usec": ".*" }
}, },
"Twilight CMS": { "Twilight CMS": {