Skip to content
This repository was archived by the owner on Jul 21, 2021. It is now read-only.

Commit 9b29230

Browse files
gorhillgorhill
committed
Bring uMatrix up to date
Notably: - Import logger improvements from uBO - Import CNAME uncloaking from uBO - Import more improvements from uBO - Make use of modern JS features This should un-stall further development of uMatrix.
1 parent 1d93674 commit 9b29230

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+24736
-16318
lines changed

‎.jshintrc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
"browser": true,
33
"devel": true,
44
"eqeqeq": true,
5-
"esnext": true,
5+
"esversion": 8,
66
"globals": {
77
"browser": false, // global variable in Firefox, Edge
88
"self": false,
99
"chrome": false,
10+
"log": false,
11+
"webext": false,
1012
"vAPI": false,
1113
"µMatrix": false
1214
},

‎dist/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.0
1+
1.4.1.0

‎platform/chromium/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"content_scripts": [
2323
{
2424
"matches": ["http://*/*", "https://*/*"],
25-
"js": ["/js/vapi-client.js", "/js/contentscript-start.js"],
25+
"js": ["/js/vapi.js", "/js/vapi-client.js", "/js/contentscript-start.js"],
2626
"run_at": "document_start",
2727
"all_frames": true
2828
},

0 commit comments

Comments
 (0)