2646 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
frankiebee	282775c52f	add versioning and migrateing data	2017-03-23 19:14:08 -07:00
frankiebee	8e30acb41a	Merge branch 'master' into mascara	2017-03-23 15:44:29 -07:00
frankiebee	c8540261c1	Fix state persistence	2017-03-23 15:12:39 -07:00
frankiebee	4451593867	Clean up messy merge	2017-03-23 14:35:01 -07:00
frankiebee	54e157020e	Merge branch 'mascaraMix' into mascara	2017-03-23 14:24:06 -07:00
frankiebee	412cc2394a	Get mascara to send a transaction in the ui	2017-03-23 14:22:05 -07:00
frankiebee	197e6e0b77	WIP: indexdb is at an err state "provider is undefined"	2017-03-23 11:41:32 -07:00
frankiebee	45ab81fb45	WIP: streams->indexdb	2017-03-23 11:06:38 -07:00
Dan Finlay	f29a116d40	Merge pull request #1251 from MetaMask/kovan-tx-etherscan ... Enable etherscan linking on Kovan transaction list items.	2017-03-23 08:42:02 -07:00
Kevin Serrano	525c32ae60	Enable etherscan linking on Kovan transaction list items.	2017-03-23 11:26:39 -04:00
Dan Finlay	b9714b881a	Merge pull request #1243 from MetaMask/i238-kovan ... Add Kovan Test Net	2017-03-22 15:58:53 -07:00
Dan Finlay	af9d782363	Merge branch 'master' into i238-kovan	2017-03-22 15:55:01 -07:00
Dan Finlay	205161c489	Merge pull request #1241 from MetaMask/i1237-xmlfix2 ... Modify logic for injection conditions.	2017-03-22 15:54:52 -07:00
Kevin Serrano	45cdf6bdea	Merge branch 'master' into i238-kovan	2017-03-22 15:51:52 -07:00
Kevin Serrano	90d5dc636e	Merge branch 'master' into i1237-xmlfix2	2017-03-22 15:51:15 -07:00
Kevin Serrano	d82549a1ea	Merge pull request #1247 from MetaMask/hide-password ... Hide the password in the private key retrieval screen.	2017-03-22 15:50:43 -07:00
Kevin Serrano	c55c768cde	Merge branch 'master' into hide-password	2017-03-22 15:46:50 -07:00
Dan Finlay	76e7d6fbb1	Merge branch 'master' into i1237-xmlfix2	2017-03-22 15:43:26 -07:00
Dan Finlay	5e40ed1ee9	Merge pull request #1245 from MetaMask/i1193-errorstylefix ... Fix styling of error message in import accounts	2017-03-22 15:43:14 -07:00
Kevin Serrano	16bdfd3d6e	Merge branch 'master' into i238-kovan	2017-03-22 15:41:38 -07:00
Kevin Serrano	463eb01d1d	Merge branch 'master' into hide-password	2017-03-22 15:41:24 -07:00
Kevin Serrano	2687b8604b	Merge branch 'master' into i1237-xmlfix2	2017-03-22 15:39:30 -07:00
Dan Finlay	9545ef3ba8	Merge branch 'master' into i1193-errorstylefix	2017-03-22 15:39:20 -07:00
Dan Finlay	5b81f7120b	Merge pull request #1244 from MetaMask/i1227-uidumpblockhash ... Add current block number and hash to the state.	2017-03-22 15:38:54 -07:00
Dan Finlay	bb971baf81	Merge branch 'master' into i1237-xmlfix2	2017-03-22 15:37:44 -07:00
Dan Finlay	72e979909c	Merge branch 'master' into i238-kovan	2017-03-22 15:37:33 -07:00
Dan Finlay	7e6445110a	Merge branch 'master' into i1227-uidumpblockhash	2017-03-22 15:34:23 -07:00
Dan Finlay	33ba38df6e	Merge pull request #1225 from MetaMask/i1033-spinnerfix ... Fix spinner issue on seed word request	2017-03-22 15:32:39 -07:00
Kevin Serrano	41e276b036	Hide the password in the private key retrieval screen.	2017-03-22 17:46:51 -04:00
Kevin Serrano	5d14925842	Fix styling of error message.	2017-03-22 16:54:10 -04:00
Kevin Serrano	1b7326048d	Add current block number and hash to the state.	2017-03-22 16:41:19 -04:00
Kevin Serrano	1c7e04db4a	Changelog bump.	2017-03-22 16:06:48 -04:00
Kevin Serrano	b26c53452e	Add Kovan test network to our application.	2017-03-22 16:05:04 -04:00
Kevin Serrano	34f3889eb0	Add kovan to drop-menu-item	2017-03-22 16:04:28 -04:00
Kevin Serrano	4757858df0	Add conditional kovan to current network component.	2017-03-22 16:03:51 -04:00
Kevin Serrano	b3dfc4e639	Add kovan conditional to config screen.	2017-03-22 16:03:02 -04:00
Kevin Serrano	c00544de91	Add conditional kovan logic to etherscan link generators.	2017-03-22 16:02:17 -04:00
Kevin Serrano	4116b37d32	Modify css rule for unused hollow diamond.	2017-03-22 16:01:38 -04:00
Kevin Serrano	33dd7954a7	Add kovan config settings to config manager.	2017-03-22 16:00:50 -04:00
Kevin Serrano	c5f96be98d	Add kovan to config file.	2017-03-22 15:59:46 -04:00
Kevin Serrano	b5b88392b9	Merge branch 'master' into i1237-xmlfix2	2017-03-22 11:33:56 -07:00
Kevin Serrano	9906da86a4	Modify logic for injection conditions.	2017-03-22 14:25:56 -04:00
kumavis	9ac2ce1744	Merge branch 'master' into i1033-spinnerfix	2017-03-22 09:57:15 -07:00
kumavis	864f8b06f9	Merge pull request #1239 from MetaMask/betterErrors ... Better errors	2017-03-22 09:55:47 -07:00
frankiebee	2ffd42f9f0	Add to CHANGELOG	2017-03-22 09:49:44 -07:00
frankiebee	8c7be43403	Have better error messages	2017-03-22 09:48:41 -07:00
Kevin Serrano	046774e768	Require redux-logger of 2.10.2 and up (#1235) ... * Require redux-logger of 2.8.1 and up * Bump to 2.10.2 and above, 2.10.1 had critical bug.	2017-03-22 09:38:03 -07:00
Kevin Serrano	f2e40e85b7	Add one more loading indication.	2017-03-22 12:18:13 -04:00
Dan Finlay	327d18855c	Merge pull request #1226 from MetaMask/i1195-privatekeyexportstyle ... Polish Private Key Export UI	2017-03-21 20:33:43 -07:00
frankiebee	d4e8ff188b	WIP:stream	2017-03-21 15:35:01 -07:00