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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| * \| \|	Fix rendering QR code in old UI, hide unnecessary back button	Alexander Tseung	2018-01-17	2	-1/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #3007 from alextsg/uat-master-011618	Chi Kei Chan	2018-01-18	24	-84/+395
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Merge master into uat branch
\| \| \| * \| \| \|	Fix merge conflicts	Alexander Tseung	2018-01-17	1	-5/+14
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'uat' into uat-master-011618	Alexander Tseung	2018-01-17	351	-3712/+39761
\| \|_\|/\| \| \| \| \|/\| \| \|/ / /
* \| \| \| \| \|	Merge pull request #2996 from MetaMask/Version-3.13.5	Thomas Huang	2018-01-17	2	-1/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 3.13.5
\| * \| \| \| \| \|	Version 3.13.5v3.13.5	Dan Finlay	2018-01-17	2	-1/+3
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimit	kumavis	2018-01-17	2	-6/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set gas limit to 21k for recipients with no code
\| * \ \ \ \ \	Merge branch 'master' into i2907-NoCodeGasLimit	Dan Finlay	2018-01-17	3	-0/+5
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeight	kumavis	2018-01-17	3	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I2779 firefox specify account detail height
\| * \ \ \ \ \ \	Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight	Dan Finlay	2018-01-17	6	-18/+56
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight	Dan Finlay	2018-01-16	11	-29/+116
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Edit: Fix Firefox scrollbar Changelog	Thomas Huang	2018-01-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bump Changelog	Thomas	2018-01-16	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add max height for Firefox addon overflow and hide horizontal scroll	tmashuang	2018-01-11	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add one px to address for Firefox clipping	tmashuang	2018-01-11	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Create new flag for simple sends to avoid overloading other flag	Dan Finlay	2018-01-17	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch 'master' into i2907-NoCodeGasLimit	kumavis	2018-01-17	6	-18/+56
\| \| \| \|\ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2984 from MetaMask/RenameLockToLogout	Thomas Huang	2018-01-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename lock to log out
\| * \| \| \| \| \| \| \| \|	Rename lock to log out	Dan Finlay	2018-01-16	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2475
* \| \| \| \| \| \| \| \|	Merge pull request #2962 from MetaMask/open-popup	Dan Finlay	2018-01-16	5	-17/+55
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Open popup before estimateGas finishes
\| * \| \| \| \| \| \| \|	Merge branch 'master' into open-popup	Frankie	2018-01-16	9	-26/+90
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	add to CHANGELOG.md	frankiebee	2018-01-16	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	test - fix to match expected behavior	frankiebee	2018-01-15	1	-14/+28
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	test - create ethJsQuery stub	frankiebee	2018-01-15	1	-1/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	transactions - emit 'newUnapprovedTx' before estimateGas finishes	frankiebee	2018-01-15	1	-2/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	add a loading spinner to conf-tx view	frankiebee	2018-01-15	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch 'master' into i2907-NoCodeGasLimit	Dan Finlay	2018-01-16	4	-15/+78
\| \| \| \|\ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2953 from MetaMask/i2826-SignBytes	Frankie	2018-01-16	2	-4/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix signTypedData bytes signing
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into i2826-SignBytes	Frankie	2018-01-16	3	-11/+75
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation	Dan Finlay	2018-01-16	3	-11/+76
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve gas price estimation by backfilling recent-blocks
\| * \| \| \| \| \| \| \| \| \|	Prefer passing a provider over an ethQuery instance	Dan Finlay	2018-01-13	2	-8/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Improve gas price estimation by backfilling recent-blocks	Dan Finlay	2018-01-12	3	-9/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When first initializing, recent-block controller now back-fills up to its desired history length. This makes estimated gas prices reflect a longer recent history, even when first switching to a new network. Fixes #2925
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into i2826-SignBytes	Dan Finlay	2018-01-16	4	-7/+8
\| \| \|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Bump keyringController version	Dan Finlay	2018-01-16	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix signTypedData bytes signing	Dan Finlay	2018-01-14	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2826
\| \| \| \| \| * \| \| \| \| \|	Set gas limit to 21k for recipients with no code	Dan Finlay	2018-01-16	2	-5/+24
\| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2907
* \| \| \| \| \| \| \| \| \|	Merge pull request #2862 from wbt/UpdateNotice	Dan Finlay	2018-01-16	2	-3/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update notice
\| * \| \| \| \| \| \| \| \| \|	Cut statement about test network default	wbt	2018-01-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing inaccurate statement that default is test network, because most users now connect to the main network by default. See also https://github.com/MetaMask/metamask-extension/commit/f6e551ef5f3773cf5637c2ae0e11fdeb5f40645b
\| * \| \| \| \| \| \| \| \| \|	Cut statement about test network default	wbt	2018-01-05	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing inaccurate statement that default is test network, because most users now connect to the main network by default. See also https://github.com/MetaMask/metamask-extension/commit/f6e551ef5f3773cf5637c2ae0e11fdeb5f40645b
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2900 from MetaMask/infura-rest-api	kumavis	2018-01-16	2	-4/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Provider - Use Infura rest api for infura networks
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into infura-rest-api	kumavis	2018-01-12	6	-5/+32
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	deps - bump eth-json-infura	kumavis	2018-01-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	provider - infura - use infura REST api	kumavis	2018-01-09	2	-4/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	bugfix - transactions controller - breakout logic and fix order of ↵	kumavis	2018-01-09	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	operations bug
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2909 from MetaMask/UpdateSupportLinks	Kevin Serrano	2018-01-13	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Update support links for helpscout
\| * \| \| \| \| \| \| \| \| \|	Use https	Dan Finlay	2018-01-13	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'UpdateReadmeSupportLink' into UpdateSupportLinks	Dan Finlay	2018-01-13	6	-5/+30
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Update support link on readme	Dan Finlay	2018-01-13	1	-1/+1
\| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2926 from MetaMask/gulp-npmls	Dan Finlay	2018-01-12	2	-3/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \|	build - add 'deps' step that records output of 'npm ls' into build
\| * \| \| \| \| \| \| \| \| \|	build - add 'deps' step that records output of 'npm ls' into build	kumavis	2018-01-11	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	deps - gulp in dev deps only	kumavis	2018-01-11	1	-2/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2917 from x86kernel/ci/add-ko-locale	kumavis	2018-01-12	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Add korean localization file
\| * \| \| \| \| \| \| \| \|	ci(ko/messages.json): add korean localization file	x86kernel	2018-01-10	1	-0/+10
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #2906 from MetaMask/Version-3.13.4	Thomas Huang	2018-01-10	2	-1/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 3.13.4
\| * \| \| \| \| \| \| \| \|	Version 3.13.4v3.13.4	Dan Finlay	2018-01-10	2	-1/+3
\|/ / / / / / / / /
\| \| * / / / / / /	Update support links for helpscout	Dan Finlay	2018-01-10	1	-3/+3
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2855 from abitrolly/patch-2	kumavis	2018-01-09	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	info.js Remove width element to fix email layout
\| * \| \| \| \| \| \| \|	info.js Remove width element to fix email layout	Anatoli Babenia	2018-01-04	1	-1/+0
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2902 from MetaMask/DefaultToOneGwei	Dan Finlay	2018-01-09	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default to 1 gwei for empty blocks
\| * \ \ \ \ \ \ \	Merge branch 'master' into DefaultToOneGwei	Dan Finlay	2018-01-09	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2796 from MetaMask/filter-case-sensitive	Dan Finlay	2018-01-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bugfix: deps - eth-json-rpc-filters@1.2.5
\| * \| \| \| \| \| \| \| \|	deps - eth-json-rpc-filters@1.2.5	kumavis	2017-12-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix case sensitive address check in filters
* \| \| \| \| \| \| \| \| \|	Merge pull request #2901 from MetaMask/DefaultToOneGwei	kumavis	2018-01-09	2	-0/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default gas estimate to 1 gwei for networks with no block activity
* \ \ \ \ \ \ \ \ \ \	Merge pull request #2899 from MetaMask/danfinlay-patch-1	kumavis	2018-01-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default to estimating 1 gwei for empty blocks.
\| * \| \| \| \| \| \| \| \| \| \|	Default to estimating 1 gwei for empty blocks.	Dan Finlay	2018-01-09	1	-1/+1
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid estimating 0 gwei on low-traffic private networks.
\| \| \| * / / / / / / /	Default to 1 gwei for empty blocks	Dan Finlay	2018-01-09	1	-2/+3
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add test for gas estimate default	Dan Finlay	2018-01-09	1	-0/+19
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Default gas estimate to 1 gwei for networks with no block activity	Dan Finlay	2018-01-09	1	-0/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #2896 from MetaMask/kumavis-patch-2	Dan Finlay	2018-01-09	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	bugfix - transaction controller - fix order of operations
\| * \| \| \| \| \| \| \|	bugfix - transactions controller - breakout logic and fix order of ↵	kumavis	2018-01-09	1	-2/+4
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	operations bug
* \| \| \| \| \| \| \|	Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackage	kumavis	2018-01-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update vinyl-buffer to version 1.0.1
\| * \| \| \| \| \| \| \|	Update vinyl-buffer to version 1.0.1	Thomas Huang	2018-01-04	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress	Thomas Huang	2018-01-09	3	-0/+44
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Account for 0x/empty string recipient
\| * \ \ \ \ \ \ \	Merge branch 'master' into i2621-0xRecipientAddress	Dan Finlay	2018-01-09	6	-2/+57
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Account for 0x/empty string address and contract creation	Thomas	2018-01-08	3	-0/+44
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2851 from MetaMask/i2812-seedworderrorfix	Kevin Serrano	2018-01-09	4	-6/+34
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Fix condition where failing seed word checks would infinite-spin future attempts.
\| * \| \| \| \| \| \| \|	Update CHANGELOG.md	Kevin Serrano	2018-01-09	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Test for failure of the async methods.	Kevin Serrano	2018-01-04	1	-2/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add fix for infinite spinner for incorrect seed phrase.	Kevin Serrano	2018-01-04	2	-4/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2879 from MetaMask/ImproveGasEstimation	Dan Finlay	2018-01-09	6	-2/+57
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Improve gas estimation
\| * \| \| \| \| \| \| \|	Fix feature to work	Dan Finlay	2018-01-06	3	-6/+16
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Linted	Dan Finlay	2018-01-06	1	-3/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bump changelog	Dan Finlay	2018-01-06	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Derive gas price estimate from previous transactions	Dan Finlay	2018-01-06	4	-2/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return the 50th percentile lowest gas price of the previous 20 blocks.
\| * \| \| \| \| \| \| \|	Add test for better gas estimation	Dan Finlay	2018-01-06	1	-0/+25
\|/ / / / / / / /
\| \| \| \| * \| \| \|	Readjust gas fees when switching networks on the send screen	Alexander Tseung	2018-01-17	2	-22/+44
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Vertically centers the text of the new ui modal header. (#2987)	Dan J Miller	2018-01-17	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Adding one or more tokens sets the selected token before returning the user ↵	Dan J Miller	2018-01-17	2	-0/+8
\| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to the main screen. (#2995)
\| \| \| \| * \| \|	[NewUI-flat] Fix gulp build (#2975)	Dan J Miller	2018-01-16	3	-14/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Only run uglify when building for prod; set environment when building for prod; use gulp-uglify-es. * Revert change of dist script.
\| \| \| \| * \| \|	Restore display of all unconfirmed transactions.	Dan	2018-01-16	1	-34/+34
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Fix send screen value input	Alexander Tseung	2018-01-16	1	-3/+11
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Fix Hide Token modal styling, popup positioning	Alexander Tseung	2018-01-16	4	-25/+15
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge pull request #2964 from alextsg/cb-505c	Dan Finlay	2018-01-16	1	-1/+1
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Move blockies option to the bottom of Settings
\| \| \| \| \| * \| \|	Move blockies option to the bottom of Settings	Alexander Tseung	2018-01-15	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	[NewUI] Place all users of extension into old UI (disable auto adding). (#2946)	Dan J Miller	2018-01-16	3	-26/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Place all users of extension into old UI (disable auto adding). * Fix lint errors.
\| \| \| \| * \| \| \|	Fix confirm Add Token button order	Alexander Tseung	2018-01-13	1	-4/+4
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Fix Add Token button order, styling	Alexander Tseung	2018-01-13	2	-14/+16
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Fix input box padding and select highlight in new account create and import ↵	Dan	2018-01-13	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page.
\| \| \| \| * \| \| \|	New add account page with create and import options.	Dan	2018-01-13	13	-95/+475
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Merge pull request #2928 from alextsg/cb-388	Chi Kei Chan	2018-01-13	24	-234/+284
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Update main view styling
\| \| \| \| \| * \ \ \	Merge branch 'uat' into cb-388	Chi Kei Chan	2018-01-13	0	-0/+0
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / / / \| \| \| \| \|/\| \| \| \|
\| \| \| \| \| * \| \| \|	Merge branch 'uat' into cb-388	Chi Kei Chan	2018-01-13	24	-315/+758
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / / / \| \| \| \| \|/\| \| \| \|
\| \| \| \| * \| \| \| \|	Fix styling in initialization	Alexander Tseung	2018-01-13	3	-7/+21
\| \| \| \| \| \|/ / / \| \| \| \| \|/\| \| \|
\| \| \| \| * \| \| \|	[NewUI-flat] New deposit ether modal UI. (#2642)	Dan J Miller	2018-01-13	14	-318/+717
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* New deposit ether modal. * New deposit modal full screen on mobile, and other style fixes. * Hide shapeshift option from deposit modal for now. * Add shapeshift form to new deposit modal. * Store recipient address for shapeshift tx in background. * Use Simpledropdown to achieve desired styling in coin selector. * Lint fix * Fix typos and remove dead code. * Remove storage of shapeshift receiving address from background. * Fix typos
\| \| \| \| * \| \| \|	Fix margin styling for name and address in account detail section. (#2790)	Dan J Miller	2018-01-12	2	-3/+4
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	[NewUI] Build mascara with uglification and gzipping. (#2735)	Dan J Miller	2018-01-12	4	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Adds uglification and gzipping. * Build mascara with uglification and gzipping. * Remove gzipping from extension build.
\| \| \| \| * \| \| \|	Fix logging out of old UI causing infinite spinner (#2914)	Alexander Tseung	2018-01-12	2	-2/+6
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Fix padding of a hovered tx-list-item (#2859)	Dan J Miller	2018-01-12	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Fix token balance color	Alexander Tseung	2018-01-12	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Fix lint errors	Alexander Tseung	2018-01-12	1	-1/+0
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Change styling for network dropdown	Alexander Tseung	2018-01-12	2	-58/+25
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Update styling for buttons, font weights	Alexander Tseung	2018-01-12	16	-125/+83
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Update main view styling	Alexander Tseung	2018-01-11	13	-85/+198
\| \| \| \| \|/ / /
\| \| \| \| * \| \|	4.0.9	kumavis	2018-01-09	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	ui - fix font path name	kumavis	2018-01-09	1	-2/+2
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge pull request #2848 from MetaMask/NewUI-flat	Alexander Tseung	2018-01-04	12	-1313/+2204
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Merge NewUI-flat into uat
\| \| \| \| \| * \ \	Merge pull request #2845 from alextsg/NewUI-flat-4.0.5c	Alexander Tseung	2018-01-04	10	-14/+115
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Merge master into NewUI-flat
\| \| \| \| \| \| * \| \|	Fix merge conflict	Alexander Tseung	2018-01-04	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \|	Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c	Alexander Tseung	2018-01-04	338	-3279/+38277
\| \|_\|_\|_\|_\|/\| \| \| \|/\| \| \| \| \|/ / /
\| \| \| \| \| * \| \|	Fix sign typed data	Alexander Tseung	2017-12-30	2	-1298/+2088
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Fix mascara first time flow button colors	Alexander Tseung	2017-12-30	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2783 from MetaMask/tx-param-vaalidation	kumavis	2018-01-03	2	-2/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	transactions - throw error if txParams.value contains a decimal
\| * \| \| \| \| \| \| \|	tx-gas-utils - tx-param-validation - use more intuitive check	kumavis	2018-01-03	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into tx-param-vaalidation	Frankie	2017-12-22	5	-18/+122
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Spelling	Dan Finlay	2017-12-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add to CHANGELOG.md	frankiebee	2017-12-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	transactions - throw error if dapp provides txParams whos value has a decimal	frankiebee	2017-12-21	1	-2/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2840 from oosthuizenr/master	kumavis	2018-01-03	1	-5/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI - Never show seed phrase if locked
\| * \| \| \| \| \| \| \| \| \|	fix comment	oosthuizenr	2018-01-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixes #2834	Renier Oosthuizen	2018-01-03	1	-5/+6
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2801 from MetaMask/greenkeeper/vinyl-source-stream-2.0.0	kumavis	2018-01-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Update vinyl-source-stream to the latest version 🚀
\| * \| \| \| \| \| \| \| \|	chore(package): update vinyl-source-stream to version 2.0.0	greenkeeper[bot]	2017-12-23	1	-1/+1
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2817 from MetaMask/i#2810	Frankie	2017-12-29	2	-3/+63
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	only check nonces of transactions who's from address match the txMeta
\| * \| \| \| \| \| \| \| \|	tests - be more verbose in test messages	frankiebee	2017-12-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add tests for #_checkIfNonceIsTaken	frankiebee	2017-12-28	1	-2/+61
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	transactions:pending - only check nonces of transactions who's from adress ↵	frankiebee	2017-12-28	1	-1/+2
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	match the txMeta
* \| \| \| \| \| \| \| \|	Merge pull request #2818 from MetaMask/i2782-ethroundingerror	Dan Finlay	2017-12-29	6	-3/+35
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix rounding error in ether input on send screen
\| * \| \| \| \| \| \| \|	Bump Changelog	Kevin Serrano	2017-12-28	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add frontend validation to ensure that ether inputs are valid.	Kevin Serrano	2017-12-28	1	-2/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add frontend validation to check if send ether input is a valid number.	Kevin Serrano	2017-12-28	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add additional test to ui utils to account for exact wei values.	Kevin Serrano	2017-12-28	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add backend fix for util in normalizeethstringtowei.	Kevin Serrano	2017-12-28	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix some silly linting issues.	Kevin Serrano	2017-12-28	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add test for edge case.	Kevin Serrano	2017-12-28	1	-0/+6
\|/ / / / / / / /
\| \| \| \| * \| \| \|	Merge pull request #2799 from MetaMask/NewUI-flat	Alexander Tseung	2017-12-23	193	-659/+21414
\| \| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update UAT to version 4.0.5
\| \| \| \| \| * \| \|	Merge pull request #2798 from alextsg/NewUI-flat-4.0.5	Alexander Tseung	2017-12-23	3	-8/+1
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge master into NewUI-flat
\| \| \| \| \| \| * \ \	Merge branch 'NewUI-flat' into merge-master	Alexander Tseung	2017-12-23	1	-1/+1
\| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ / / \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| * \| \| \|	Update manifest.json version from 4.0.4 to 4.0.5 (#2797)	Alexander Tseung	2017-12-23	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \|	Merge branch 'NewUI-flat' into merge-master	Alexander Tseung	2017-12-23	337	-2146/+36353
\| \|_\|_\|_\|_\|/\| \| \| \|/\| \| \| \| \|/ / /
\| \| \| \| \| * \| \|	Track usage of old and new UI (#2794)	Alexander Tseung	2017-12-23	9	-17/+125
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Track usage of old and new UI
\| \| \| \| \| * \| \|	[NewUI] Fixes tests and sends user to NewUI after registering. (#2788)	Dan J Miller	2017-12-22	6	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fixes tests and sends user to NewUI after registering. * Karma config? * Empty commit * Remove unneeded json state mock file.
\| \| \| \| \| * \| \|	Merge pull request #2785 from danjm/merge-master-to-newUI-flat-dec20	Chi Kei Chan	2017-12-21	20	-79/+1114
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Merge master to NewUI-flat
\| \| \| \| \| \| * \ \	Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20	Chi Kei Chan	2017-12-21	0	-0/+0
\| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ / / \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| \| * \| \|	Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20	Chi Kei Chan	2017-12-21	8	-74/+98
\| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ / / \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| * \| \| \|	Clone transaction while editing instead of mutating object from state.	Dan	2017-12-21	1	-6/+7
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Add constanst for token transfer function signature.	Dan	2017-12-21	2	-1/+5
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Lint fixes.	Dan	2017-12-21	4	-6/+2
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Adds updateTransaction to background and used it to update after editing in ↵	Dan	2017-12-21	8	-101/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	send-v2.
\| \| \| \| \| * \| \| \|	Canceled, edited transactions show edited amount.	Dan	2017-12-21	5	-2/+41
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \|	Merge branch 'master' into NewUI-flat	Dan	2017-12-21	20	-79/+1114
\| \| \| \| \| \|/\| \| \| \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| \| \| \| \| * \| \|	[NewUI] Hide UI toggle in mascara (#2772)	Dan J Miller	2017-12-21	4	-19/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Hides old-UI on mascara. * Improve code clarity in select-app.js
\| \| \| \| \| * \| \|	Hide fiat values on account details screen when eth/token value is 0.	Dan	2017-12-21	3	-3/+8
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Hides the sidebar after the an account menu actions changes the screen ↵	Dan	2017-12-21	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	behind the sidebar.
\| \| \| \| \| * \| \|	Fix edit to field bug. (#2738)	Dan J Miller	2017-12-13	1	-6/+7
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Remove inline style.	Dan	2017-12-13	3	-4/+4
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Make transaction list and item more flexible.	Dan	2017-12-13	2	-4/+4
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Flex account-data-subsection	Dan	2017-12-13	3	-19/+20
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Fix old ui width in mobile and extension.	Dan	2017-12-13	2	-24/+21
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Fix height of login screen	Dan	2017-12-13	1	-27/+25
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Fix isMascara and update yarn.lock	Chi Kei Chan	2017-12-13	2	-290/+464
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Substitute isMascara check for explicit check if user is on mobile browser.	Dan	2017-12-13	2	-13/+2
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Hide open in browser button on mobile (but still show on extension); adds a ↵	Dan	2017-12-13	3	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	function to detect if viewing with mobile browser.
\| \| \| \| \| * \| \|	Adds button for opening app in main browser window in extension.	Dan	2017-12-13	4	-0/+29
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Delete uneeded files from old-ui.	Dan	2017-12-13	9	-2106/+0
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Merge pull request #2639 from alextsg/cb-372	Chi Kei Chan	2017-12-08	5	-23/+28
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Update font weights to 300, remove animation from network dropdown, f…
\| \| \| \| \| \| * \ \	Merge branch 'NewUI-flat' into cb-372	Chi Kei Chan	2017-12-08	0	-0/+0
\| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ / / \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| \| * \| \|	Merge branch 'NewUI-flat' into cb-372	Chi Kei Chan	2017-12-08	162	-152/+21152
\| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ / / \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| * \| \| \|	Merge pull request #2697 from danjm/MM-333-auto-add-users-to-new-UI	Chi Kei Chan	2017-12-08	138	-43/+20783
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Auto add users to new ui
\| \| \| \| \| \| * \ \ \	Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI	Chi Kei Chan	2017-12-08	0	-0/+0
\| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \|/ / / / \| \| \| \| \| \|/\| \| \| \|
\| \| \| \| \| \| * \| \| \|	Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI	Chi Kei Chan	2017-12-08	28	-109/+369
\| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \|/ / / / \| \| \| \| \| \|/\| \| \| \|
\| \| \| \| \| * \| \| \| \|	Update max amount behaviour to meet new specs.	Dan	2017-12-07	6	-15/+55
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-12-07	3	-23/+88
\| \| \| \| \| \|\ \ \ \ \
\| \| \| \| \| * \| \| \| \| \|	Merge branch 'master' into NewUI-flat-merge-with-master	Dan	2017-12-07	19	-71/+226
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	User is automatically added to new UI if they meet conditions at time of login.	Dan	2017-12-07	2	-3/+47
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Show user notifications after switch between UIs	Dan	2017-12-05	8	-3/+185
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Update newUI UI for switching back to old UI.	Dan	2017-12-05	2	-8/+24
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Lint fix	Dan	2017-12-05	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Css selected in background based on betaUI state.	Dan	2017-12-05	1	-6/+15
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	New-ui actions accomodates old-ui.	Dan	2017-12-05	2	-8/+11
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Use newui actions in old-ui	Dan	2017-12-05	26	-25/+28
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Add UI selection	Dan	2017-12-05	11	-51/+136
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Add old-ui directory	Dan	2017-12-05	122	-0/+20398
\| \| \| \| \| \| \|/ / / / \| \| \| \| \| \|/\| \| \| \|
\| \| \| \| \| \| \| * \| \|	Update font weights to 300, remove animation from network dropdown, fix ↵	Alexander Tseung	2017-12-02	5	-23/+28
\| \| \| \| \| \| \|/ / / \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network dropdown not closing from certain click-areas
\| \| \| \| \| * \| \| \|	Merge pull request #2615 from jpclark/NewUI-flat	Thomas Huang	2017-11-29	10	-28/+494
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide blockie identicon option
\| \| \| \| \| \| * \| \| \|	Remove useBlockie in props for render	Thomas Huang	2017-11-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unused useBlock for Lint validation.
\| \| \| \| \| \| * \| \| \|	Fixes changes requested in pullrequestreview-79088534	Jason Clark	2017-11-27	3	-2/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	more eslint fixes	Jason Clark	2017-11-26	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	adding blockies lib to eslint ignore so it doesn't blow up the style checker ↵	Jason Clark	2017-11-26	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and fail the build
\| \| \| \| \| \| * \| \| \|	making eslint happy	Jason Clark	2017-11-26	3	-7/+8
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	fixing blockies display issues	Jason Clark	2017-11-26	2	-5/+9
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	swapped out ethereum-blockies lib for MEW blockies library, tightened up ↵	Jason Clark	2017-11-26	4	-86/+413
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	identicon.js code
\| \| \| \| \| \| * \| \| \|	tweaking styling	Jason Clark	2017-11-25	2	-9/+27
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	incremental commit of working blockie component	Jason Clark	2017-11-25	3	-18/+57
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	toggle wired up to preferences property store	Jason Clark	2017-11-25	6	-26/+47
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	incremental commit	Clark, Jason (Contractor)	2017-11-24	7	-5/+58
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Merge pull request #2618 from MetaMask/NewUI-flat-update-deps	Dan Finlay	2017-11-29	6	-17/+27
\| \| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \|/ / / / \| \| \| \| \| \|/\| \| \| \|	New ui flat update deps
\| \| \| \| \| \| * \| \| \|	Update babelify to 8.0.0	Thomas Huang	2017-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	Update react, react-dom, and react-test-renderer to 15.6.2	Thomas Huang	2017-11-27	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	Update ethjs-query to v0.3.1	Thomas Huang	2017-11-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	Update Qunit to QunitJS v2.4.1	Thomas Huang	2017-11-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	Update to Enzyme 3.2.0	Thomas Huang	2017-11-26	6	-11/+21
\| \| \| \| \| \|/ / / /
\| \| \| \| \| * \| \| \|	Remove unneeded type casting	Dan Finlay	2017-11-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Fix bug where gas param was not a string	Dan Finlay	2017-11-21	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevented sending transactions. Fixes #2598
* \| \| \| \| \| \| \| \|	Merge pull request #2793 from MetaMask/i2681-DoNotFailPending	Kevin Serrano	2017-12-22	3	-8/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Do not fail pending transactions after any amount of time
\| * \| \| \| \| \| \| \|	Remove retryTimePeriod from tx controller	Dan Finlay	2017-12-22	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-12-22	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Stop failing pending transactions after any period of time	Dan Finlay	2017-12-22	1	-7/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #2763 from MetaMask/AddRecentBlocksController	Thomas Huang	2017-12-21	2	-14/+69
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Recent Blocks controller
\| * \| \| \| \| \| \| \|	Do not log whole txs in recent block controller.	Dan Finlay	2017-12-20	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only record gas prices, because that has a current use.
\| * \| \| \| \| \| \| \|	Add Recent Blocks controller	Dan Finlay	2017-12-18	2	-14/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tracks recent blocks, useful for estimating recent successful gas prices.
* \| \| \| \| \| \| \| \|	Merge pull request #2771 from MetaMask/i2173-UpdateTokenValues	Thomas Huang	2017-12-20	3	-4/+54
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Allow updating token details
\| * \| \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-12-19	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow updating token details	Dan Finlay	2017-12-19	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2173
\| * \| \| \| \| \| \| \|	Add failing test for updating token details	Dan Finlay	2017-12-19	1	-0/+48
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #2751 from MetaMask/i#2720	Thomas Huang	2017-12-19	1	-1/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	transactions:gas-utils - handle new type of estimateGas error
\| * \| \| \| \| \| \|	Merge branch 'master' into i#2720	frankiebee	2017-12-16	2	-2/+2
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	transactions:gas-utils - handle new type of estimateGas error	frankiebee	2017-12-15	1	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2757 from MetaMask/kumavis-patch-2	Thomas Huang	2017-12-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	readme - fix "plugin" to "extension"
\| * \| \| \| \| \| \| \|	readme - fix "plugin" to "extension"	kumavis	2017-12-16	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #2755 from MetaMask/tests	Frankie	2017-12-16	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Change `console.log` to `log.info` for configureInfuraProvider
\| * \| \| \| \| \| \|	Change console.log for opts in _configureInfuraProvider	Thomas Huang	2017-12-16	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add exit flag to mocha to exit after tests run	Thomas Huang	2017-12-16	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #2747 from MetaMask/Version-3.13.3	Thomas Huang	2017-12-15	2	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 3.13.3
\| * \| \| \| \| \| \|	Version 3.13.3v3.13.3	Dan Finlay	2017-12-15	2	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2706 from danjm/MM-fix-buy-cancel-button	Thomas Huang	2017-12-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the cancel button in the buy screen to take the user home.
\| * \| \| \| \| \| \| \|	Fixes the cancel button in the buy screen to take the user home.	Dan	2017-12-09	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2662 from williamchong007/master	Thomas Huang	2017-12-15	1	-2/+10
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	fix #1398, prevent injecting xml without xml suffix
\| * \| \| \| \| \| \| \|	fix #1398, prevent injecting xml without xml suffix	William Chong	2017-12-05	1	-2/+10
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2733 from MetaMask/i2380-ShowNoBalance	Thomas Huang	2017-12-15	2	-4/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show watched tokens with no balance
\| * \| \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-12-13	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show watched tokens with no balance	Dan Finlay	2017-12-13	1	-4/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2744 from MetaMask/infura-block-tracker	Frankie	2017-12-14	2	-8/+52
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	re-add Infura block tracker provider
\| * \| \| \| \| \| \| \| \|	Revert "Revert "network - for infura networks use the infura block tracker ↵	kumavis	2017-12-14	2	-8/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	provider"" This reverts commit 5df7dcd758c5a16b503a5ee237970c05c7e990c9.
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵	kumavis	2017-12-14	3	-53/+8
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	infura-block-tracker
* \| \| \| \| \| \| \| \| \|	Merge pull request #2743 from MetaMask/revert-2741-infura-block-tracker	Thomas Huang	2017-12-14	2	-52/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "network - for infura networks use the infura block tracker provider"
\| * \| \| \| \| \| \| \| \| \|	Revert "network - for infura networks use the infura block tracker provider"	Frankie	2017-12-14	2	-52/+8
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2741 from MetaMask/infura-block-tracker	Frankie	2017-12-14	2	-8/+52
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network - for infura networks use the infura block tracker provider
* \ \ \ \ \ \ \ \ \ \	Merge pull request #2740 from MetaMask/i#2729infura-chill-out	kumavis	2017-12-14	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	dont aggressively query account data
\| * \| \| \| \| \| \| \| \| \|	dont aggresively query account data	frankiebee	2017-12-14	1	-2/+0
\|/ / / / / / / / / /
\| \| * / / / / / / /	deps - bump eth-json-rpc-infura	kumavis	2017-12-14	1	-1/+1
\| \|/ / / / / / / /