4751 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan	49aa6e73ea	Edit account modal shows and allows editing of name from props, not just placeholder.	2017-10-08 17:45:59 -07:00
Dan	c9c940bfc1	Clear selected token when changing network.	2017-10-08 17:45:34 -07:00
Sergey Ukustov	53bb4bebb1	More appropriate styling	2017-10-07 23:25:40 +03:00
Sergey Ukustov	a1696f89a8	Validate data format for eth_signTypedData	2017-10-07 00:38:13 +03:00
Frankie	4a4338c1f4	Merge pull request #2305 from MetaMask/nodeify ... nodeify - allow callback to be optional	2017-10-06 14:08:58 -07:00
Dan Finlay	0c61695656	Merge branch 'master' into SignTypedData	2017-10-06 14:03:04 -07:00
kumavis	fa11bbf996	Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit ... Update status of pending transactions on startup	2017-10-06 13:40:43 -07:00
kumavis	9adf77e3fe	Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMined ... Mark tx as failed after tx with same nonce is mined	2017-10-06 13:17:45 -07:00
kumavis	0b6dab384f	Merge branch 'nodeify' of github.com:MetaMask/metamask-extension into nodeify	2017-10-06 13:17:06 -07:00
kumavis	3b3120c5f8	nodeify - fix test	2017-10-06 13:16:44 -07:00
kumavis	bc396a7417	lint fix - nodeify	2017-10-06 13:02:34 -07:00
Dan Finlay	a417fab0eb	When checking pending txs, check for successful txs with same nonce. ... If a successful tx with the same nonce exists, transition tx to the failed state. Fixes #2294	2017-10-06 12:51:13 -07:00
Dan Finlay	94513cae7b	Provide method for tx tracker to refer to all txs	2017-10-06 12:50:33 -07:00
kumavis	be4f7b33f4	nodeify - allow callback to be optional	2017-10-06 12:36:08 -07:00
Dan Finlay	a32d71e8ed	Add failing test for issue #2294	2017-10-06 12:29:27 -07:00
Dan Finlay	0146b55d6d	Check status of pending transactions on startup ... Fixes #1531	2017-10-06 11:41:28 -07:00
Kevin Serrano	e557d7f756	Merge branch 'master' into precision-fix	2017-10-05 17:03:44 -07:00
kumavis	53da368d23	Merge pull request #2293 from MetaMask/Version-3.10.9 ... Version 3.10.9	2017-10-05 15:49:27 -07:00
Kevin Serrano	e6a618b82d	Fix precision to account for small wei increase.	2017-10-05 15:26:03 -07:00
Dan Finlay	52bfed5d13	Bump changelog	2017-10-05 14:53:22 -07:00
Dan Finlay	9f18b898c5	Merge branch 'Version-3.10.9' into SignTypedData	2017-10-05 14:52:19 -07:00
Dan Finlay	cf178341c1	Merge branch 'master' into SignTypedData	2017-10-05 14:50:19 -07:00
Dan Finlay	c821a6b93a	Bump provider-engine for better sender validations	2017-10-05 14:48:40 -07:00
Dan Finlay	9bc80d998e	Add signTypedData input validations	2017-10-05 14:39:35 -07:00
Dan Finlay	176d03b2e8	Require keyring-controller 2.1.0	2017-10-05 14:39:23 -07:00
Dan Finlay	8d45b96db6	Version 3.10.9	2017-10-05 12:44:48 -07:00
Dan Finlay	833d73da56	Merge pull request #2292 from MetaMask/rebrocast-by-timeStamp ... Rebrocast by time stamp	2017-10-05 12:34:56 -07:00
frankiebee	554a3ac4e4	add to CHANGELOG.md	2017-10-05 12:12:31 -07:00
Dan Finlay	c5b7880f05	Merge branch 'master' into SignTypedData	2017-10-05 11:55:23 -07:00
frankiebee	3cb9da2ae5	"fix" hours for message	2017-10-05 11:42:01 -07:00
frankiebee	e128e4859f	Merge branch 'master' into rebrocast-by-timeStamp	2017-10-05 11:08:34 -07:00
frankiebee	ec9c528313	pending-tx - check time stamp instead of block number for resubmit	2017-10-05 11:07:22 -07:00
Thomas Huang	c880d81ec3	Merge pull request #2289 from MetaMask/mascara-tuneups ... Mascara tuneups	2017-10-05 11:06:17 -07:00
frankiebee	7ec068d279	mascara/background: use async await	2017-10-04 23:26:56 -07:00
frankiebee	5eca4223b2	use log.debug	2017-10-04 23:07:40 -07:00
frankiebee	7a9e2aa4f0	mascara: linting and code clean up	2017-10-04 23:03:47 -07:00
frankiebee	2dba03ffc5	dont lint jquery	2017-10-04 22:30:28 -07:00
frankiebee	245ab70881	add /mascara to linting	2017-10-04 22:10:30 -07:00
frankiebee	e7589a099f	mascara:exampl/app - add a send tx button	2017-10-04 22:09:37 -07:00
Thomas Huang	35f4148343	Merge pull request #2282 from MetaMask/Enforce0xPrefixForKeyrings ... Enforce 0x prefix on accounts with new hd keyring	2017-10-04 16:56:20 -07:00
Dan	583342bd56	Removes old/second setProviderType method from before merge (commit bd99bc2e)	2017-10-04 15:43:10 -07:00
Dan Finlay	88686a3968	Enforce 0x prefix on accounts with new hd keyring	2017-10-04 15:35:46 -07:00
Dan Finlay	1cba6543a4	Begin implementing sync injection idea	2017-10-04 15:35:04 -07:00
Dan Finlay	a142f8913d	Merge pull request #2276 from MetaMask/revert-compute ... Revert to normal balances.	2017-10-04 14:48:42 -07:00
Frankie	852c27bad4	Merge pull request #2279 from MetaMask/filter-default-fix ... deps - bump eth-json-rpc-filters for log filter fix	2017-10-04 14:07:18 -07:00
kumavis	23bc92a8f1	deps - bump eth-json-rpc-filters for log filter fix	2017-10-04 13:33:50 -07:00
Kevin Serrano	27c72ee565	Revert to normal balances.	2017-10-04 12:10:01 -07:00
Chi Kei Chan	bd99bc2e88	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
Dan	ac4868170f	Enables remove token and ensures add/remove update the list without need for refresh.	2017-10-03 15:46:01 -07:00
Thomas Huang	f12504cd09	Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0 ... Update coveralls to the latest version 🚀	2017-10-03 12:35:25 -07:00