270 Commits

Author	SHA1	Message	Date
Dan Finlay	b624155e60	Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin into i646-ClosePopupBug	2016-09-13 13:00:29 -07:00
Dan Finlay	3da0d61417	Bump changelog	2016-09-13 12:54:30 -07:00
Frankie	19c1b1fd8e	Merge branch 'master' into qrCode	2016-09-13 12:18:19 -07:00
Dan Finlay	b508541935	Fix cache clearing reference for Opera ... For some reason Chrome didn't mind this awful bug, but Opera caught it.	2016-09-12 22:13:52 -07:00
Frankie	fc292627e4	Merge branch 'master' into qrCode	2016-09-12 17:30:54 -07:00
Frankie	09bd35ac7a	Add to CHANGELOG.md	2016-09-12 17:29:54 -07:00
Dan Finlay	ebf86f930a	Version 2.11.0	2016-09-12 15:45:32 -07:00
Frankie	c37c050c8a	Revert "Add new eth-lightwallet salting to vault."	2016-09-12 10:34:06 -07:00
Dan Finlay	03168c6b91	Bump changelog	2016-09-09 19:52:37 -07:00
Kevin Serrano	5e38f48f41	Update changelog	2016-09-09 14:24:16 -07:00
Kevin Serrano	2ede90eee3	Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin into i610-InitOneWalletOnly	2016-09-09 09:50:45 -07:00
Dan Finlay	7b6c018c39	Show loading indication during unlocking.	2016-09-08 19:53:54 -07:00
Dan Finlay	2f98d5bc0f	Bump changelog	2016-09-08 19:50:55 -07:00
Frankie	3f64095eed	Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue	2016-09-08 14:56:19 -07:00
Frankie	ece1ecb90b	Fix wording in changelog and bug	2016-09-08 14:53:49 -07:00
Frankie	079c1a8972	Merge branch 'master' into i#589pendingTxsIssue	2016-09-08 13:45:27 -07:00
Frankie	7d8491de10	Add to CHANGELOG.md and Remove unnecessary catch	2016-09-08 13:13:43 -07:00
Dan Finlay	a1e9b951ac	Bump changelog	2016-09-08 12:51:14 -07:00
Dan Finlay	2ca58f5bf7	Merge branch 'master' into ModularFiatBalance	2016-09-06 19:36:40 -07:00
Dan Finlay	2564c0c51c	Bump changelog	2016-09-06 18:59:47 -07:00
Dan Finlay	e75a1d63f7	Bump changelog	2016-09-06 17:31:24 -07:00
Kevin Serrano	01618a88aa	Update changelog and merge master.	2016-09-06 15:30:30 -07:00
Kevin Serrano	41632114c0	Add to changelog.	2016-09-06 10:25:14 -07:00
Kevin Serrano	831ed15777	Merge branch 'master' into livereload	2016-09-02 14:16:13 -07:00
Kevin Serrano	068bd7d40a	Merge branch 'master' into livereload	2016-09-02 14:15:24 -07:00
Kevin Serrano	f9f821e726	Changelog add.	2016-09-02 14:15:15 -07:00
Kevin Serrano	2d0077d5c6	Changelog add and rename vars.	2016-09-02 14:15:00 -07:00
kumavis	c2a1b442e9	Version 2.10.2	2016-09-02 13:51:22 -07:00
kumavis	8b37bcf16b	Version 2.10.1	2016-09-02 12:48:50 -07:00
Dan Finlay	a6e3357d22	Bump changelog	2016-09-01 11:33:54 -07:00
Dan Finlay	e39513ff18	Bump changelog	2016-08-29 12:37:38 -07:00
Dan Finlay	bb8241f711	Version 2.10.0	2016-08-29 11:14:18 -07:00
Frankie	547894ed39	Merge branch 'master' into i#563forgotPassword	2016-08-25 16:06:54 -07:00
Dan Finlay	8b81009a30	Merge branch 'master' into PopupNotifications	2016-08-25 15:42:35 -07:00
Dan Finlay	ca4127dd5e	Bump changelog	2016-08-25 15:27:19 -07:00
Frankie	11c6c63d76	Merge branch 'master' into i#563forgotPassword	2016-08-25 14:17:29 -07:00
Frankie	df824c0c45	Add to CHANGELOG	2016-08-25 14:16:57 -07:00
Kevin Serrano	a9b390c58c	Bump versioning.	2016-08-24 18:38:15 -07:00
Dan Finlay	793ad6b8d8	Merge branch 'master' into PopupNotifications	2016-08-24 16:59:22 -07:00
Dan Finlay	340d12f0cf	Version 2.9.1	2016-08-24 16:32:15 -07:00
Dan Finlay	eee08457e5	Merge branch 'master' into i484PersistPendingSignatures	2016-08-24 16:15:43 -07:00
Kevin Serrano	06b5e7f527	Merge branch 'master' into api-test-fix	2016-08-24 16:09:51 -07:00
Dan Finlay	15c8680e21	Bump changelog	2016-08-24 16:02:47 -07:00
Dan Finlay	6041d6157a	Bump changelog	2016-08-24 15:43:42 -07:00
Dan Finlay	4e34796983	Merge branch 'master' into PopupNotifications	2016-08-24 15:03:09 -07:00
Kevin Serrano	e42b35398b	Changelog change.	2016-08-24 13:28:31 -07:00
Kevin Serrano	c27ad468d1	Clarify shortcut.	2016-08-24 11:24:46 -07:00
Kevin Serrano	cf5b8ba388	Change shortcut again to Ctrl+Alt+M	2016-08-24 11:15:03 -07:00
Kevin Serrano	1444f5451f	Change shortcut to Alt+M	2016-08-24 10:25:59 -07:00
Kevin Serrano	2a9b271703	Update changelog.	2016-08-23 16:54:25 -07:00
Dan Finlay	bc43e3d140	Merge branch 'master' into PopupNotifications	2016-08-23 16:02:06 -07:00
Kevin Serrano	4bceda37a8	Merge branch 'master' into fox-sub	2016-08-23 14:51:09 -07:00
Kevin Serrano	050d0aecc6	Changelog.	2016-08-23 14:32:47 -07:00
Dan Finlay	49ab51d825	Merge branch 'master' into PopupNotifications	2016-08-22 20:06:59 -07:00
Dan Finlay	642e84da6c	Merge master	2016-08-22 15:04:13 -07:00
Dan Finlay	6e1000f361	Merge branch 'master' into PopupNotifications	2016-08-22 15:03:36 -07:00
Dan Finlay	f57cbe59fc	Removed view more button, added account info button. ... Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.	2016-08-22 14:36:21 -07:00
Dan Finlay	3d451ddf3e	Merge branch 'master' into i390-TransactionLimit	2016-08-22 11:59:08 -07:00
Dan Finlay	31e0a3491b	Version 2.9.0	2016-08-22 11:24:34 -07:00
Dan Finlay	8592ffd855	Merge branch 'master' into i390-TransactionLimit	2016-08-19 07:57:35 -07:00
Dan Finlay	9cd85aea2f	Merge branch 'master' into shapeshiftTx	2016-08-19 07:50:57 -07:00
Frankie	e3e5538ddc	Remove "+" from shapeshift tx and change wording in CHANGELOG	2016-08-18 20:24:17 -07:00
Frankie	98dab0ffd2	Make ballance teal for shapeshift tx and add to change log	2016-08-18 16:30:13 -07:00
Dan Finlay	bd9d89826c	Added view more button to transaction list ... Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.	2016-08-18 16:23:12 -07:00
Kevin Serrano	d53b056425	Bump changelog.	2016-08-18 16:04:51 -07:00
Dan Finlay	270dbacbc4	Bump changelog	2016-08-16 17:52:38 -07:00
Kevin Serrano	7d40f29993	Add to changelog.	2016-08-16 14:13:18 -07:00
Dan Finlay	e5f2c1a866	Version 2.8.0	2016-08-15 10:56:01 -07:00
Dan Finlay	e826eb932c	Remove ethereum classic provider ... Fixes #542	2016-08-14 18:41:05 -07:00
Frankie	31d6d5c509	Add to change log	2016-08-13 13:48:49 -07:00
kumavis	7dcb3c64df	changelog - add note about web3-provider-stream fix	2016-08-11 14:42:02 -07:00
Kevin Serrano	f42723c903	Add to changelog.	2016-08-04 11:24:25 -07:00
Dan Finlay	3a489baa71	Bump changelog	2016-07-29 13:28:10 -07:00
Dan Finlay	019581bd1f	Version 2.7.2	2016-07-29 13:08:57 -07:00
Dan Finlay	6151339840	Merge branch 'master' into AddEthClassic	2016-07-28 15:47:22 -07:00
Dan Finlay	5ceed48db9	Fix broken reference to host store.didUpdate ... I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case. Removing it again.	2016-07-28 11:53:33 -07:00
Dan Finlay	5d83b9176b	Bump changelog	2016-07-28 10:54:25 -07:00
Dan Finlay	43784e2143	Version 2.7.1	2016-07-27 16:49:11 -07:00
Kevin Serrano	f8f8e78c55	Changelog add.	2016-07-27 15:34:12 +09:00
Dan Finlay	c6ec3fc714	Cleanup Changelog	2016-07-26 17:02:31 -07:00
Dan Finlay	407d2e884b	Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuild	2016-07-26 17:01:48 -07:00
Dan Finlay	2368c2993d	Add platform specific builds and zip tasks (#486) ... * Add platform specific folders to dist folder * Remove gulp hacks * Add platform specific bundling dev and dist tasks now build into platform-specific folders within the `dist` folder. Added tasks `gulp zip` and `gulp dist`. `zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder. `dist` builds and then zips all at once. * Fix chrome bundle zipping * Fix broken reference in eth warning * Fix but where web3.eth.accounts are not available in firefox. * Bump changelog	2016-07-26 15:15:40 -07:00
Dan Finlay	0eb7354c1a	Bump changelog	2016-07-25 17:51:28 -07:00
Kevin Serrano	0bbfedc2bf	Manifest fix for firefox-specific field (#475) ... * Remove firefox-only manifest.json line. * Changelog change.	2016-07-21 16:50:51 -07:00
Dan Finlay	5d93e8fa74	Version 2.7.0	2016-07-21 13:42:09 -07:00
Frankie	fcd523abe4	Buy button (#474) ... * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension	2016-07-21 13:41:10 -07:00
Dan Finlay	cdd7e40545	Make injected web3 fail hard on sync methods (#471) ... Make injected web3 fail hard on sync methods	2016-07-20 14:54:07 -07:00
Dan Finlay	5567ea8dc5	Version 2.6.2 (#470)	2016-07-20 10:16:18 -07:00
Kevin Serrano	1d8d8384c6	Update Changelog to account for last PR	2016-07-18 12:25:17 -07:00
Dan Finlay	2697e1ba95	Bump changelog	2016-07-15 17:53:31 -07:00
Dan Finlay	3b80a043ee	Version 2.6.1 (#442)	2016-07-14 00:11:49 -07:00
kumavis	97e38b4983	new tx - calculate estimatedGas and show thing in tx-details (#441) ... * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog	2016-07-13 23:39:44 -07:00
Frankie	dbc9008295	Fix eth balance tooltip to show 6 decimals (#440) ... * Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log	2016-07-13 15:46:36 -07:00
Kevin Serrano	ad803125cb	Bump provider-engine from 7.8.1 to 7.8.3 (#435) ... * Bump provider-engine from 7.8.1 to 7.8.3 * Modify changelog.	2016-07-13 12:04:46 -07:00
Kevin Serrano	1f347c22b0	Update changelog.	2016-07-12 12:08:56 -07:00
Dan Finlay	57da5a8198	Merge branch 'master' into FixSvgIcons	2016-07-11 20:55:58 -07:00
Dan Finlay	539fe3e940	Fix svg icon in notification	2016-07-11 20:44:56 -07:00
Kevin Serrano	38225ac8f5	Merge branch 'master' into balance-refactor	2016-07-11 17:54:16 -07:00
Kevin Serrano	a72aad19c8	Update changelog.	2016-07-11 17:45:20 -07:00
Dan Finlay	a446be2397	Version 2.6	2016-07-11 15:54:32 -07:00