aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-08-25 06:03:09 +0800
committerDan Finlay <dan@danfinlay.com>2016-08-25 06:03:09 +0800
commit4e34796983e399c05f18c3bd1355e2eea83ad891 (patch)
treefa6a12a7ff31641017ef4e3f7a8dbe208d72bc07
parentbc43e3d1406e42783b6983e87a947d51218d1923 (diff)
parent55745c59805e691e75b2ceabdbc353032971cc8e (diff)
downloadtangerine-wallet-browser-4e34796983e399c05f18c3bd1355e2eea83ad891.tar
tangerine-wallet-browser-4e34796983e399c05f18c3bd1355e2eea83ad891.tar.gz
tangerine-wallet-browser-4e34796983e399c05f18c3bd1355e2eea83ad891.tar.bz2
tangerine-wallet-browser-4e34796983e399c05f18c3bd1355e2eea83ad891.tar.lz
tangerine-wallet-browser-4e34796983e399c05f18c3bd1355e2eea83ad891.tar.xz
tangerine-wallet-browser-4e34796983e399c05f18c3bd1355e2eea83ad891.tar.zst
tangerine-wallet-browser-4e34796983e399c05f18c3bd1355e2eea83ad891.zip
Merge branch 'master' into PopupNotifications
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/manifest.json10
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25f308d78..5cb0fc044 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
- Added static image as fallback for when WebGL isn't supported.
- Transaction history now has a hard limit.
- Added info link on account screen that visits Etherscan.
+- Added shortcut to open MetaMask (Ctrl+Alt+M or Cmd+Opt/Alt+M)
## 2.9.0 2016-08-22
diff --git a/app/manifest.json b/app/manifest.json
index 09bc9eb37..c1b9ee817 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -4,6 +4,16 @@
"version": "2.9.0",
"manifest_version": 2,
"description": "Ethereum Browser Extension",
+ "commands": {
+ "_execute_browser_action": {
+ "suggested_key": {
+ "windows": "Ctrl+Alt+M",
+ "mac": "Command+Alt+M",
+ "chromeos": "Ctrl+Alt+M",
+ "linux": "Ctrl+Alt+M"
+ }
+ }
+ },
"icons": {
"16": "images/icon-16.png",
"128": "images/icon-128.png"