aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas <thomas.b.huang@gmail.com>2018-08-10 01:09:53 +0800
committerThomas <thomas.b.huang@gmail.com>2018-08-10 01:09:53 +0800
commit500ef5cb3ae3cf9eddc97f74d5e911b972cbf06d (patch)
treeaa74253093a43b85743450c35afd9ae44a7ce031
parent09b81a2d22679a51b2e804fdb5f5d85bdf78a66b (diff)
downloadtangerine-wallet-browser-500ef5cb3ae3cf9eddc97f74d5e911b972cbf06d.tar.gz
tangerine-wallet-browser-500ef5cb3ae3cf9eddc97f74d5e911b972cbf06d.tar.zst
tangerine-wallet-browser-500ef5cb3ae3cf9eddc97f74d5e911b972cbf06d.zip
Merge branch 'master' into develop
-rw-r--r--CHANGELOG.md21
-rw-r--r--app/manifest.json2
2 files changed, 14 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea5d90500..4858bda47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,22 @@
# Changelog
-## Current Master
+## Current Develop Branch
- [#4884](https://github.com/MetaMask/metamask-extension/pull/4884): Allow to have tokens per account and network.
-## 4.9.0 Tue Aug 07 2018
-
-- Add new tokens auto detection
-- Remove rejected transactions from transaction history
-- Add Trezor Support
-- Allow to remove accounts (Imported and Hardware Wallets)
+## 4.9.0 Mon Aug 07 2018
+
+- [#4926](https://github.com/MetaMask/metamask-extension/pull/4926): Show retry button on the latest tx of the earliest nonce.
+- [#4888](https://github.com/MetaMask/metamask-extension/pull/4888): Suggest using the new user interface.
+- [#4947](https://github.com/MetaMask/metamask-extension/pull/4947): Prevent sending multiple transasctions on multiple confirm clicks.
+- [#4844](https://github.com/MetaMask/metamask-extension/pull/4844): Add new tokens auto detection.
+- [#4667](https://github.com/MetaMask/metamask-extension/pull/4667): Remove rejected transactions from transaction history.
+- [#4625](https://github.com/MetaMask/metamask-extension/pull/4625): Add Trezor Support.
+- [#4625](https://github.com/MetaMask/metamask-extension/pull/4625/commits/523cf9ad33d88719520ae5e7293329d133b64d4d): Allow to remove accounts (Imported and Hardware Wallets)
+- [#4814](https://github.com/MetaMask/metamask-extension/pull/4814): Add hex data input to send screen.
+- [#4691](https://github.com/MetaMask/metamask-extension/pull/4691): Redesign of the Confirm Transaction Screen.
- [#4840](https://github.com/MetaMask/metamask-extension/pull/4840): Now shows notifications when transactions are completed.
-- [#4855](https://github.com/MetaMask/metamask-extension/pull/4855): network.js: convert rpc protocol to lower case.
+- [#4855](https://github.com/MetaMask/metamask-extension/pull/4855): Allow the use of HTTP prefix for custom rpc urls.
## 4.8.0 Thur Jun 14 2018
diff --git a/app/manifest.json b/app/manifest.json
index ed328f19f..fd6a40e0e 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
- "version": "4.8.0",
+ "version": "4.9.0",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",