tangerine-wallet-browser - Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' into messageManagerCleanUp	Frankie	2017-01-30	2	-4/+13
\|\
\| *	Merge pull request #1068 from MetaMask/kumavis-refactor3	Frankie	2017-01-30	2	-4/+13
\| \|\ \| \| \| \| \| \|	public config - get selectedAccount from keyring controller substate
\| \| *	metamask - lookup selectedAccount via keyringController	kumavis	2017-01-30	2	-3/+12
\| \| \|
\| \| *	public config - get selectedAccount from keyring controller substate	kumavis	2017-01-30	1	-1/+1
\| \| \|
* \| \|	Merge branch 'dev' into messageManagerCleanUp	Frankie	2017-01-29	12	-334/+274
\|\\| \|
\| * \|	Merge pull request #1062 from MetaMask/kumavis-refactor3	kumavis	2017-01-29	12	-339/+277
\| \|\\| \| \| \| \| \| \|	Kumavis refactor3
\| \| *	metamask - subscribe metamask store to keyringController substate	kumavis	2017-01-29	1	-0/+3
\| \| \|
\| \| *	migration 5 - move keyring controller state to substate	kumavis	2017-01-29	9	-112/+122
\| \| \|
\| \| *	keyring - add and initialize obs-store	kumavis	2017-01-29	2	-6/+36
\| \| \|
\| \| *	metamask - adopt shapeshift txs from keyringController	kumavis	2017-01-28	2	-2/+3
\| \| \|
\| \| *	tests - remove persistence and start with initial state	kumavis	2017-01-28	3	-124/+12
\| \| \|
\| \| *	metamask - organize methods	kumavis	2017-01-28	1	-120/+126
\| \|/
* \|	Clean up message manger includes:	Frankie	2017-01-29	20	-179/+185
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
* \|	Merge branch 'dev' into messageManagerCleanUp	Frankie	2017-01-28	7	-198/+208
\|\\|
\| *	Merge pull request #1058 from MetaMask/kumavis-refactor2	Frankie	2017-01-28	7	-198/+208
\| \|\ \| \| \| \| \| \|	Ongoing refactor and cleanup
\| \| *	metamask - fix setupProviderConnection	kumavis	2017-01-27	1	-1/+1
\| \| \|
\| \| *	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2	kumavis	2017-01-27	1	-2/+0
\| \| \|\ \| \| \|/ \| \|/\|
\| \| *	keymanager - small clean	kumavis	2017-01-27	1	-2/+2
\| \| \|
\| \| *	lint -ignore extra spaces before values in obj expression	kumavis	2017-01-27	1	-1/+1
\| \| \|
\| \| *	metamask controller - cleanup remote api	kumavis	2017-01-27	2	-79/+101
\| \| \|
\| \| *	metamask - organize into sections	kumavis	2017-01-27	1	-49/+61
\| \| \|
\| \| *	metamask - use web3-stream-provider/handler instead of manual wiring	kumavis	2017-01-27	1	-23/+8
\| \| \|
\| \| *	test - lint first	kumavis	2017-01-27	1	-1/+1
\| \| \|
\| \| *	metamask controller - adopt setup*Communication from background	kumavis	2017-01-27	2	-44/+41
\| \| \|
\| \| *	background - stream disconnection fix	kumavis	2017-01-27	2	-8/+8
\| \| \|
\| \| *	metamask controller - adopt clearSeedWords from keyring controller	kumavis	2017-01-27	2	-15/+9
\| \| \|
* \| \|	Rewrite message controller to fit controller pattern	Frankie	2017-01-28	1	-48/+45
\|/ /
* \|	Merge pull request #1056 from MetaMask/i#1006	kumavis	2017-01-27	1	-2/+0
\|\ \ \| \|/ \|/\|	Fix ui overlap
\| *	Fix ui overlap	Frankie	2017-01-27	1	-2/+0
\| \|
* \|	Merge pull request #1057 from MetaMask/kumavis-refactor1	kumavis	2017-01-27	4	-62/+44
\|\ \ \| \|/ \|/\|	background - various refactor, cleanups, and fixes
\| *	background - graceful publicConfigStore connection teardown	kumavis	2017-01-27	1	-1/+3
\| \|
\| *	config-manager - default to USD for currentFiat	kumavis	2017-01-27	1	-14/+4
\| \|
\| *	background - organize metamask instantiation	kumavis	2017-01-27	3	-47/+37
\|/
*	Merge pull request #999 from MetaMask/obs-store2	kumavis	2017-01-25	21	-562/+508
\|\ \| \| \| \|	background - introduce ObservableStore (mark II)
\| *	mock-dev - cleanup missing polyfill	kumavis	2017-01-25	1	-3/+0
\| \|
\| *	obs-store - use published module	kumavis	2017-01-25	16	-327/+113
\| \|
\| *	migrations - rename 005 to stubbed _multi-keyring	kumavis	2017-01-25	1	-0/+7
\| \|
\| *	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2	kumavis	2017-01-25	8	-36/+62
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #1054 from MetaMask/i#1048	Frankie	2017-01-25	7	-35/+58
\|\ \ \| \| \| \| \| \|	Background - Extracts primary account code from keyring controller
\| * \	Merge branch 'dev' into i#1048	kumavis	2017-01-25	12	-12/+166
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic	kumavis	2017-01-25	2	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Fix conf tx balance logic
\| * \| \|	fix base	Frankie	2017-01-25	1	-2/+2
\| \| \| \|
\| * \| \|	add to CHANGELOG	Frankie	2017-01-25	1	-0/+1
\| \| \| \|
\| * \| \|	Fix issue where ConfTx view lets you approve txs when the account has ↵	Frankie	2017-01-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	insufficient balance
* \| \| \|	Merge pull request #1051 from MetaMask/hotfix1048	Frankie	2017-01-25	2	-5/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|	hotfix - addNewAccount - dont assume hd keyring position
\| \| * \|	background controller - extract KeyringC.placeSeedWords to MetamaskC	kumavis	2017-01-25	4	-23/+34
\| \| \| \|
\| \| * \|	merge master hotfix into dev	kumavis	2017-01-25	2	-2/+5
\| \| \|\ \
\| \| \| * \	Merge pull request #1053 from MetaMask/3.1.2v3.1.2	kumavis	2017-01-25	2	-1/+6
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Release 3.1.2
\| \| \| \| * \|	3.1.2	kumavis	2017-01-25	2	-1/+6
\| \| \| \|/ /
\| \| \| * \|	Merge pull request #1052 from MetaMask/hotfix1048	kumavis	2017-01-25	2	-5/+7
\| \| \| \|\ \ \| \| \|_\|/ / \| \|/\| \| \|	hotfix - dont assume hd keyring position
\| * \| \| \|	hotfix - dont assume hd keyring position	kumavis	2017-01-25	2	-5/+7
\| \| \|/ / \| \|/\| \|
\| \| * \|	keyring-controller - cleanup	kumavis	2017-01-25	1	-2/+3
\| \| \| \|
\| \| * \|	keyring-controller - cleanup	kumavis	2017-01-25	1	-5/+3
\| \| \| \|
\| \| * \|	add to CHANGELOG	Frankie	2017-01-25	1	-0/+2
\| \| \| \|
\| \| * \|	Move the assumption of their only being one hd keyring when requesting seed ↵	Frankie	2017-01-25	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	words to metamaskController
\| \| * \|	Fix issue where generating a new account would put it in loose keys	Frankie	2017-01-25	4	-6/+15
\| \|/ /
\| \| *	Merge branch 'dev' into obs-store2	kumavis	2017-01-22	49	-308/+1406
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge pull request #1042 from MetaMask/upToDate	kumavis	2017-01-21	2	-1/+4
\|\ \ \ \| \| \| \| \| \| \| \|	keep dev Up to date
\| * \| \|	Merge branch 'master' into upToDate	Frankie	2017-01-21	2	-1/+4
\|/\| \| \| \| \|/ /
\| * \|	Merge pull request #1040 from MetaMask/3.1.1v3.1.1	kumavis	2017-01-21	2	-1/+5
\| \|\ \ \| \| \| \| \| \| \| \|	3.1.1
\| \| * \|	3.1.1	kumavis	2017-01-21	2	-1/+5
\| \|/ /
* \| \|	Merge pull request #1039 from MetaMask/upToDate	kumavis	2017-01-21	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Keep dev up to date with master
\| * \| \|	Merge branch 'master' into upToDate	Frankie	2017-01-21	1	-1/+3
\|/\| \| \| \| \|/ /
\| * \|	Merge pull request #1037 from MetaMask/i1034-seed-export	Frankie	2017-01-21	1	-1/+3
\| \|\ \ \| \| \| \| \| \| \| \|	keyring controller - placeSeedWords should use first hdKeyring
\| \| * \|	keyring controller - placeSeedWords should use first hdKeyring	kumavis	2017-01-21	1	-1/+3
\| \|/ /
* \| \|	Merge pull request #1029 from MetaMask/i715-AddJsonImport	Kevin Serrano	2017-01-20	11	-11/+165
\|\ \ \ \| \| \| \| \| \| \| \|	Add JSON file account import
\| * \| \|	Bump changelog	Dan Finlay	2017-01-19	1	-0/+2
\| \| \| \|
\| * \| \|	Merge branch 'dev' into i715-AddJsonImport	Dan Finlay	2017-01-19	4	-3/+6
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #1030 from MetaMask/master	kumavis	2017-01-19	4	-3/+6
\|\ \ \ \ \| \| \|/ / \| \|/\| \|	Merge master into dev
\| * \| \|	Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0	Dan Finlay	2017-01-19	33	-79/+875
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Version 3.1.0
\| \| * \ \	Merge branch 'master' into Version-3.1.0	Dan Finlay	2017-01-19	3	-2/+3
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #1024 from MetaMask/fixSignedVsSubmitted	Dan Finlay	2017-01-19	3	-2/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix the dissplay for submitted transactions...
\| \| * \| \| \|	Add to CHANGELOG	Frankie	2017-01-19	1	-0/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into fixSignedVsSubmitted	Frankie	2017-01-19	10	-21/+28
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Fix the dissplay for submitted transactions and the listner wating to hear ↵	Frankie	2017-01-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when tx's were included in a block
\| \| \| * \| \|	Version 3.1.0	Dan Finlay	2017-01-19	2	-1/+3
\| \|_\|/ / / \|/\| \| \| \|
\| \| \| * \|	Add ability to import v3 JSON wallets	Dan Finlay	2017-01-19	5	-10/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
\| \| \| * \|	Implement naieve JSON file importing	Dan Finlay	2017-01-19	3	-5/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.
\| \| \| * \|	Added new modular private key import system	Dan Finlay	2017-01-19	4	-2/+65
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
* \| \| \|	Merge pull request #1022 from MetaMask/i715-AddImportMenu	kumavis	2017-01-19	26	-49/+828
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add ability to import private keys
\| * \ \ \	Merge branch 'dev' into i715-AddImportMenu	kumavis	2017-01-19	1	-0/+1
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #1026 from MetaMask/i1023-badTxHash	Dan Finlay	2017-01-19	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bump changelog
\| * \| \| \| \|	Bump changelog	Dan Finlay	2017-01-19	1	-0/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'dev' into i715-AddImportMenu	kumavis	2017-01-19	1	-6/+5
\| \| \|\ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1025 from MetaMask/i1023-badTxHash	Dan Finlay	2017-01-19	1	-6/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tx-manager - use rpc-specified txHash
\| * \| \| \| \|	tx-manager - use rpc-specified txHash	kumavis	2017-01-19	1	-6/+5
\|/ / / / /
\| * \| \| \|	Fix test to log out despite number of menu items	Dan Finlay	2017-01-18	2	-2/+3
\| \| \| \| \|
\| * \| \| \|	Bump changelog	Dan Finlay	2017-01-18	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Remove outdated reference	Dan Finlay	2017-01-18	1	-4/+0
\| \| \| \| \|
\| * \| \| \|	Remove unused UI files	Dan Finlay	2017-01-18	2	-109/+0
\| \| \| \| \|
\| * \| \| \|	Allow importing of private key strings	Dan Finlay	2017-01-18	10	-16/+357
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
\| * \| \| \|	Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu	Dan Finlay	2017-01-18	19	-74/+560
\| \|\ \ \ \
\| \| * \| \| \|	Develop import subviews	Dan Finlay	2016-11-05	6	-17/+87
\| \| \| \| \| \|
\| \| * \| \| \|	Add import account placeholder template	Dan Finlay	2016-11-05	4	-30/+72
\| \| \| \| \| \|
\| \| * \| \| \|	Add babelify to gulp build	Dan Finlay	2016-11-05	1	-0/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Linted	Dan Finlay	2016-11-05	3	-12/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Add account adding subview placeholders	Dan Finlay	2016-11-05	4	-39/+121
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'i328-MultiVault' into i328-MultiVault-v1	Dan Finlay	2016-11-05	1	-21/+1
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Remove unused class	Dan Finlay	2016-11-05	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Convert buy subview to new tab bar component	Dan Finlay	2016-11-05	1	-36/+47
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Scaffold new account view	Dan Finlay	2016-11-05	9	-2/+192
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add "import account" menu item + template view	Dan Finlay	2017-01-18	4	-0/+63
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1017 from MetaMask/conversion-api-err	Dan Finlay	2017-01-18	2	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conversion api err
\| * \ \ \ \ \	Merge branch 'dev' into conversion-api-err	Dan Finlay	2017-01-18	28	-261/+413
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1019 from MetaMask/i1014-FixSigning	Dan Finlay	2017-01-18	5	-7/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dev - fix signing
\| * \ \ \ \ \ \	Merge branch 'dev' into i1014-FixSigning	kumavis	2017-01-17	1	-12/+0
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1016 from MetaMask/i1014-FixSigning	kumavis	2017-01-17	2	-2/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dev: fix signing
\| * \ \ \ \ \ \ \	Merge branch 'dev' into i1014-FixSigning	kumavis	2017-01-17	1	-12/+0
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1012 from MetaMask/RemoveOldNotice	kumavis	2017-01-17	1	-12/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove old notice
\| * \| \| \| \| \| \| \| \|	Remove old notice	Dan Finlay	2017-01-17	1	-12/+0
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This notice is not relevant to new users, should be removed.
\| \| \| * \| \| \| \| \|	Version 3.0.1	Dan Finlay	2017-01-17	2	-1/+3
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix bug where signed messages were not dismissed	Dan Finlay	2017-01-17	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix removeHexPrefix to stripHexPrefix	Dan Finlay	2017-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix message signing UI rendering	Dan Finlay	2017-01-17	1	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval. This commit fixes that.
\| \| \| * \| \| \| \| \|	Bump changelog	Dan Finlay	2017-01-17	1	-0/+2
\| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Wrote fix for eth.sign	Dan Finlay	2017-01-17	1	-2/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Wrote failing test for eth.sign	Dan Finlay	2017-01-17	1	-0/+18
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge pull request #1011 from MetaMask/dev	kumavis	2017-01-17	0	-0/+0
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Equalize Master and Dev
* \| \| \| \| \| \|	Merge pull request #1010 from MetaMask/master	kumavis	2017-01-17	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Equalize Master and Dev
\| * \| \| \| \| \|	Merge pull request #1009 from MetaMask/FixManifest	kumavis	2017-01-17	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix manifest version
\| \| * \ \ \ \ \	Merge branch 'master' into FixManifest	kumavis	2017-01-17	0	-0/+0
\| \| \|\ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #1005 from MetaMask/dev	kumavis	2017-01-17	132	-1609/+10269
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Merge dev into master!
\| \| * \| \| \| \| \|	Fix manifest version	Dan Finlay	2017-01-17	1	-1/+1
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1008 from MetaMask/Version-3.0.0v3.0.0	Dan Finlay	2017-01-17	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 3.0.0
\| * \| \| \| \| \| \|	Version 3.0.0	Dan Finlay	2017-01-17	2	-1/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1007 from MetaMask/simple-keystore-fix	Dan Finlay	2017-01-17	2	-9/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	keyring - simple - fix address generation
\| * \ \ \ \ \ \	Merge branch 'dev' into simple-keystore-fix	kumavis	2017-01-17	6	-9/+11
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Bump changelog to mention BIP44 fix	Dan Finlay	2017-01-17	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into dev	Dan Finlay	2017-01-17	6	-9/+10
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #984 from MetaMask/correctCoinbaseInfo	Dan Finlay	2017-01-11	3	-5/+6
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct coinbase info
\| \| * \| \| \| \| \| \|	add to CHANGELOG	Frankie	2017-01-11	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	update coinbase info and view	Frankie	2017-01-11	2	-5/+5
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge pull request #943 from MetaMask/fixExplorerLink	Dan Finlay	2016-12-21	4	-4/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix explorer link
\| \| * \| \| \| \| \| \|	make CHANGELOG more human readable	Frankie	2016-12-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add to CHANGELOG.md	Frances Pangilinan	2016-12-21	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	remove network Id 2 from explorer link and Add network Id 3	Frances Pangilinan	2016-12-21	3	-4/+3
\| \|/ / / / / / /
\| \| * \| \| \| \| \|	test - keyring - simple - fix fixture data	kumavis	2017-01-17	1	-6/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	keyring - simple - throw error if wallet not found for address	kumavis	2017-01-17	1	-1/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	keyring - simple - fix address generation	kumavis	2017-01-17	1	-3/+3
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1004 from MetaMask/doubleRenderIssue	Dan Finlay	2017-01-17	2	-2/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	Dont render conf-tx if their are no txParams to show
\| * \| \| \| \| \|	add to CHANGELOG	Frankie	2017-01-15	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Dont render conf-tx if their are no txParams to show	Frankie	2017-01-15	1	-2/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1002 from MetaMask/bug-submitTx	Frankie	2017-01-15	10	-160/+258
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handle tx finalization in controllers instead of provider-engine
\| * \| \| \| \| \|	test - clear localStorage on test start	kumavis	2017-01-15	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	test - clear localStorage in case CI caches it (?)	kumavis	2017-01-15	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	test - txManager - add network to all txs	kumavis	2017-01-15	1	-18/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	tests - txManager - add getNetwork fn to fixture txManager	kumavis	2017-01-15	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	eth-store - emit update on new account add	kumavis	2017-01-15	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	background - txManager - filter txs by network	kumavis	2017-01-15	2	-4/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	background - return txHash to provider-engine on done	kumavis	2017-01-15	2	-14/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix the inclusion of the txFee in the meta tx object	Frankie	2017-01-15	1	-3/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix for linting	Frankie	2017-01-14	2	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Satisfy review needs:	Frankie	2017-01-14	2	-21/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed unnecessary this.query = opts.query from constructor Created a tx error state for errors in approveTransaction validateTxParams has been moved to tx-utils removed "value" arg from _setTxStatus
\| * \| \| \| \| \|	fix the maxcost not being included in txMeta	Frankie	2017-01-14	1	-3/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into ↵	kumavis	2017-01-14	11	-65/+96
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bug-submitTx
\| \| * \ \ \ \ \	Merge branch 'dev' into bug-submitTx	kumavis	2017-01-14	11	-65/+96
\| \| \|\ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #997 from MetaMask/integrateTxManagerUI	kumavis	2017-01-14	11	-66/+99
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integrate tx manager ui
\| * \ \ \ \ \ \ \	Merge branch 'dev' into integrateTxManagerUI	Frankie	2017-01-14	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove orphaned comment	Frankie	2017-01-14	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	lint	Frankie	2017-01-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Clean up code	Frankie	2017-01-14	4	-34/+39
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix sorting and instances where something could be undefined	Frankie	2017-01-12	3	-4/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'dev' into integrateTxManagerUI	Frankie	2017-01-12	2	-6/+5
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix wording and icon of failed txs	Frankie	2017-01-12	3	-15/+22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add to CHANGELOG	Frankie	2017-01-12	2	-2/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'dev' into integrateTxManagerUI	Frankie	2017-01-12	8	-78/+102
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Take some of the tx Logic out of the UI and create a visble state for ↵	Frankie	2017-01-12	10	-54/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pending and unaproved transactions
\| \| \| \| * \| \| \| \| \| \|	background - metamask controller - fix 'this' ref	kumavis	2017-01-14	1	-7/+8
\| \| \| \| \|/ / / / / /
\| \| \| \| * / / / / /	background - handle tx finalization in controllers instead of provider-engine	kumavis	2017-01-13	7	-131/+215
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	lint - warn on unhandled err	kumavis	2017-01-12	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	currency conversion - less noisy error	kumavis	2017-01-12	1	-1/+1
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| \| \| \| \| \| \| *	background - fix metamaskController store -> diskStore persistence	kumavis	2017-01-13	1	-1/+6
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	migrations - wip - 005 multivault migration	kumavis	2017-01-12	7	-31/+82
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	migrations - introduce promise-based migrator	kumavis	2017-01-12	7	-136/+204
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	background - move pojo migrator to outside of metamask controller	kumavis	2017-01-12	15	-244/+231
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	test - fix tests from obs-store	kumavis	2017-01-12	3	-8/+13
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	background - introduce ObservableStore	kumavis	2017-01-12	11	-187/+224
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #998 from MetaMask/i960-port-stream-err	kumavis	2017-01-12	1	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	bugfix - portstream - dont wrap cb in try catch
\| * \| \| \| \| \|	bugfix - portstream - dont wrap cb in try catch	kumavis	2017-01-12	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #996 from MetaMask/i981-UpdateOnAccountChange	kumavis	2017-01-12	2	-6/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Send update to UI when changing selected account
\| * \| \| \| \|	Send update to UI when changing selected account	Dan Finlay	2017-01-12	2	-6/+5
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #981
* \| \| \| \|	Merge pull request #990 from MetaMask/sync-accounts	Dan Finlay	2017-01-12	1	-17/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	rpc - fix sync account cache setting
\| * \| \| \| \|	rpc - fix sync account cache setting	kumavis	2017-01-11	1	-17/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #988 from MetaMask/eth_syncing	kumavis	2017-01-11	2	-0/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	web3 provider - override eth_syncing and web3_clientVersion
\| * \| \| \| \|	changelog - add note on rpc overrides	kumavis	2017-01-11	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	web3 provider - override eth_syncing and web3_clientVersion	kumavis	2017-01-11	1	-0/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #987 from MetaMask/kumavis-patch-1	kumavis	2017-01-11	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	deps - bump provider engine
\| * \| \| \| \|	deps - bump provider engine	kumavis	2017-01-11	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \|	addresses caching memory leak that can cause slow downs
* \| \| \| \|	Merge pull request #985 from MetaMask/gulp1	kumavis	2017-01-11	3	-39/+83
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Gulp - clean and add "disc" analysis task
\| * \ \ \ \	Merge branch 'dev' into gulp1	Dan Finlay	2017-01-11	5	-21/+10
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #986 from MetaMask/i947-BrowserSolidityError	kumavis	2017-01-11	2	-15/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix browser solidity error
\| * \| \| \| \| \|	Bump changelog	Dan Finlay	2017-01-11	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove erroneous OOG estimation logic.	Dan Finlay	2017-01-11	1	-15/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #983 from MetaMask/slim1	Kevin Serrano	2017-01-11	3	-6/+7
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	deps - replace promise-request with fetch
\| * \| \| \| \|	tests - add fetch polyfill	kumavis	2017-01-11	2	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	deps - replace promise-request with fetch	kumavis	2017-01-11	2	-5/+3
\|/ / / / /
\| * \| \| \|	gulp - fix brfs instrumentation	kumavis	2017-01-11	2	-5/+2
\| \| \| \| \|
\| * \| \| \|	gulp - cleanup comments	kumavis	2017-01-11	1	-13/+19
\| \| \| \| \|
\| * \| \| \|	gulp - add disc bundle analysis task	kumavis	2017-01-11	3	-5/+55
\| \| \| \| \|
\| * \| \| \|	gulp - clean and simplify	kumavis	2017-01-11	2	-25/+16
\|/ / / /
* \| \| \|	Merge pull request #974 from MetaMask/typo-fix	Frankie	2017-01-07	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	quick typo fix.
\| * \| \| \|	quick typo fix.	Kevin Serrano	2017-01-07	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #970 from MetaMask/network-indicator-refactor	Dan Finlay	2017-01-06	5	-16/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Network indicator modifications
\| * \ \ \	Merge branch 'dev' into network-indicator-refactor	Kevin Serrano	2017-01-06	7	-45/+188
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #971 from MetaMask/TearDownOnDisconnect	kumavis	2017-01-06	2	-11/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	MetaMask Controller - Convert to EventEmitter
\| * \ \ \ \	Merge branch 'dev' into TearDownOnDisconnect	kumavis	2017-01-06	4	-31/+34
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #967 from MetaMask/fixTxManager	Dan Finlay	2017-01-06	4	-32/+34
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tx manager
\| * \ \ \ \ \	Merge branch 'dev' into fixTxManager	Dan Finlay	2017-01-06	4	-2/+146
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Combine two identical then blocks	Dan Finlay	2017-01-06	1	-4/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove unnecessary try statments	Frankie	2017-01-05	3	-37/+24
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'TxManager' into fixTxManager	Frankie	2017-01-05	1	-0/+1
\| \|\ \ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into ↵	Frankie	2017-01-05	3	-22/+31
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TxManager
\| \| \| * \ \ \ \ \	Merge pull request #958 from MetaMask/i897-ReplayProtection	Kevin Serrano	2017-01-04	15	-70/+328
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add replay protection
\| \| \| \| * \ \ \ \ \	Merge branch 'dev' into i897-ReplayProtection	Dan Finlay	2017-01-03	11	-48/+259
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \|	Use chainId parameter instead of second argument	Dan Finlay	2017-01-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Linted	Dan Finlay	2017-01-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-01-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Add replay protection to Transaction Manager	Dan Finlay	2017-01-03	2	-23/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #897 Needs tests.
\| * \| \| \| \| \| \| \| \| \|	clean up	Frankie	2017-01-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into fixtTxManager	Frankie	2017-01-05	15	-100/+324
\| \|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix signing of transactions	Frankie	2017-01-05	3	-46/+62
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Merge branch 'dev' into TearDownOnDisconnect	kumavis	2017-01-06	4	-2/+146
\| \| \| \| \| \|\ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #969 from MetaMask/i945-AlwaysQueryLatest	Kevin Serrano	2017-01-06	4	-2/+146
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Always query latest block for balance & nonce
\| * \| \| \| \| \| \| \| \|	Fixed bugs with sanity-checking	Dan Finlay	2017-01-05	1	-12/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Was incorrectly calling some eth-query methods (left over from old local eth-query) - Was still passing block to getAccount in addAccount - Now emitting update only after all account balances are loaded, reducing UI update traffic.
\| * \| \| \| \| \| \| \| \|	Fix dependency reference	Dan Finlay	2017-01-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Caught typo	Dan Finlay	2017-01-05	1	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add descriptive comment	Dan Finlay	2017-01-05	1	-0/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Linted	Dan Finlay	2017-01-05	1	-22/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-01-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove old eth-store dependency	Dan Finlay	2017-01-05	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Removed reliance on eth-store internal custom eth-query	Dan Finlay	2017-01-05	1	-6/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move eth-store@1.1.0 into local repo.	Dan Finlay	2017-01-05	1	-0/+132
\|/ / / / / / / / /
\| \| \| \| * / / / /	MetaMask Controller - Convert to EventEmitter	Frankie	2017-01-06	2	-12/+8
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Switch order of header and indicator.	Kevin Serrano	2017-01-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Changelog.	Kevin Serrano	2017-01-05	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Linting.	Kevin Serrano	2017-01-05	2	-2/+1
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Make network somewhat more modular, add new network indicator.	Kevin Serrano	2017-01-05	4	-17/+24
\| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #965 from MetaMask/chrome-permissions	Dan Finlay	2017-01-04	3	-4/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Chrome permissions
\| * \ \ \ \ \ \	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev	Kevin Serrano	2017-01-04	1	-2/+8
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #964 from MetaMask/i963-BalancesNotUpdating	Kevin Serrano	2017-01-04	1	-2/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update UI state on ethStore updates
\| * \ \ \ \ \ \ \	Merge branch 'dev' into i963-BalancesNotUpdating	Kevin Serrano	2017-01-04	1	-46/+28
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix sendUpdate for new promisified getState method	Dan Finlay	2017-01-04	1	-2/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update UI state on ethStore updates	Dan Finlay	2017-01-04	1	-0/+2
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity. Fixes #963
\| \| * \| \| \| \| \|	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev	Kevin Serrano	2017-01-04	1	-46/+28
\| \| \|\ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #962 from MetaMask/i961-UpdateUiBug	Kevin Serrano	2017-01-04	1	-46/+28
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Fix AddAccount not updating UI
\| * \| \| \| \| \| \|	Convert more actions to new simple pattern	Dan Finlay	2017-01-04	1	-18/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Restore missing line	Dan Finlay	2017-01-04	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Corrected instances of showWarning to displayWarning	Dan Finlay	2017-01-04	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Apply new pattern to repetitive functions	Dan Finlay	2017-01-04	1	-19/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update account list after adding account	Dan Finlay	2017-01-04	1	-10/+24
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process. Fixes #961