2783 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	a186e40d17	Merge branch 'master' into i1165-predictive	2017-03-14 17:52:03 -07:00
kumavis	570cc891b5	Merge pull request #1212 from MetaMask/i1211-currencyretention ... Fix currency settings retention	2017-03-14 17:24:55 -07:00
Kevin Serrano	311b80adf3	Merge branch 'master' into i1211-currencyretention	2017-03-14 17:09:21 -07:00
Kevin Serrano	37ffcfcf0e	Rename variables to proper currency state variables.	2017-03-14 17:06:16 -07:00
Kevin Serrano	177f2dc948	Fix description of some migrations.	2017-03-14 17:05:47 -07:00
Kevin Serrano	956482be96	Fix development to use new currency state.	2017-03-14 17:05:27 -07:00
Kevin Serrano	fcee7723e9	Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i1165-predictive	2017-03-14 14:05:28 -07:00
Kevin Serrano	1ec7930c75	Minor change in removing opts object.	2017-03-14 14:04:52 -07:00
kumavis	c759300d4c	Merge branch 'master' into i1165-predictive	2017-03-14 13:11:03 -07:00
Kevin Serrano	c136cb6cd4	Add to changelog.	2017-03-14 11:44:54 -07:00
Kevin Serrano	2a68c89ba7	Merge pull request #1207 from MetaMask/i1206-customrpc ... Allow changing custom RPCs from lock screen	2017-03-13 16:57:37 -07:00
Kevin Serrano	7d0bfdf076	Changelog addition.	2017-03-13 16:46:33 -07:00
Kevin Serrano	b10f370c74	Render config screen from unlock.	2017-03-13 16:43:34 -07:00
Kevin Serrano	e4feb50f6f	Display Custom RPC on lock screen.	2017-03-13 16:41:25 -07:00
Kevin Serrano	4933e2e2ee	Limit the number of addresses stored in our book.	2017-03-13 16:37:53 -07:00
Kevin Serrano	d85cc7ec4e	Add test to account for prevention of identities duplication.	2017-03-10 10:48:07 -08:00
Kevin Serrano	7dcab52a9e	Connect keyring controller to address book to prevent additional duplicates.	2017-03-10 10:34:46 -08:00
Kevin Serrano	c47f7f6a76	Add another test for duplicates.	2017-03-10 10:34:18 -08:00
Kevin Serrano	7182a2be43	Improve duplicate checking in address book.	2017-03-10 10:05:10 -08:00
Kevin Serrano	dc2d614da6	Add basic tests.	2017-03-10 09:52:05 -08:00
Kevin Serrano	2ab86b001d	Add comments.	2017-03-10 09:34:13 -08:00
frankiebee	60f00a950c	notes and clean up	2017-03-09 21:53:49 -08:00
frankiebee	9f3445252c	put background in service worker	2017-03-09 18:24:41 -08:00
Kevin Serrano	b34ee4daa1	Allow for adding recently used addresses to address book.	2017-03-09 15:10:27 -08:00
Kevin Serrano	b296640f1b	Rename functions for consistency.	2017-03-09 15:09:50 -08:00
Kevin Serrano	9f6c040554	Create persistence address book.	2017-03-09 13:58:42 -08:00
Kevin Serrano	d270cbc9d2	Create distinct labels and names for addresses.	2017-03-09 13:07:38 -08:00
Kevin Serrano	1ca6fff317	Display owned addresses in datalist.	2017-03-09 11:31:00 -08:00
Kevin Serrano	e602cb13c5	Merge pull request #1197 from MetaMask/i1130-ResolveENS ... Allow ENS Names in Send Form	2017-03-08 16:54:15 -08:00
Dan Finlay	ea59125ce1	Bump changelog	2017-03-08 15:48:18 -08:00
Dan Finlay	42e4a0621b	Add ENS click to copy ... Also bump ethjs-ens version to get proper error for unregistered names.	2017-03-08 15:38:22 -08:00
Dan Finlay	e3f6c010ab	Get basic ENS working ... & merge master into ENS branch.	2017-03-08 15:19:33 -08:00
Dan Finlay	1fbe4a801a	Merge pull request #1196 from MetaMask/Version-3.4.0 ... Version 3.4.0	2017-03-08 13:43:42 -08:00
Dan Finlay	05346ec3c3	Version 3.4.0	2017-03-08 13:38:55 -08:00
Dan Finlay	2e99e6f5de	Merge pull request #1191 from MetaMask/i1065-removealert ... Convert alert to a log.error	2017-03-08 11:05:08 -08:00
Kevin Serrano	acc9a2a9d0	Modify message.	2017-03-08 10:53:11 -08:00
Kevin Serrano	6f980cfe10	Add more informative message	2017-03-08 10:46:17 -08:00
Kevin Serrano	b0280dc162	Merge branch 'master' into i1065-removealert	2017-03-08 10:22:08 -08:00
Dan Finlay	b0059bef44	Merge pull request #1189 from MetaMask/kumavis-patch-1 ... tx-utils - clean and comment	2017-03-08 10:21:03 -08:00
Dan Finlay	67c3126e63	Merge branch 'master' into kumavis-patch-1	2017-03-08 10:16:50 -08:00
Kevin Serrano	529eb25ced	Convert alert to a log.error	2017-03-08 10:13:45 -08:00
Kevin Serrano	26cac57838	Merge pull request #1147 from MetaMask/i1144-moarrpc ... Save recently used RPCs	2017-03-08 10:07:15 -08:00
Kevin Serrano	6fd3d6e0d0	Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into i1144-moarrpc	2017-03-08 09:35:51 -08:00
Kevin Serrano	21769a008c	Fix typo, switch to log.error	2017-03-08 09:35:31 -08:00
Kevin Serrano	86f71d504c	Merge branch 'master' into i1144-moarrpc	2017-03-08 09:28:36 -08:00
Kevin Serrano	0ee8ca178e	Remove unneeded setrpc method.	2017-03-08 09:08:28 -08:00
Kevin Serrano	cf2268c3d2	Nodeify and promisify calls to background.	2017-03-08 09:06:41 -08:00
kumavis	92b8443824	tx-utils - add encoding utils	2017-03-07 22:51:39 -08:00
kumavis	c063fab993	tx-utils - stricter naming type-based convention	2017-03-07 22:47:35 -08:00
kumavis	68b99dfb08	test - tx-utils ... add tests for `addGasBuffer`	2017-03-07 22:28:02 -08:00