From ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 5 Dec 2017 13:11:59 -0330 Subject: [PATCH] Merge branch 'master' into NewUI-flat-merge-with-master --- CHANGELOG.md | 6 +++ ISSUE_TEMPLATE | 6 +-- app/scripts/background.js | 9 ++-- app/scripts/controllers/network.js | 2 +- app/scripts/inpage.js | 7 +++ app/scripts/lib/inpage-provider.js | 4 +- app/scripts/metamask-controller.js | 47 ++++++++++++++-- app/scripts/migrations/020.js | 41 ++++++++++++++ app/scripts/migrations/index.js | 1 + app/scripts/notice-controller.js | 44 +++++++++------ gulpfile.js | 8 ++- mascara/src/app/first-time/notice-screen.js | 2 +- notices/archive/notice_3.md | 11 ++++ notices/notice-nonce.json | 2 +- notices/notices.json | 2 +- package.json | 6 ++- test/integration/lib/mascara-first-time.js | 59 +++++++++------------ test/unit/metamask-controller-test.js | 33 ++++++++++++ ui/app/first-time/init-menu.js | 7 ++- 19 files changed, 226 insertions(+), 71 deletions(-) create mode 100644 app/scripts/migrations/020.js create mode 100644 notices/archive/notice_3.md diff --git a/CHANGELOG.md b/CHANGELOG.md index ee9548606..009cd5f7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Current Master +## 3.12.1 2017-11-29 + +- Fix bug where a user could be shown two different seed phrases. +- Detect when multiple web3 extensions are active, and provide useful error. +- Adds notice about seed phrase backup. + ## 3.12.0 2017-10-25 - Add support for alternative ENS TLDs (Ethereum Name Service Top-Level Domains). diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE index d0ff3c08e..b56d08d95 100644 --- a/ISSUE_TEMPLATE +++ b/ISSUE_TEMPLATE @@ -1,7 +1,7 @@