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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	network - for infura networks use the infura block tracker provider	kumavis	2017-12-14	2	-8/+52
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #2718 from MetaMask/ReducePollingInterval	kumavis	2017-12-10	4	-3/+11
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Reduce polling interval
\| * \| \| \| \| \| \|	Version 3.13.2v3.13.2	Dan Finlay	2017-12-10	3	-2/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-12-10	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Pass polling interval to zero client provider	Dan Finlay	2017-12-10	1	-1/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #2699 from MetaMask/patch-2v3.13.1	kumavis	2017-12-08	4	-9/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow Dapps to Specify Nonce
\| * \| \| \| \| \| \|	tx-controller - failed state is a finished state	kumavis	2017-12-08	2	-7/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Version 3.13.1	Dan Finlay	2017-12-08	2	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bump changelog	Dan Finlay	2017-12-08	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Do not allow nonces larger than the next valid nonce	Dan Finlay	2017-12-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid situations where a user signs a transaction that will become surprisingly valid in the future.
\| * \| \| \| \| \| \|	Merge branch 'master' into patch-2	Dan Finlay	2017-12-08	10	-37/+885
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	A more expressive way	vicnaum	2017-12-07	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replaced ifs with ? :
\| * \| \| \| \| \| \| \|	Fix for #2644 - Specified Nonce isn't used	vicnaum	2017-12-07	1	-1/+6
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added nonceSpecified. And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.
* \| \| \| \| \| \| \|	Merge pull request #2654 from abitrolly/patch-2	Kevin Serrano	2017-12-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Download State Logs with .json extension
\| * \| \| \| \| \| \|	Download State Logs with .json extension	Anatoli Babenia	2017-12-05	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That doesn't fix #2095, but at least makes downloaded files syntax-highlighted when opened in editors
* \| \| \| \| \| \|	Merge pull request #2688 from MetaMask/AddPriceBumpv3.13.0	Kevin Serrano	2017-12-07	1	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 10% price bump minimum to retry attempts.
\| * \| \| \| \| \| \|	Add 10% price bump to retry attempts.	Dan Finlay	2017-12-07	1	-1/+3
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out geth requires at least a 10% price bump to replace txs: https://github.com/ethereum/go-ethereum/blob/9619a610248e9630968ba1d9be8e214b645c9c55/core/tx_pool.go#L133
* \| \| \| \| \| \|	Merge pull request #2684 from MetaMask/RetryTransaction	Dan Finlay	2017-12-07	10	-37/+883
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Retry transaction
\| * \| \| \| \| \|	Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into ↵	Dan Finlay	2017-12-07	2	-1/+11
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RetryTransaction
\| \| * \| \| \| \| \|	Show retry button on submitted transactions greater than 30 seconds, add ↵	Alexander Tseung	2017-12-07	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hover styling
\| * \| \| \| \| \| \|	Version 3.13.0	Dan Finlay	2017-12-07	2	-1/+3
\| \|/ / / / / /
\| * \| \| \| \| \|	Bump changelog	Dan Finlay	2017-12-07	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into ↵	Dan Finlay	2017-12-07	1	-4/+4
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RetryTransaction
\| \| * \| \| \| \| \|	Fix styling of Retry buton	Alexander Tseung	2017-12-07	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Enforce retry tx at minimum gas of previous tx	Dan Finlay	2017-12-07	2	-2/+13
\| \|/ / / / / /
\| * \| \| \| \| \|	Fix retry action	Dan Finlay	2017-12-07	2	-3/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	View tx after editing state to unconfirmed	Dan Finlay	2017-12-07	1	-1/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix action	Dan Finlay	2017-12-07	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add development state	Dan Finlay	2017-12-07	1	-0/+739
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Connect to redux for retryTransaction	Alexander Tseung	2017-12-07	1	-2/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add button to retry transaction	Alexander Tseung	2017-12-07	1	-34/+69
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add retry background method and action	Dan Finlay	2017-12-07	5	-1/+24
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoff	Frankie	2017-12-07	3	-23/+88
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Exponentional backoff on transaction retry in pending-tx-tracker
\| * \| \| \| \|	Add tests for exponential backoff code in _resubmitTx	Dan	2017-12-07	1	-17/+63
\| \| \| \| \| \|
\| * \| \| \| \|	Update resubmitPendingTxs tests.	Dan	2017-12-07	1	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta ↵	Dan	2017-12-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in _resubmitTx
\| * \| \| \| \|	Correct note for updateTx after block-update event in transaction.js	Dan	2017-12-07	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix undefined latestBlockNumber in _resubmitTx	Dan	2017-12-07	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Exponentional backoff on transaction retry in pending-tx-tracker	Dan	2017-12-06	2	-2/+20
\|/ / / / /
* \| \| \| \|	Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1	Thomas Huang	2017-11-30	12	-54/+127
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Versioned notices
\| * \| \| \| \|	Bump changelog	Dan Finlay	2017-11-30	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Remove debugger	Dan Finlay	2017-11-30	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Add markdown class to mascara ui markdown field	Dan Finlay	2017-11-30	2	-4/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Bump version to 3.12.1	Dan Finlay	2017-11-30	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix test reference	Dan Finlay	2017-11-30	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Make notice skipping async	Dan Finlay	2017-11-30	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Redundantly skip notices	Dan Finlay	2017-11-30	1	-25/+22
\| \| \| \| \| \|
\| * \| \| \| \|	Make test more resilient	Dan Finlay	2017-11-30	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Remove duplicate button declaration	Dan Finlay	2017-11-30	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix test selector	Dan Finlay	2017-11-30	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix migration comment	Dan Finlay	2017-11-30	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Accept all notices in integration tests	Dan Finlay	2017-11-30	1	-18/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Fix test to skip screens before privacy notice	Dan Finlay	2017-11-29	1	-1/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Migrate old data to include firstVersion info	Dan Finlay	2017-11-29	3	-1/+42
\| \| \| \| \| \|
\| * \| \| \| \|	Bump changelog	Dan Finlay	2017-11-29	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Linted	Dan Finlay	2017-11-29	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add seed phrase bounty award notice	Dan Finlay	2017-11-29	4	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only shows to people who installed before or equal to MetaMask 3.12.1
\| * \| \| \| \|	Get notice version filtering working nicely	Dan Finlay	2017-11-29	4	-24/+38
\| \| \| \| \| \|
\| * \| \| \| \|	Add firstVersion field to notices selector	Dan Finlay	2017-11-29	2	-1/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Add optional version field to notices	Dan Finlay	2017-11-29	3	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows notices to only show to users who are on a certain version.
* \| \| \| \| \|	Merge pull request #2627 from MetaMask/reload-fix	kumavis	2017-11-30	4	-7/+11
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix dapp reload via obs-store@3
\| * \| \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix	kumavis	2017-11-30	2	-8/+8
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2620 from MetaMask/update-deps	Dan Finlay	2017-11-29	1	-7/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update greenkeeper deps for master
\| * \| \| \| \| \|	Update greenkeeper deps for master	Thomas Huang	2017-11-28	1	-7/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2441 from MetaMask/kumavis-patch-3	Dan Finlay	2017-11-28	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NetworkController - add warning when aborting lookupNetwork
\| * \| \| \| \| \| \|	network controller - warn via log.warn	kumavis	2017-11-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update network.js	kumavis	2017-10-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	deps - obs-store@3 + migrate stream plumbing	kumavis	2017-11-29	4	-7/+11
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2605 from MetaMask/i2577-SeedPhraseBug	Thomas Huang	2017-11-28	4	-5/+68
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Fix a possible seed phrase bug
\| * \| \| \| \| \|	Bump changelog	Dan Finlay	2017-11-21	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove logs	Dan Finlay	2017-11-21	1	-6/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Get test passing	Dan Finlay	2017-11-21	1	-4/+25
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'i2577-SeedPhraseBug' into i2577-SeedPhraseBug-Test	Dan Finlay	2017-11-21	2	-5/+34
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Prevent multiple submissions of first time form	Dan Finlay	2017-11-21	1	-1/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Prevent creation of multiple vaults	Dan Finlay	2017-11-21	1	-31/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2577 by ensuring only one seed phrase can be set for a new vault. Also cleans up logs and reproduction logic.
\| \| * \| \| \| \| \|	Add reproduction and mutex code	Dan Finlay	2017-11-21	1	-2/+37
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add failing test for #2577 Seed Phrase Bug	Dan Finlay	2017-11-21	1	-0/+18
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #2607 from MetaMask/i2504-OperaFix	Thomas Huang	2017-11-28	1	-1/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure Opera build excludes chromereload file
\| * \| \| \| \| \| \|	Ensure Opera build excludes chromereload file	Dan Finlay	2017-11-22	1	-1/+7
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2504
* \| \| \| \| \| \|	Merge pull request #2603 from MetaMask/greenkeeper/react-markdown-3.0.0	Thomas Huang	2017-11-25	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Update react-markdown to the latest version 🚀
\| * \| \| \| \| \|	fix(package): update react-markdown to version 3.0.0	greenkeeper[bot]	2017-11-20	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error	Thomas Huang	2017-11-21	2	-0/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add useful error when duplicate web3 is detected.
\| * \| \| \| \| \| \|	Add useful error when duplicate web3 is detected.	Dan Finlay	2017-11-01	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2507
* \| \| \| \| \| \| \|	Merge pull request #2596 from MetaMask/issue-template-support-link	Thomas Huang	2017-11-21	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Point issue template at new support center
\| * \| \| \| \| \| \|	Point issue template at new support center	Dan Finlay	2017-11-18	1	-3/+3
\|/ / / / / / /
\| \| \| * \| \| \|	Merge pull request #2591 from MetaMask/NewUI-flat	Chi Kei Chan	2017-11-16	40	-180/+780
\| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Release 4.0.4
\| \| \| \| * \| \|	Merge pull request #2590 from MetaMask/merge-master	Chi Kei Chan	2017-11-16	10	-17/+53
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge master
\| \| \| \| \| * \| \|	Version Bump	Chi Kei Chan	2017-11-16	2	-1/+5
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Merge branch 'master' into merge-master	Chi Kei Chan	2017-11-16	8	-16/+48
\| \| \| \| \|/\| \| \| \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2540 from doraemondrian/master	Thomas Huang	2017-11-15	3	-6/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	newUnaprovedTx => newUnapprovedTx
\| * \| \| \| \| \|	newUnaprovedTx => newUnapprovedTx	Dora E. Mondrian	2017-11-06	3	-6/+6
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This typo tripped me up when I was reading through the code and trying to understand what's going on.
* \| \| \| \| \|	Merge pull request #2508 from watilde/fixes-1192	Thomas Huang	2017-10-31	3	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove warning message when show import page
\| * \| \| \| \| \|	Use const and fix lint warnings	Daijiro Wachi	2017-10-31	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove warning message when show import page	Daijiro Wachi	2017-10-31	2	-0/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
* \| \| \| \| \|	Merge pull request #2291 from MetaMask/gasPriceSpecified	Kevin Serrano	2017-10-28	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add boolean for specified gas price
\| * \| \| \| \| \|	Add indicator for specified gas price	Kevin Serrano	2017-10-06	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2275 from MetaMask/version-debugging	Kevin Serrano	2017-10-27	4	-12/+45
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add OS Version and Browser Version to State Logs
\| * \| \| \| \| \| \|	Add option to copy directly to clipboard.	Kevin Serrano	2017-10-27	1	-3/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Correct changelog.	Kevin Serrano	2017-10-27	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bump Changelog	Kevin Serrano	2017-10-27	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Resolve merge conflicts	Kevin Serrano	2017-10-27	72	-232/+12470
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2489 from MetaMask/3.12.0	Frankie	2017-10-26	2	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3.12.0
\| * \| \| \| \| \| \| \|	3.12.0v3.12.0	kumavis	2017-10-26	2	-1/+3
\|/ / / / / / / /
\| * \| \| \| \| \| \|	Changelog addition.	Kevin Serrano	2017-10-10	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into version-debugging	Kevin Serrano	2017-10-10	21	-24/+539
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Make the function callback friendly.	Kevin Serrano	2017-10-10	3	-8/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Simplify try catch	Kevin Serrano	2017-10-06	1	-4/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Catch an error if this is not defined.	Kevin Serrano	2017-10-06	1	-1/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into version-debugging	Kevin Serrano	2017-10-06	15	-98/+94
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	lint	Kevin Serrano	2017-10-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Further adjustment to maintain API	Kevin Serrano	2017-10-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename to maintain API	Kevin Serrano	2017-10-05	2	-2/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Configured for callback-required function.'	Kevin Serrano	2017-10-05	3	-11/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	change global to window	Kevin Serrano	2017-10-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Include browser version	Kevin Serrano	2017-10-05	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Include OS version	Kevin Serrano	2017-10-05	2	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Merge pull request #2587 from danjm/MM-281-currencyinput-in-gas-estimator	Daniel Tsui	2017-11-16	2	-5/+8
\| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Use currency input component in gas customizer
\| \| \| \| \| \| \| \| * \| \|	Gas customzier does not consider amount when sending tokens.	Dan	2017-11-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Use currency input component in input number, to improve input behaviour in ↵	Dan	2017-11-16	1	-4/+7
\| \| \| \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gas estimator
\| \| \| \| \| \| \| * \| \|	Show tokens with zero balance	Alexander Tseung	2017-11-15	1	-4/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Create single action for updating all of send in redux state.	Dan	2017-11-15	5	-13/+38
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Allow editing of token transactions.	Dan	2017-11-15	2	-11/+91
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Fix lint errors.	Dan	2017-11-15	4	-18/+15
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Allow editing of send ether.	Dan	2017-11-15	5	-23/+131
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Improve variable name.	Dan	2017-11-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Deposit button shows link to faucet on testnet networks.	Dan	2017-11-14	1	-15/+23
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Cursor pointer and hover background on from and to dropdown items.	Dan	2017-11-11	4	-0/+15
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Focus amount input when click anywhere in amount field container	Dan	2017-11-11	2	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Rounding of vals < 0.01 in currency display consistent with master.	Dan	2017-11-11	2	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Linting	Thomas Huang	2017-11-11	5	-9/+9
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Network loading does not block network loading.	Dan	2017-11-10	5	-16/+27
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	darker backdrop style for modal	cjeria	2017-11-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Merge pull request #2549 from danjm/NewUI-flat-send-amount-fixes	Daniel Tsui	2017-11-08	2	-20/+29
\| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Fix issues with amount max
\| \| \| \| \| \| \| \| * \| \|	Calculate max amount for send ether based on minimum gas total.	Dan	2017-11-08	2	-10/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Fix amount max for sending token.	Dan	2017-11-08	2	-10/+28
\| \| \| \| \| \| \| \|/ / /
\| \| \| \| \| \| \| * \| \|	Merge pull request #2510 from danjm/NewUI-flat-token-balance	Daniel Tsui	2017-11-08	17	-82/+387
\| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Improving gas precision and send (token) balance validation; max amount feature
\| \| \| \| \| \| \| \| * \| \|	Add currency-input component to correct send amount behaviour and move ↵	Dan	2017-11-08	3	-32/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	currency display value state to parent component.
\| \| \| \| \| \| \| \| * \| \|	Lint fixes.	Dan	2017-11-07	5	-15/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Allow sending 0 eth or tokens	Dan	2017-11-07	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Set gas price allows for WEI precision.	Dan	2017-11-07	4	-10/+30
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Insufficient balance warning in gas customizer works for send token	Dan	2017-11-07	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Adds max amount feature for send token	Dan	2017-11-07	1	-5/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Adds max amount feature for send-ether	Dan	2017-11-07	5	-2/+65
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Token balance in send state; validating sufficient tokens, validation ↵	Dan	2017-11-07	11	-33/+191
\| \| \| \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updates on 'from' switching.
\| \| \| \| \| \| \| * \| \|	Merge pull request #2530 from MetaMask/uat	Chi Kei Chan	2017-11-03	54	-1019/+952
\| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge uat into NewUI-flat
\| \| \| \| \| \| \| * \| \| \|	Fixes width of from and to dropdowns in extension and on mobile views.	Dan	2017-11-03	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Merge pull request #2518 from MetaMask/mascara-first-screen	Frankie	2017-11-08	5	-54/+110
\| \| \| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \|_\|/ / / \| \| \| \| \| \| \|/\| \| \| \|	Mascara first screen
\| \| \| \| \| \| \| * \| \| \|	Merge remote-tracking branch 'origin/uat' into mascara-first-screen	frankiebee	2017-11-08	64	-1161/+1296
\| \| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \|/ / / / \| \| \| \| \| \| \|/\| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Update classnames for integration tests and add output/index.css to ↵	Dan	2017-11-03	3	-38/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration test for ci
\| \| \| \| \| \| * \| \| \| \|	Get current NewUI-flat tests working.	Dan	2017-11-03	6	-137/+113
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Merge pull request #2519 from danjm/NewUI-flat-lintfixes	Thomas Huang	2017-11-03	57	-986/+1158
\| \| \| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[NewUI-flat] New ui flat lintfixes
\| \| \| \| \| \| \| * \| \| \| \|	More lint fixes	Dan	2017-11-02	33	-115/+108
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \| \|	Lint fixes for NewUI-flat.	Dan	2017-11-02	35	-726/+703
\| \| \| \| \| \| \| \| \|/ / / \| \| \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| \| \| * \| \| \|	Add utility for getting token data; get token data in tx-list even if token ↵	Dan	2017-10-28	4	-29/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	has been removed.
\| \| \| \| \| \| \| * \| \| \|	Provide default new account name	Alexander Tseung	2017-10-27	1	-63/+78
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Fix Settings/Info screen being visible on logout (#2490)	Alexander Tseung	2017-10-27	2	-6/+43
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Correct rendering of conversions when conversion rate is a token. (#2498)	Dan J Miller	2017-10-27	3	-20/+52
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Clear import error state on logout.	Dan	2017-10-27	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	eth_sign warning color	Dan	2017-10-27	2	-3/+18
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Change min gas price to 0.1 GWEI	Dan	2017-10-27	7	-31/+68
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \|	Fix input border rendering on mobile	Alexander Tseung	2017-10-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	mascara:create-password - use less words in metamask explanation	frankiebee	2017-11-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	mascara - fix words and enviroment vars	frankiebee	2017-11-03	2	-11/+7
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	mascara:first-time - fix wording	frankiebee	2017-11-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	fix mascara build	frankiebee	2017-11-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	mascara:first-time - add alpha warning and a about metamask and mascot	frankiebee	2017-11-01	2	-47/+107
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	ui - allow optional size for mascot	frankiebee	2017-11-01	1	-3/+3
\| \| \| \| \| \| \| \|/ / / \| \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| \| * \| \| \|	4.0.3	kumavis	2017-10-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	Merge branch 'NewUI-flat' into uat	Chi Kei Chan	2017-10-26	117	-953/+5652
\| \| \| \| \| \| \|\\| \| \|
\| \| \| \| \| \| \| * \| \|	Add Token styling fix	Chi Kei Chan	2017-10-26	2	-5/+29
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-26	4	-10/+20
\| \| \| \| \| \| \| \|\ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2100 from ChainsawBaby/patch-1	Kevin Serrano	2017-10-26	2	-3/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove annoying console.log on each run
\| * \| \| \| \| \| \| \| \| \|	Bump Changelog	Kevin Serrano	2017-10-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Resolving that ugly merge.	Kevin Serrano	2017-10-26	1	-3/+7
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2476 from MetaMask/100MweiMinGasPrice	Dan Finlay	2017-10-26	3	-12/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce minimum gas price to 100 MWEI
\| * \| \| \| \| \| \| \| \| \|	Add labels to clarify warning.	Kevin Serrano	2017-10-26	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Account for non-submitted mins and max	Kevin Serrano	2017-10-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add clarifying comment about wei conversion.	Kevin Serrano	2017-10-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Cut out intermediary wei steps.	Kevin Serrano	2017-10-26	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove unneeded toString conversions.	Kevin Serrano	2017-10-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move upsize conversions for input warning at front of fn.	Kevin Serrano	2017-10-26	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix mismatched decimal/hex conversion in pending-tx	Kevin Serrano	2017-10-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove css build bundle from uat	Dan Finlay	2017-10-26	1	-4491/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update changelog	Dan Finlay	2017-10-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Resolve merge conflict.	Kevin Serrano	2017-10-25	3	-1/+4493
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Reduce minimum gas price to 100 MWEI	Dan Finlay	2017-10-25	3	-7/+4499
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also now representing gas price in MWEI, because our current bn inputs actually aren't tolerant of minimums less than 1 unit.
\| * \| \| \| \| \| \| \| \| \| \|	Fix for gas price to be lowered.	Kevin Serrano	2017-10-25	2	-11/+13
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2478 from MetaMask/mascaraHeadersFix	Frankie	2017-10-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix X-Frame-Options for mascara
\| * \| \| \| \| \| \| \| \| \| \|	Fix X-Frame-Options for mascara	tmashuang	2017-10-25	1	-1/+1
\|/ / / / / / / / / / /
\| \| \| \| \| \| \| \| * \| \|	Allow editing account name in account details modal	Alexander Tseung	2017-10-26	7	-64/+149
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Sign Typed Request styling fixes	Chi Kei Chan	2017-10-26	3	-10/+18
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Signature request fixes.	Dan	2017-10-26	4	-26/+30
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Fix Import an Account link not working in Create Account modal	Alexander Tseung	2017-10-26	1	-6/+10
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Signature Request	Dan	2017-10-26	7	-60/+613
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Fix send token bug.	Dan	2017-10-26	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Adds revert feature to customize gas modal.	Dan	2017-10-26	2	-15/+16
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Add Info section	Alexander Tseung	2017-10-26	5	-6/+173
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Add GWEI to gas price unit	Chi Kei Chan	2017-10-25	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	From and To field cannot be the same	Chi Kei Chan	2017-10-25	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Fix gas input styling on mobile view	Chi Kei Chan	2017-10-25	4	-14/+34
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Update Import Account Help Link	Chi Kei Chan	2017-10-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Show home page when metafox is clicked	Chi Kei Chan	2017-10-25	2	-4/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Fix alignment on right arrow of confirm tx screens	Chi Kei Chan	2017-10-25	5	-4/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Fix styling on notification view	Chi Kei Chan	2017-10-25	3	-3/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Add ellipsis to super long account name	Chi Kei Chan	2017-10-25	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Change download to show in Export Private Key Modal	Chi Kei Chan	2017-10-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Remove memo input	Chi Kei Chan	2017-10-25	2	-7/+18
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Add BuyEtherWidget for future use in buy ether modal	Chi Kei Chan	2017-10-25	1	-0/+197
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Styling and UX changes on sidebar	Chi Kei Chan	2017-10-25	2	-11/+14
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Add token list and buy modal alignment fix	Chi Kei Chan	2017-10-25	3	-15/+36
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-25	21	-48/+60
\| \| \| \| \| \| \| \| \|\ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2422 from watilde/fixes-lint	Kevin Serrano	2017-10-25	22	-49/+55
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Fixes lint warnings
\| * \| \| \| \| \| \| \| \| \|	Fix lint warnings	Daijiro Wachi	2017-10-22	20	-49/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed warnings: ```md app/scripts/controllers/computed-balances.js + 35:27 warning Missing space before function parentheses space-before-function-paren + 41:14 warning 'address' is never reassigned. Use 'const' instead prefer-const + 61:9 warning 'updater' is never reassigned. Use 'const' instead prefer-const + 68:11 warning 'newState' is never reassigned. Use 'const' instead prefer-const app/scripts/controllers/network.js + 104:29 warning Missing space before function parentheses space-before-function-paren app/scripts/lib/createLoggerMiddleware.js + 4:32 warning Missing space before function parentheses space-before-function-paren + 15:2 warning Newline required at end of file but not found eol-last app/scripts/lib/createOriginMiddleware.js + 4:32 warning Missing space before function parentheses space-before-function-paren + 9:2 warning Newline required at end of file but not found eol-last app/scripts/lib/createProviderMiddleware.js + 5:34 warning Missing space before function parentheses space-before-function-paren + 13:2 warning Newline required at end of file but not found eol-last app/scripts/lib/events-proxy.js + 1:50 warning Missing space before function parentheses space-before-function-paren + 31:2 warning Newline required at end of file but not found eol-last app/scripts/lib/nodeify.js + 2:22 warning Missing space before function parentheses space-before-function-paren + 2:24 warning Missing space before opening brace space-before-blocks + 5:18 warning Missing space before function parentheses space-before-function-paren + 5:20 warning Missing space before opening brace space-before-blocks app/scripts/lib/pending-balance-calculator.js + 16:19 warning Missing space before function parentheses space-before-function-paren app/scripts/lib/pending-tx-tracker.js + 85:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 87:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 88:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 90:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 91:11 warning '\|\|' should be placed at the end of the line operator-linebreak app/scripts/lib/port-stream.js + 3:22 warning Missing space before function parentheses space-before-function-paren + 3:24 warning Missing space before opening brace space-before-blocks app/scripts/lib/tx-gas-utils.js + 84:2 warning Newline required at end of file but not found eol-last app/scripts/lib/tx-state-history-helper.js + 12:37 warning Missing space before function parentheses space-before-function-paren + 23:30 warning Missing space before function parentheses space-before-function-paren + 30:23 warning Missing space before function parentheses space-before-function-paren + 35:28 warning Missing space before function parentheses space-before-function-paren + 41:2 warning Newline required at end of file but not found eol-last app/scripts/lib/tx-state-manager.js + 94:13 warning 'value' is never reassigned. Use 'const' instead prefer-const ui/app/reducers.js + 45:7 warning 'state' is never reassigned. Use 'const' instead prefer-const + 53:7 warning 'stateString' is never reassigned. Use 'const' instead prefer-const ui/lib/tx-helper.js + 27:2 warning Newline required at end of file but not found eol-last ui/app/components/account-dropdowns.js + 163:1 warning More than 2 blank lines not allowed no-multiple-empty-lines ui/app/components/menu-droppo.js + 22:7 warning 'style' is never reassigned. Use 'const' instead prefer-const ui/app/components/shapeshift-form.js + 135:11 warning '&&' should be placed at the end of the line operator-linebreak ui/app/components/typed-message-renderer.js + 35:25 warning Missing space before function parentheses space-before-function-paren + 42:2 warning Newline required at end of file but not found eol-last mascara/server/index.js + 11:42 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 12:36 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 13:33 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 14:40 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 20:29 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 21:29 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 26:40 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat ```
\| * \| \| \| \| \| \| \| \| \|	Add lint:fix command to gulp and npm-scripts	Daijiro Wachi	2017-10-22	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Hide sidebar on add token	Chi Kei Chan	2017-10-25	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \|	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-25	41	-163/+2966
\| \| \| \| \| \| \| \| \|\ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1990 from chikeichan/firsttimeflow	Thomas Huang	2017-10-25	36	-64/+12257
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \|	Implement Mascara First Time Flow
\| * \| \| \| \| \| \| \| \| \|	Add error messages when importing an account	tmashuang	2017-10-24	2	-17/+24
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'firsttimeflow' of ↵	tmashuang	2017-10-24	35	-63/+12249
\|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/chikeichan/metamask-plugin into firsttimeflow
\| * \| \| \| \| \| \| \| \| \|	Add Import With Seed Phrase	Chi Kei Chan	2017-10-21	6	-19/+156
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add mobile responsiveness	Chi Kei Chan	2017-10-21	2	-177/+192
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove import option	Chi Kei Chan	2017-10-21	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix import	Chi Kei Chan	2017-10-21	1	-21/+31
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix capitialization	Chi Kei Chan	2017-10-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add Integration Tests	Chi Kei Chan	2017-10-21	4	-15/+61
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixing integraiton test	Chi Kei Chan	2017-10-21	2	-3/+130
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix unit test	Chi Kei Chan	2017-10-21	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix linter	Chi Kei Chan	2017-10-21	10	-123/+245
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	ShapeShift Integration	Chi Kei Chan	2017-10-21	6	-90/+287
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add ShapeShift UI	Chi Kei Chan	2017-10-21	6	-80/+353
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix merge conflict; separate onboarding buy screen	Chi Kei Chan	2017-10-21	8	-29/+9558
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add missing presets	Chi Kei Chan	2017-10-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move "Skip this step" to side panel	Jacky Chan	2017-10-21	2	-12/+17
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Disable CTA unless notice is scrolled to bottom	Jacky Chan	2017-10-21	2	-4/+29
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix Buy Ether flow	Jacky Chan	2017-10-21	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Shuffle tokens	Jacky Chan	2017-10-21	4	-25/+44
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add Go to Coinbase; Show Buy Ether after signup	Jacky Chan	2017-10-21	10	-74/+125
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Hide Warning after changing import options	Jacky Chan	2017-10-21	2	-5/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Implement Buy Ether Screen UI	Jacky Chan	2017-10-21	3	-8/+318
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Implement Import Account Screen	Jacky Chan	2017-10-21	5	-16/+328
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add BackupPhraseScreen	Jacky Chan	2017-10-21	6	-14/+406
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add NoticeScreen	Jacky Chan	2017-10-21	4	-20/+119
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add UniqueImageScreen	Jacky Chan	2017-10-21	10	-64/+329
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add Breadcrumbs	Jacky Chan	2017-10-21	3	-2/+47
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	CreatePasswordScreen	Jacky Chan	2017-10-21	4	-3/+105
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Adding CreatePasswordScreen	Jacky Chan	2017-10-21	6	-2/+95
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2429 from MetaMask/i2428-AltEnsTlds	Frankie	2017-10-24	4	-2/+13
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for alternative ENS TLDs
\| * \| \| \| \| \| \| \| \| \|	Try to fix intermittent test failure in NonceTracker tests	Dan Finlay	2017-10-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add support for alternative ENS TLDs	Dan Finlay	2017-10-23	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2428
\| * \| \| \| \| \| \| \| \| \|	Version 3.11.2v3.11.2	Dan Finlay	2017-10-22	2	-1/+6
\|/ / / / / / / / / /