894 Commits

Author	SHA1	Message	Date
Kevin Serrano	e66035254f	More conflict resolution.	2017-03-01 10:04:25 -08:00
Kevin Serrano	0a3849ec84	Fix merge conflicts.	2017-03-01 10:01:21 -08:00
Dan Finlay	ddc136a7c2	Add a couple more debug logs	2017-02-28 15:41:20 -08:00
Dan Finlay	f908aaafbc	Use correct action to update and submit tx	2017-02-28 14:45:21 -08:00
Dan Finlay	e07e4b7bc7	Linted	2017-02-28 14:13:58 -08:00
Dan Finlay	da88481560	Remove gasMultiplier txMeta param ... This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter.	2017-02-28 14:08:00 -08:00
Dan Finlay	2e16e1eb94	Fixed bug that made send screen sometimes transition to account detail	2017-02-28 12:00:07 -08:00
Dan Finlay	1eb4a5d62c	Add background method for updating and approving a tx in one call	2017-02-27 18:25:46 -08:00
Dan Finlay	462c7ae213	Merge branch 'master' into i765-gaslimits	2017-02-27 12:59:19 -08:00
Dan Finlay	b5d03cd524	add controllers to root scripts folder	2017-02-27 10:40:37 -08:00
Dan Finlay	5edb3db969	Merge branch 'master' into i1144-moarrpc	2017-02-27 10:36:48 -08:00
Dan Finlay	8c66260bdb	Removed redundant personal_recover logic	2017-02-24 17:07:54 -08:00
Dan Finlay	f2851402f3	Mostly fix personal_recover	2017-02-24 16:36:29 -08:00
Kevin Serrano	dfc89d6c6d	Make gasPrice accessible to the UI.	2017-02-24 15:06:55 -08:00
Dan Finlay	961a83769b	Fix cancel msg signing behavior.	2017-02-23 16:02:58 -08:00
Dan Finlay	4697aca02c	Got personal_sign working ... Also fixed bug where signing would not close popup.	2017-02-23 14:23:45 -08:00
Kevin Serrano	62854398f1	Tested against code to play nice with unit tests.	2017-02-23 13:56:58 -08:00
Dan Finlay	7ec25526b7	Add alternate UI for pending personal_sign messages	2017-02-23 11:18:49 -08:00
Dan Finlay	564f920ae0	Add personal sign actions and template	2017-02-22 16:30:09 -08:00
Kevin Serrano	7a0ce31bd3	Implemented functionality for displaying recent custom RPCs	2017-02-22 15:12:56 -08:00
Dan Finlay	8684fc40c7	Allow provider to init before keyringController	2017-02-21 14:41:55 -08:00
Dan Finlay	6c0916c28d	Fix reference	2017-02-21 14:37:01 -08:00
Dan Finlay	92fb07999a	Point metamask-controller personalSignRecover method to keyring-controller	2017-02-21 14:32:35 -08:00
Dan Finlay	0584988688	Move sigUtil and keyrings to external modules ... These external modules now have their own test coverage and build enforcement. This allowed me to somewhat more easily add good tests around our personalSign strategy (held now in [eth-sig-util](https://github.com/flyswatter/eth-sig-util), and allow each of the keyrings to import that, etc.	2017-02-21 14:25:47 -08:00
Kevin Serrano	026e0e3383	Fix naming	2017-02-21 12:51:46 -08:00
Kevin Serrano	db48f8984f	Basic infrasture for RPC list added.	2017-02-21 12:32:13 -08:00
Dan Finlay	04e80d36be	Version 3.3.0	2017-02-20 14:46:55 -08:00
Dan Finlay	48ab446436	Add memstore update after adding new keyring	2017-02-15 16:25:47 -08:00
kumavis	943bcec0d7	keyring controller - update memStore after restoreKeyring	2017-02-15 16:04:40 -08:00
Dan Finlay	352bb5cb39	Merge branch 'master' into dev	2017-02-15 15:49:04 -08:00
Kevin Serrano	75f7c1244a	Made migrations non-destructive; fixed currency migration.	2017-02-15 11:14:53 -08:00
Kevin Serrano	cd75d86187	Add migrations for removing terms of use data.	2017-02-14 13:21:00 -08:00
Dan Finlay	f2486fbdd3	got hash test passing	2017-02-13 21:25:02 -08:00
Kevin Serrano	f9601ac2dd	Merge branch 'dev' into disclaimer-notify	2017-02-09 19:04:17 -08:00
kumavis	d1a6b8c8ed	Merge branch 'dev' into i1085-synchronousnet	2017-02-09 18:41:01 -08:00
Dan Finlay	26ae3d206f	Version 3.2.2	2017-02-09 18:21:11 -08:00
Kevin Serrano	65c84ac4b2	Delete all code related to disclaimers.	2017-02-09 18:17:50 -08:00
Kevin Serrano	1d0fcf129c	Fix bugs with notice. Add disclaimer notice.	2017-02-09 17:47:51 -08:00
Frankie	de6455151e	Revert old style message sighing	2017-02-09 17:32:49 -08:00
Kevin Serrano	4033b620bd	Allowed net_version to be called synchronously	2017-02-08 15:51:22 -08:00
Dan Finlay	5d827bece3	Version 3.2.1	2017-02-08 13:12:40 -08:00
Dan Finlay	480c7c5d24	Version 3.2.0	2017-02-07 16:11:30 -08:00
Dan Finlay	c0637f8d6a	Fix typo	2017-02-04 16:32:09 -08:00
Dan Finlay	0c0c0051e4	Remove shapeshift tx list from idStore	2017-02-04 15:20:31 -08:00
Dan Finlay	89bbccb09c	Stop removing old shapeshift txs	2017-02-04 15:15:50 -08:00
Dan Finlay	af439cc6cf	Do not remove completed shapeshift deposits	2017-02-03 21:40:27 -08:00
Dan Finlay	901eeb5c10	Fix bug when clearing old shapeshift txs	2017-02-03 21:39:22 -08:00
Dan Finlay	5d37f90787	Automatically remove shapeshift txs over 11 minutes old with no payment	2017-02-03 21:36:04 -08:00
Dan Finlay	c9024655d3	Add migration to index	2017-02-03 21:35:54 -08:00
Dan Finlay	4dc71ed57b	Got ShapeShiftController back to working	2017-02-03 21:12:18 -08:00