14601 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
kumavis	17b805c76e	tx-utils - clean and comment	2017-03-07 22:18:14 -08:00
Dan Finlay	de5a30c5ff	Merge pull request #1187 from MetaMask/i1118-IncreaseGasBuffer ... I1118 increase gas buffer	2017-03-07 21:41:54 -08:00
Dan Finlay	0889309bf3	Merge branch 'master' into i1118-IncreaseGasBuffer	2017-03-07 21:30:43 -08:00
Dan Finlay	1f0a4dd033	Bump changelog	2017-03-07 21:30:27 -08:00
Dan Finlay	a8551c4fe2	Merge pull request #1186 from MetaMask/grammarFix ... Fix grammar in erro message	2017-03-07 21:24:45 -08:00
jaredpereira	52ee007fcb	Merge branch 'master' into i1118-IncreaseGasBuffer	2017-03-07 22:55:56 -05:00
Jared Pereira	4916331c53	change BN.mul to BN.muln	2017-03-07 22:42:16 -05:00
frankiebee	2f7a95c257	Fix grammar in erro message	2017-03-07 18:56:38 -08:00
kumavis	dba261db25	Merge pull request #1185 from MetaMask/i#1032 ... Fix issue where account import allows for duplicates	2017-03-07 18:09:05 -08:00
Frankie	f0a35cefd3	Merge branch 'master' into i#1032	2017-03-07 18:01:50 -08:00
frankiebee	af5ad218e2	Merge branch 'master' into i#1032	2017-03-07 17:59:21 -08:00
frankiebee	3e8b584c98	fix issue where account import allows for duplicates	2017-03-07 17:59:03 -08:00
Jared Pereira	de44cd9ba4	add gas buffer multiply test	2017-03-07 20:49:40 -05:00
Jared Pereira	4256e631a6	remove constant buffer and add multiplier	2017-03-07 19:57:57 -05:00
kumavis	719be93f97	Merge pull request #1183 from MetaMask/provider-ten-oh-one ... deps - bump web3-provider-engine to 10.0.1	2017-03-07 16:20:31 -08:00
kumavis	147ac416ba	deps - bump web3-provider-engine to 10.0.1 ... Fixes https://github.com/MetaMask/metamask-plugin/issues/1163 Fixes https://github.com/MetaMask/provider-engine/issues/121	2017-03-07 16:16:26 -08:00
Kevin Serrano	4562e41d33	Fix tests until new ones to-be-written.	2017-03-07 16:10:06 -08:00
Kevin Serrano	edbd1c6a68	Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into i1144-moarrpc	2017-03-07 16:03:42 -08:00
Kevin Serrano	970324b699	Merge github.com:MetaMask/metamask-plugin into i1144-moarrpc	2017-03-07 16:02:42 -08:00
Kevin Serrano	e7e024bcdd	Refactor of code into separate reducers and actions.	2017-03-07 16:01:51 -08:00
kumavis	042b042da6	Merge pull request #1182 from MetaMask/provider-ten ... deps - bump web3-provider-engine	2017-03-07 15:43:35 -08:00
kumavis	be8267edf7	deps - bump web3-provider-engine ... resolves https://github.com/MetaMask/metamask-plugin/issues/1159	2017-03-07 15:21:39 -08:00
kumavis	22785a4cf1	Merge pull request #1180 from MetaMask/kumavis-patch-1 ... deps - bump web3-provider-engine	2017-03-07 13:08:28 -08:00
Kevin Serrano	8fead4099a	Merge branch 'master' into i1144-moarrpc	2017-03-07 12:47:25 -08:00
Dan Finlay	1d835e4417	Merge branch 'master' into kumavis-patch-1	2017-03-07 12:04:55 -08:00
kumavis	9e0a4fc6ed	Merge pull request #1179 from MetaMask/FixHexEncoding ... Fix hex encoding of message to create valid hex strings	2017-03-07 12:02:28 -08:00
Dan Finlay	fba7a50e1b	Fixed encoding	2017-03-07 11:43:59 -08:00
Dan Finlay	6253885e28	Remove unrelated test file	2017-03-07 11:36:13 -08:00
Dan Finlay	e78e642eef	Add gas buffer test	2017-03-07 11:34:11 -08:00
Kevin Serrano	08ca7dac5a	Merge branch 'master' into i1144-moarrpc	2017-03-07 10:37:31 -08:00
Kevin Serrano	01f2ec4823	Modify tests.'	2017-03-07 10:37:01 -08:00
Kevin Serrano	2a98beb878	Break out rpc update and rpclist into two reducers.	2017-03-07 10:25:50 -08:00