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

Commit

Permalink
Bring uMatrix up to date
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
gorhill committed Dec 20, 2019
1 parent 1d93674 commit 9b29230
Show file tree
Hide file tree
Showing 91 changed files with 24,736 additions and 16,318 deletions.
4 changes: 3 additions & 1 deletion .jshintrc
Expand Up @@ -2,11 +2,13 @@
"browser": true,
"devel": true,
"eqeqeq": true,
"esnext": true,
"esversion": 8,
"globals": {
"browser": false, // global variable in Firefox, Edge
"self": false,
"chrome": false,
"log": false,
"webext": false,
"vAPI": false,
"µMatrix": false
},
Expand Down
2 changes: 1 addition & 1 deletion dist/version
@@ -1 +1 @@
1.4.0
1.4.1.0
2 changes: 1 addition & 1 deletion platform/chromium/manifest.json
Expand Up @@ -22,7 +22,7 @@
"content_scripts": [
{
"matches": ["http://*/*", "https://*/*"],
"js": ["/js/vapi-client.js", "/js/contentscript-start.js"],
"js": ["/js/vapi.js", "/js/vapi-client.js", "/js/contentscript-start.js"],
"run_at": "document_start",
"all_frames": true
},
Expand Down

1 comment on commit 9b29230

@uBlock-user
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any features still to be ported ?

Please sign in to comment.