246 Commits

Author	SHA1	Message	Date
Kevin Serrano	89780bd22a	Modify changelog.	2016-10-07 02:11:14 -07:00
Kevin Serrano	671b54ff71	Merge branch 'master' into tos	2016-10-05 19:53:41 -07:00
kumavis	ea4946ab3a	Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3	2016-10-05 07:22:51 -07:00
Kevin Serrano	40baf0b7de	Add to changelog.	2016-10-04 21:49:06 -07:00
Dan Finlay	6ee22e6688	Version 2.13.3 ... Bumps provider-engine to fix log query filtering bug.	2016-10-04 16:11:52 -07:00
Frankie	4eafb7da2f	Merge branch 'master' into SmallerCopiedButton	2016-10-04 13:50:16 -07:00
Dan Finlay	769bd8e2ee	Removed hex prefix from private key export ... For compatibility with Jaxx, MEW, and Geth. Fixes #687	2016-10-04 13:26:51 -07:00
Dan Finlay	55364b6ee3	Bump changelog	2016-10-04 13:13:58 -07:00
Dan Finlay	c7d10affd5	Make seed word confirmation button font smaller ... To avoid formatting glitches on some machines.	2016-10-04 13:04:54 -07:00
Dan Finlay	8ef7521675	Version 2.13.2	2016-10-04 11:58:31 -07:00
Dan Finlay	da611eb3a1	Improve popup behavior for parity errors ... When we receive an invalid params error, instead of opening the popup and showing no tx, we now just forward that tx back to the UI code.	2016-10-03 20:04:44 -07:00
Frankie	f28de37a8c	Add to CHANGELOG	2016-10-01 09:38:53 +08:00
Dan Finlay	b6bbe2d7e8	Version 2.13.1	2016-09-23 10:45:28 +08:00
Dan Finlay	47a334e542	Merge branch 'master' into i675-LoadingBuy	2016-09-22 14:29:02 +08:00
Dan Finlay	9d5cdbcbe6	Version 2.13.0	2016-09-19 22:58:10 +08:00
Dan Finlay	e197e3808f	Drop origin key from requests for Parity compatibility	2016-09-19 10:16:27 +08:00
Dan Finlay	ed51b91b4a	Merge branch 'master' into i675-LoadingBuy	2016-09-15 21:05:24 -07:00
Dan Finlay	4eef2c57cf	Show loading indication when selecting ShapeShift	2016-09-15 20:58:18 -07:00
Frankie	77ef71448d	Fix CHANGELOG.md and restructure onClick events	2016-09-15 19:35:04 -07:00
Frankie	dcda841f4d	Merge branch 'master' into tx-viz	2016-09-15 18:16:41 -07:00
Frankie	bc33c88ae5	Add to CHANGELOG.md	2016-09-15 18:16:15 -07:00
kumavis	7293c67f68	bump changelog	2016-09-15 13:22:05 -07:00
Dan Finlay	8df005153b	Version 2.12.1	2016-09-14 15:51:50 -07:00
Frankie	034742a571	Merge branch 'master' into i#626	2016-09-14 12:42:35 -07:00
Frankie	17481ff61a	Add to CHANGELOG.md	2016-09-14 11:36:56 -07:00
Dan Finlay	03094091d1	Version 2.11.2	2016-09-14 11:35:50 -07:00
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