3500 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
frankiebee	0808eb2256	fix test	2017-08-02 19:07:18 -04:00
frankiebee	b80c7e417b	move newUnapprovedTransaction to transactions.js	2017-08-02 18:59:34 -04:00
frankiebee	25bc15ba17	lint fixes	2017-08-02 11:47:13 -04:00
frankiebee	25cffd21f8	Merge branch 'master' into transactionControllerRefractor	2017-08-02 11:41:29 -04:00
frankiebee	ece9200c72	fix spelling mistake	2017-08-02 11:36:07 -04:00
frankiebee	3a4726018e	fix addTxDefaults	2017-08-02 11:35:35 -04:00
frankiebee	21e76484d6	add test for addTxDefaults	2017-08-02 11:34:45 -04:00
frankiebee	432f516ab0	make addUnapprovedTransaction async function and use promise based ethQuery	2017-08-02 10:26:25 -04:00
Kevin Serrano	d15e402ed8	Merge pull request #1838 from MetaMask/i1805-LiveBlacklistUpdating ... Live blacklist updating	2017-07-27 15:22:09 -07:00
Dan Finlay	7c71ee1bab	Do not blacklist files	2017-07-27 15:16:42 -07:00
Dan Finlay	eb92d65c4d	Add Levenshtein item to changelog	2017-07-26 16:57:58 -07:00
Dan Finlay	6675241fa9	Merge branch 'master' into i1805-LiveBlacklistUpdating	2017-07-26 16:46:59 -07:00
Dan Finlay	8b1726cc55	Live update blacklist from Infura	2017-07-26 16:30:54 -07:00
Dan Finlay	e3b5bb2052	Merge pull request #1837 from MetaMask/i1833-levencheck ... Levenshtein Checking Logic Added To Blacklist	2017-07-26 16:25:30 -07:00
Dan Finlay	f147b928b2	Merge branch 'master' into i1805-LiveBlacklistUpdating	2017-07-26 15:32:19 -07:00
Kevin Serrano	aa282b4e3a	Give credit where it is due	2017-07-26 15:31:16 -07:00
Kevin Serrano	a639543665	Changelog bump	2017-07-26 15:29:13 -07:00
Kevin Serrano	66f6d5a4e0	Add levenshtein logic to blacklister.	2017-07-26 15:25:30 -07:00
Kevin Serrano	6a9d40c558	Add test for blacklister.	2017-07-26 15:24:57 -07:00
Kevin Serrano	520cda0058	Merge pull request #1834 from MetaMask/Version-3.9.2 ... Version 3.9.2	2017-07-26 14:28:09 -07:00
Dan Finlay	b50c10f373	Version 3.9.2	2017-07-26 14:15:24 -07:00
Dan Finlay	3d8ebf2265	Begin implementing live-updating blacklist, not working yet	2017-07-26 12:27:16 -07:00
Frankie	f23efec3e3	Merge pull request #1830 from MetaMask/providerProxyFix ... NonceTracker - Provider proxy fix	2017-07-26 14:56:13 -04:00
kumavis	55a55141d0	nonce-tracker - fix test	2017-07-26 11:43:37 -07:00
kumavis	35a128db1e	nonce-tracker - hotfix for provider proxying	2017-07-26 11:37:00 -07:00
kumavis	b15a2baaf3	nonce-tracker - add raw baseNonceHex to nonceDetails	2017-07-26 11:09:02 -07:00
Dan Finlay	0deb617d8f	Merge pull request #1829 from MetaMask/betterErrorsOnTx ... cleanup logState log and tx history	2017-07-26 11:07:01 -07:00
kumavis	7e2e4948a6	tx cont - dont recursively store history	2017-07-26 10:57:47 -07:00
kumavis	9d69951dec	logState - dont redundantly log to console	2017-07-26 10:50:06 -07:00
Frankie	bbeecbbb28	Merge pull request #1828 from MetaMask/betterErrorsOnTx ... Nonce Tracker - better error messages, more debug info in tx history data	2017-07-26 13:48:08 -04:00
kumavis	de2cf4e9cd	Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterErrorsOnTx	2017-07-26 10:43:36 -07:00
kumavis	0ef90fb1f0	tx controller + nonce tracker - record nonce components on txMeta	2017-07-26 10:40:08 -07:00
kumavis	39d28922de	nonce-tracker - validation - add validation failing value type to error message	2017-07-26 10:16:08 -07:00
kumavis	f16802e2d4	nonce-tracker - validation - add validation failing value to error message	2017-07-26 10:15:35 -07:00
Thomas Huang	5af753a597	Merge pull request #1827 from MetaMask/test-coverage ... Coveralls badge directs to master branch	2017-07-25 18:08:22 -07:00
Thomas Huang	1eb089b0e7	Coveralls badge directs to master branch	2017-07-25 18:03:47 -07:00
kumavis	a8525d4b17	Merge pull request #1816 from MetaMask/test-coverage ... Test coverage	2017-07-25 17:46:23 -07:00
Thomas Huang	3575bd49ab	Run coveralls on all branches	2017-07-25 16:59:08 -07:00
Thomas Huang	eb15663497	One script runs for Ci build	2017-07-25 16:33:52 -07:00
kumavis	4e9cfc935d	Merge pull request #1823 from MetaMask/betterErrorsOnTx ... Add stack traces both in errors and as a way to track txMetas	2017-07-25 15:39:54 -07:00
frankiebee	30cbe74ba6	Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-extension into betterErrorsOnTx	2017-07-25 18:33:52 -04:00
frankiebee	ba88f7b8dd	fix typo	2017-07-25 18:29:02 -04:00
Frankie	a929fb2387	Merge branch 'master' into betterErrorsOnTx	2017-07-25 18:26:41 -04:00
frankiebee	b81f883150	fix stack wording	2017-07-25 18:23:26 -04:00
frankiebee	1df833bee8	use clone	2017-07-25 18:21:40 -04:00
frankiebee	e0a626da3b	remove line numbers	2017-07-25 18:02:21 -04:00
Frankie	0c73d6d852	Merge pull request #1824 from MetaMask/tx-cont-fix ... TransactionController & NetworkController fixes	2017-07-25 17:46:31 -04:00
kumavis	5ec73c0e65	tx cont - fix test to use async api	2017-07-25 14:39:17 -07:00
kumavis	4445ba1569	tx cont - add argument for provider constructor	2017-07-25 14:36:19 -07:00
kumavis	5b9a6bd367	tx cont - remove old cb from async fn	2017-07-25 13:16:46 -07:00