diff --git a/CHANGELOG.md b/CHANGELOG.md index 76f8c808cbf3..43363b2e781d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Current Develop Branch + ## 0.0.5 Mon Feb 10 2020 - [#7912](https://github.com/MetaMask/metamask-extension/pull/7912): Disable import button for empty string/file - Fix: release file blob diff --git a/app/manifest.json b/app/manifest.json index 88904d789321..d6f8111dc062 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -32,7 +32,11 @@ }, "default_locale": "en", "background": { - "scripts": ["chromereload.js", "bg-libs.js", "background.js"], + "scripts": [ + "chromereload.js", + "bg-libs.js", + "background.js" + ], "persistent": true }, "browser_action": { @@ -50,14 +54,24 @@ }, "content_scripts": [ { - "matches": ["file://*/*", "http://*/*", "https://*/*"], - "js": ["contentscript.js"], + "matches": [ + "file://*/*", + "http://*/*", + "https://*/*" + ], + "js": [ + "contentscript.js" + ], "run_at": "document_start", "all_frames": true }, { - "matches": ["*://connect.trezor.io/*/popup.html"], - "js": ["vendor/trezor/content-script.js"] + "matches": [ + "*://connect.trezor.io/*/popup.html" + ], + "js": [ + "vendor/trezor/content-script.js" + ] } ], "permissions": [ @@ -72,9 +86,17 @@ "*://*.eth/", "notifications" ], - "web_accessible_resources": ["inpage.js", "phishing.html"], + "web_accessible_resources": [ + "inpage.js", + "phishing.html" + ], "externally_connectable": { - "matches": ["https://metamask.io/*", "https://conflux-chain.org/*"], - "ids": ["*"] + "matches": [ + "https://metamask.io/*", + "https://conflux-chain.org/*" + ], + "ids": [ + "*" + ] } }