2064 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	ff6e633e94	Merge branch 'dev' into gulp1	2017-01-10 15:38:07 -08:00
kumavis	2efcbd9674	gulp - fix brfs instrumentation	2017-01-10 15:33:00 -08:00
kumavis	0197d54bfc	Merge pull request #986 from MetaMask/i947-BrowserSolidityError ... Fix browser solidity error	2017-01-10 14:25:59 -08:00
Dan Finlay	55a55754d0	Bump changelog	2017-01-10 14:20:51 -08:00
Dan Finlay	21e2e4efd8	Remove erroneous OOG estimation logic.	2017-01-10 14:20:46 -08:00
kumavis	074e3f4ab4	gulp - cleanup comments	2017-01-10 13:56:31 -08:00
kumavis	8e3661555d	gulp - add disc bundle analysis task	2017-01-10 13:46:15 -08:00
kumavis	464b7d5814	gulp - clean and simplify	2017-01-10 13:08:13 -08:00
Kevin Serrano	2dc87b4bd4	Merge pull request #983 from MetaMask/slim1 ... deps - replace promise-request with fetch	2017-01-10 12:46:06 -08:00
kumavis	bd382f4705	tests - add fetch polyfill	2017-01-10 12:39:01 -08:00
kumavis	b301c0fb48	deps - replace promise-request with fetch	2017-01-10 12:04:26 -08:00
Frankie	af312bdc90	Merge pull request #974 from MetaMask/typo-fix ... quick typo fix.	2017-01-06 15:17:31 -08:00
Kevin Serrano	3a6159080e	quick typo fix.	2017-01-06 14:41:40 -08:00
Dan Finlay	98ebdeeeac	Merge pull request #970 from MetaMask/network-indicator-refactor ... Network indicator modifications	2017-01-05 15:37:16 -08:00
Kevin Serrano	4e62ae98bd	Merge branch 'dev' into network-indicator-refactor	2017-01-05 12:51:12 -08:00
kumavis	906c3882bb	Merge pull request #971 from MetaMask/TearDownOnDisconnect ... MetaMask Controller - Convert to EventEmitter	2017-01-05 14:33:47 -05:00
kumavis	4c1b7700ad	Merge branch 'dev' into TearDownOnDisconnect	2017-01-05 14:25:31 -05:00
Dan Finlay	3727cad0c4	Merge pull request #967 from MetaMask/fixTxManager ... Fix tx manager	2017-01-05 11:22:15 -08:00
kumavis	00ac5ca058	Merge branch 'dev' into TearDownOnDisconnect	2017-01-05 14:18:34 -05:00
Dan Finlay	73ee0ae766	Merge branch 'dev' into fixTxManager	2017-01-05 11:18:13 -08:00
Kevin Serrano	70816d7cb0	Merge pull request #969 from MetaMask/i945-AlwaysQueryLatest ... Always query latest block for balance & nonce	2017-01-05 11:08:57 -08:00
Frankie	e62f70660d	MetaMask Controller - Convert to EventEmitter	2017-01-05 11:06:18 -08:00
Dan Finlay	7659f5894a	Combine two identical then blocks	2017-01-05 11:03:30 -08:00
Kevin Serrano	af61bb9065	Switch order of header and indicator.	2017-01-05 08:31:54 -08:00
Kevin Serrano	b9a365a8f2	Changelog.	2017-01-04 15:08:39 -08:00
Kevin Serrano	b8d312f8b9	Linting.	2017-01-04 15:04:51 -08:00
Frankie	cf6817092b	remove unnecessary try statments	2017-01-04 15:03:45 -08:00
Dan Finlay	6c99d09404	Fixed bugs with sanity-checking ... - Was incorrectly calling some eth-query methods (left over from old local eth-query) - Was still passing block to getAccount in addAccount - Now emitting update only after all account balances are loaded, reducing UI update traffic.	2017-01-04 14:54:40 -08:00
Kevin Serrano	a8a37e4d40	Make network somewhat more modular, add new network indicator.	2017-01-04 14:30:14 -08:00
Dan Finlay	ead8a05034	Fix dependency reference	2017-01-04 14:21:36 -08:00
Dan Finlay	a107b66854	Caught typo	2017-01-04 14:15:53 -08:00
Dan Finlay	18e6d266c1	Add descriptive comment	2017-01-04 14:07:08 -08:00
Frankie	4b17222a59	Merge branch 'TxManager' into fixTxManager	2017-01-04 14:06:49 -08:00
Dan Finlay	381a60695d	Linted	2017-01-04 14:05:00 -08:00
Dan Finlay	0fab22082a	Bump changelog	2017-01-04 14:02:13 -08:00
Dan Finlay	d4958b7ffd	Remove old eth-store dependency	2017-01-04 14:01:43 -08:00
Dan Finlay	3588aabdf2	Removed reliance on eth-store internal custom eth-query	2017-01-04 14:01:32 -08:00
Dan Finlay	08351f801a	Move eth-store@1.1.0 into local repo.	2017-01-04 13:56:21 -08:00
Frankie	f50e983500	Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into TxManager	2017-01-04 13:53:54 -08:00
Frankie	32e8063a77	clean up	2017-01-04 13:13:34 -08:00
Frankie	354fa763d4	Merge branch 'dev' into fixtTxManager	2017-01-04 13:05:29 -08:00
Frankie	e6da8e2762	Fix signing of transactions	2017-01-04 13:04:33 -08:00
Dan Finlay	c22da8450c	Merge pull request #965 from MetaMask/chrome-permissions ... Chrome permissions	2017-01-03 13:21:13 -08:00
Kevin Serrano	b571913daf	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev	2017-01-03 12:19:33 -08:00
Kevin Serrano	0ba63e0ead	Merge pull request #964 from MetaMask/i963-BalancesNotUpdating ... Update UI state on ethStore updates	2017-01-03 12:19:26 -08:00
Kevin Serrano	0a6d8af171	Merge branch 'dev' into i963-BalancesNotUpdating	2017-01-03 12:07:38 -08:00
Kevin Serrano	1a16057857	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev	2017-01-03 11:41:34 -08:00
Kevin Serrano	74cccb4f1d	Merge pull request #962 from MetaMask/i961-UpdateUiBug ... Fix AddAccount not updating UI	2017-01-03 11:41:26 -08:00
Dan Finlay	2c2cdc4475	Convert more actions to new simple pattern	2017-01-03 11:33:15 -08:00
Dan Finlay	10c818abac	Restore missing line	2017-01-03 11:30:27 -08:00