From 270dbacbc472dae660fe8b143df9c64b7f8279cf Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 16 Aug 2016 17:52:38 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7833e9d1..767aec41f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current Master
 
 - Added feature to reflect current conversion rates of current vault balance.
+- Changed transaction approval from notifications system to popup system.
 
 ## 2.8.0 2016-08-15
 
-- 
cgit v1.2.3


From 642e84da6c6fa03d8848c9e1ecb082949b990b9a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 22 Aug 2016 15:04:13 -0700
Subject: Merge master

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2626616..d2db94a4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,13 @@
 
 ## Current Master
 
+- Changed transaction approval from notifications system to popup system.
+
 ## 2.9.0 2016-08-22
 
 - Added ShapeShift to the transaction history
 - Added affiliate key to Shapeshift requests
 - Added feature to reflect current conversion rates of current vault balance.
-- Changed transaction approval from notifications system to popup system.
 - Modify balance display logic.
 
 ## 2.8.0 2016-08-15
-- 
cgit v1.2.3


From df824c0c45f9ae569192b1eb0f3ba2177aad7cc1 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Thu, 25 Aug 2016 14:16:57 -0700
Subject: Add to CHANGELOG

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf5255497..636d6d76d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Current Master
 
+- Add a back button and and functionality to unlock screen so
+that you can recover your vault from seed or create a new one
+if you forget your password.
+
 ## 2.9.0 2016-08-22
 
 - Added ShapeShift to the transaction history
@@ -12,7 +16,7 @@
 ## 2.8.0 2016-08-15
 
 - Integrate ShapeShift
-- Add a for for Coinbase to specify amount to buy
+- Add a form for Coinbase to specify amount to buy
 - Fix various typos.
 - Make dapp-metamask connection more reliable
 - Remove Ethereum Classic from provider menu.
-- 
cgit v1.2.3


From ca4127dd5e5324421061e7d5557cdadd32a00186 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 25 Aug 2016 15:27:19 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e6bc5299..2257eab75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 ## Current Master
 
+- Forms now retain their values even when closing the popup and reopening it.
+
 ## 2.9.2 2016-08-24
 
 - Fixed shortcut bug from preventing installation.
 
-
 ## 2.9.1 2016-08-24
 
 - Added static image as fallback for when WebGL isn't supported.
-- 
cgit v1.2.3


From bb8241f711e3eaca55e92d461e89f1f02ff190cc Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 29 Aug 2016 11:14:18 -0700
Subject: Version 2.10.0

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a62ef00aa..126c0c0ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 ## Current Master
 
-- Add a back button and and functionality to unlock screen so
-that you can recover your vault from seed or create a new one
-if you forget your password.
+## 2.10.0 2016-08-29
+
 - Changed transaction approval from notifications system to popup system.
+- Add a back button to locked screen to allow restoring vault from seed words when password is forgotten.
 - Forms now retain their values even when closing the popup and reopening it.
+- Fixed a spelling error in provider menu.
 
 ## 2.9.2 2016-08-24
 
-- 
cgit v1.2.3


From e39513ff1806128609588a0dce8bfed0d994188a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 29 Aug 2016 12:37:38 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 126c0c0ab..462001f51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Fix bug where provider menu did not allow switching to custom network from a custom network.
+
 ## 2.10.0 2016-08-29
 
 - Changed transaction approval from notifications system to popup system.
-- 
cgit v1.2.3


From a6e3357d222486b5efe4e8a196e7841cf4154193 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 1 Sep 2016 11:33:54 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 462001f51..0e705adef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current Master
 
 - Fix bug where provider menu did not allow switching to custom network from a custom network.
+- Sending a transaction from within MetaMask no longer triggers a popup.
 
 ## 2.10.0 2016-08-29
 
-- 
cgit v1.2.3


From 8b37bcf16b4bbc6dcfd24e38f8f6f492555b619a Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 2 Sep 2016 12:48:50 -0700
Subject: Version 2.10.1

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e705adef..d25ee284a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,11 @@
 
 ## Current Master
 
+## 2.10.1 2016-09-02
+
 - Fix bug where provider menu did not allow switching to custom network from a custom network.
 - Sending a transaction from within MetaMask no longer triggers a popup.
+- Fix Ethereum JSON RPC Filters bug.
 
 ## 2.10.0 2016-08-29
 
-- 
cgit v1.2.3


From c2a1b442e9c54b29a6f9a5bcf563a847373f5c4a Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 2 Sep 2016 13:51:22 -0700
Subject: Version 2.10.2

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d25ee284a..0affb2477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Current Master
 
+## 2.10.2 2016-09-02
+
+- Fix bug where notification popup would not display.
+
 ## 2.10.1 2016-09-02
 
 - Fix bug where provider menu did not allow switching to custom network from a custom network.
-- 
cgit v1.2.3


From 2d0077d5c67e5861628e865c1477878f3277d10d Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Fri, 2 Sep 2016 14:15:00 -0700
Subject: Changelog add and rename vars.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e705adef..d608fd976 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fix bug where provider menu did not allow switching to custom network from a custom network.
 - Sending a transaction from within MetaMask no longer triggers a popup.
+- The ability to build without livereload features (such as for production) can be enabled with the gulp --disableLiveReload
 
 ## 2.10.0 2016-08-29
 
-- 
cgit v1.2.3


From f9f821e72650046466b9c1f0694a1cdb0c1e637c Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Fri, 2 Sep 2016 14:15:15 -0700
Subject: Changelog add.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d608fd976..1f414e0fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 - Fix bug where provider menu did not allow switching to custom network from a custom network.
 - Sending a transaction from within MetaMask no longer triggers a popup.
-- The ability to build without livereload features (such as for production) can be enabled with the gulp --disableLiveReload
+- The ability to build without livereload features (such as for production) can be enabled with the gulp --disableLiveReload flag.
 
 ## 2.10.0 2016-08-29
 
-- 
cgit v1.2.3


From 41632114c0ec8e92d7594a41fec4dfd0f9d7f832 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 6 Sep 2016 10:25:14 -0700
Subject: Add to changelog.

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 178879e8a..83d576651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- On fresh install, open a new tab with the MetaMask Introduction video.
+
 ## 2.10.2 2016-09-02
 
 - Fix bug where notification popup would not display.
-- 
cgit v1.2.3


From 01618a88aa28a1302908b393428397e7a29416b4 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 6 Sep 2016 15:30:30 -0700
Subject: Update changelog and merge master.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83d576651..9021fdf01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current Master
 
 - On fresh install, open a new tab with the MetaMask Introduction video.
+- Block negative values from transactions.
 
 ## 2.10.2 2016-09-02
 
-- 
cgit v1.2.3


From e75a1d63f718037aa2f77785f42eccd1ffd9f449 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 6 Sep 2016 17:31:24 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 178879e8a..f9bdf7154 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Add fiat conversion values to more views.
+
 ## 2.10.2 2016-09-02
 
 - Fix bug where notification popup would not display.
-- 
cgit v1.2.3


From 2564c0c51c39e428540e38b80558e45ec44357a8 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 6 Sep 2016 18:57:18 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9021fdf01..bea356ab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - On fresh install, open a new tab with the MetaMask Introduction video.
 - Block negative values from transactions.
+- Fixed a memory leak.
 
 ## 2.10.2 2016-09-02
 
-- 
cgit v1.2.3


From a1e9b951acae8c02d7aab1369667b677aabb53b3 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 8 Sep 2016 12:51:14 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c20aa11d3..8f884b61f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - On fresh install, open a new tab with the MetaMask Introduction video.
 - Block negative values from transactions.
 - Fixed a memory leak.
+- MetaMask logo now renders as super lightweight SVG, improving compatibility and performance.
 
 ## 2.10.2 2016-09-02
 
-- 
cgit v1.2.3


From 7d8491de106c798727f5f57b08453f2133d144e7 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Thu, 8 Sep 2016 13:13:43 -0700
Subject: Add to CHANGELOG.md and Remove unnecessary catch

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c20aa11d3..4e44f603d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- Add network checks for unconfirmed transactions.
 - Add fiat conversion values to more views.
 - On fresh install, open a new tab with the MetaMask Introduction video.
 - Block negative values from transactions.
-- 
cgit v1.2.3


From ece1ecb90b6b013b5ea6f81de562d4a391d0f700 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Thu, 8 Sep 2016 14:53:49 -0700
Subject: Fix wording in changelog and bug

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e44f603d..6a49897d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Current Master
 
-- Add network checks for unconfirmed transactions.
+- Fix bug where pending transactions from Test net (or other networks) show up In Main net.
 - Add fiat conversion values to more views.
 - On fresh install, open a new tab with the MetaMask Introduction video.
 - Block negative values from transactions.
-- 
cgit v1.2.3


From 2f98d5bc0f1f83bf808ff4cc98a66a5e1800a605 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 8 Sep 2016 19:50:55 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dee1089c..be65b95d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Block negative values from transactions.
 - Fixed a memory leak.
 - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance.
+- Now only initially creates one wallet when restoring a vault, to reduce some users' confusion.
 
 ## 2.10.2 2016-09-02
 
-- 
cgit v1.2.3


From 7b6c018c3978f11d05fe3854a1f4072d3446b4b2 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 8 Sep 2016 19:53:54 -0700
Subject: Show loading indication during unlocking.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dee1089c..19628ce3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Block negative values from transactions.
 - Fixed a memory leak.
 - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance.
+- Now showing loading indication during vault unlocking, to clarify behavior for users who are experience slow unlocks.
 
 ## 2.10.2 2016-09-02
 
-- 
cgit v1.2.3


From 5e38f48f411755e585c0f2add80a748424288db0 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Fri, 9 Sep 2016 14:24:16 -0700
Subject: Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4548480ec..9d89c2438 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 - Fix bug where pending transactions from Test net (or other networks) show up In Main net.
 - Add fiat conversion values to more views.
-- On fresh install, open a new tab with the MetaMask Introduction video.
+- On fresh install, open a new tab with the MetaMask Introduction video. Does not open on update.
 - Block negative values from transactions.
 - Fixed a memory leak.
 - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance.
-- 
cgit v1.2.3


From 03168c6b91f024d928c426868facc556f3ba427c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 9 Sep 2016 19:52:37 -0700
Subject: Bump changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d89c2438..ff1d4c2e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance.
 - Now showing loading indication during vault unlocking, to clarify behavior for users who are experience slow unlocks.
 - Now only initially creates one wallet when restoring a vault, to reduce some users' confusion.
+- Improved the security of vault encryption by ensuring passwords are always uniquely salted.
 
 ## 2.10.2 2016-09-02
 
-- 
cgit v1.2.3


From c37c050c8a119e4c2de1edea474c3c3d5ad1cf99 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Mon, 12 Sep 2016 10:34:06 -0700
Subject: Revert "Add new eth-lightwallet salting to vault."

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff1d4c2e7..9d89c2438 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,6 @@
 - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance.
 - Now showing loading indication during vault unlocking, to clarify behavior for users who are experience slow unlocks.
 - Now only initially creates one wallet when restoring a vault, to reduce some users' confusion.
-- Improved the security of vault encryption by ensuring passwords are always uniquely salted.
 
 ## 2.10.2 2016-09-02
 
-- 
cgit v1.2.3