295 Commits

Author	SHA1	Message	Date
Kevin Serrano	3fe8e2b659	Merge branch 'master' into i1089-networkfront	2017-02-15 15:44:14 -08:00
Kevin Serrano	fbabcf6191	Change networks from lock screen.	2017-02-15 15:35:56 -08:00
Frankie	de6455151e	Revert old style message sighing	2017-02-09 17:32:49 -08:00
Frankie	ce0c3ed03c	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 12:03:42 -08:00
kumavis	f9b31fe2c3	rename selectedAccount to selectedAddress	2017-01-30 15:08:31 -08:00
Frankie	8be68575bb	Clean up message manger includes: ... Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern	2017-01-28 20:28:20 -08:00
Dan Finlay	9f1884145a	Merge branch 'dev' into i715-AddJsonImport	2017-01-18 17:24:12 -08:00
Dan Finlay	5d8a3dd99b	Add ability to import v3 JSON wallets ... There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715	2017-01-18 16:45:39 -08:00
Dan Finlay	0e01abdf71	Merge branch 'master' into Version-3.1.0	2017-01-18 12:25:35 -08:00
Frankie	e3650b336a	Merge branch 'master' into fixSignedVsSubmitted	2017-01-18 11:30:41 -08:00
Frankie	460cbb985f	Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block	2017-01-18 11:24:53 -08:00
Dan Finlay	958cbfbde4	Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu	2017-01-17 13:58:54 -08:00
Dan Finlay	5dd5619e5d	Merge branch 'master' into dev	2017-01-16 10:55:32 -08:00
Frankie	5ed52eed68	Clean up code	2017-01-13 10:44:22 -08:00
Frankie	34081c8cb2	Fix sorting and instances where something could be undefined	2017-01-11 17:02:57 -08:00
Frankie	576e2ad64d	Fix wording and icon of failed txs	2017-01-11 15:44:21 -08:00
Frankie	0fae263a9a	Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions	2017-01-11 12:16:37 -08:00
Frankie	29060acb72	update coinbase info and view	2017-01-10 12:18:39 -08:00
Kevin Serrano	b8d312f8b9	Linting.	2017-01-04 15:04:51 -08:00
Kevin Serrano	a8a37e4d40	Make network somewhat more modular, add new network indicator.	2017-01-04 14:30:14 -08:00
Dan Finlay	2dbbc0dce7	Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager	2017-01-02 17:32:51 -08:00
Dan Finlay	c05e04c611	Fix rendering of loose accounts	2016-12-23 17:23:33 -08:00
Frankie	fa3e708f34	Merge branch 'dev' into TxManager	2016-12-23 12:48:36 -08:00
Frankie	6f7c23fd28	Merge branch 'dev' into TxManager	2016-12-21 14:31:07 -08:00
Frances Pangilinan	6e78494846	First pass at revision requests	2016-12-21 13:41:32 -08:00
Dan Finlay	11c1004a41	Linted	2016-12-20 16:07:24 -08:00
Frances Pangilinan	4910e2f9bd	remove network Id 2 from explorer link and Add network Id 3	2016-12-20 13:49:22 -08:00
Dan Finlay	77d2deb176	Merged master into dev	2016-12-19 13:37:27 -08:00
Dan Finlay	6d13ef691f	Revert "Interface enhancements"	2016-12-16 10:04:57 -08:00
Dan Finlay	83880a5c92	Remove morden testnet provider ... Instances configured to point at Morden will now point at Ropsten.	2016-12-15 16:12:03 -08:00
Luis Iván Cuende	4a8bc63c8d	Better account details view	2016-12-14 10:03:56 -08:00
Luis Iván Cuende	c65db9290d	Better editable label	2016-12-14 09:38:20 -08:00
Dan Finlay	85d5b12f8d	Fix tx adding code ... Broken in this commit: bc39cd7b89 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.	2016-11-29 12:46:08 -08:00
Dan Finlay	b899119582	Merge branch 'master' into dev	2016-11-23 16:54:27 -08:00
Kevin Serrano	8261cf232d	Merge branch 'dev' into dev-cleanup	2016-11-22 10:50:15 -08:00
Kevin Serrano	17669e4af8	Make ropsten faucet button point at the correct url.	2016-11-22 10:20:59 -08:00
Kevin Serrano	8d2afccdc0	Ropsten has sole access to the faucet.	2016-11-22 10:13:57 -08:00
Kevin Serrano	88ed1f191f	Add to changelog.	2016-11-22 09:45:28 -08:00
Kevin Serrano	f5b0795ac5	change all instances of selectedAddress to selectedAccount.	2016-11-21 16:21:16 -08:00
Dan Finlay	7ab9d40820	Merge branch 'dev' into i831-AddRopsten-Dev	2016-11-21 11:03:32 -08:00
Dan Finlay	e8a8302624	Begin adding Ropsten support ... Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831	2016-11-21 10:58:49 -08:00
Kevin Serrano	0c23925c23	Fix lint rules for ternary operator placement.	2016-11-11 15:37:22 -08:00
Kevin Serrano	23263bec7d	Linting to the max.	2016-11-11 10:26:12 -08:00
kumavis	c664b8f11e	Merge branch 'master' into i328-MultiVault	2016-11-11 03:18:33 -05:00
Frankie	b60992b446	Fix funny looking errors in conf-tx	2016-11-10 22:13:30 -08:00
kumavis	e123e3095b	Merge branch 'master' into i328-MultiVault	2016-11-11 01:01:06 -05:00
kumavis	536cab0687	detect tx error - show warning and fix gasLimit	2016-11-10 21:19:34 -08:00
Frankie	f665b779cb	Merge branch 'master' into i328-MultiVault	2016-11-10 16:53:47 -08:00
Kevin G. Serrano	7b3f1ecc41	Unify warning functions.	2016-11-07 16:02:02 -08:00
Dan Finlay	bc623bbe34	Linted	2016-11-04 12:32:47 -07:00