1281 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	fb6476224f	Add tolerance for failed form persisting	2016-08-29 16:40:57 -07:00
Dan Finlay	e85418b11a	Merge branch 'master' into EdgeCompatibility	2016-08-29 16:14:51 -07:00
kumavis	a9c738d4d3	Merge pull request #594 from MetaMask/i541-CustomMenuItemFix ... Allow selecting custom rpc from menu even when custom rpc is selected	2016-08-29 12:49:17 -07:00
Dan Finlay	e39513ff18	Bump changelog	2016-08-29 12:37:38 -07:00
Dan Finlay	a804629606	Show custom rpc menu item always	2016-08-29 12:36:47 -07:00
Dan Finlay	f5baf36c07	Make custom network dev state not loading	2016-08-29 12:36:27 -07:00
Dan Finlay	47429fcbf5	Merge pull request #593 from MetaMask/Version-2.10.0 ... Version 2.10.0	2016-08-29 11:17:13 -07:00
Dan Finlay	bb8241f711	Version 2.10.0	2016-08-29 11:14:18 -07:00
Dan Finlay	7af18a4b55	Merge pull request #591 from MetaMask/SpellingFix ... Fix spelling error	2016-08-26 15:26:07 -07:00
Dan Finlay	62179a37f7	Fix spelling error	2016-08-26 15:08:02 -07:00
Dan Finlay	9497d282c7	Merge pull request #588 from MetaMask/i#563forgotPassword ... Add a back button for Lock screen	2016-08-26 11:52:43 -07:00
Frankie	ae33586660	make the back button its own function	2016-08-26 11:30:07 -07:00
Frankie	547894ed39	Merge branch 'master' into i#563forgotPassword	2016-08-25 16:06:54 -07:00
Frankie	250cf8cc23	Change style on back button to be more like the rest of the app	2016-08-25 16:05:44 -07:00
kumavis	78f73038e7	Merge pull request #554 from MetaMask/PopupNotifications ... Replace chrome notifications with windows.create	2016-08-25 15:46:44 -07:00
Dan Finlay	8b81009a30	Merge branch 'master' into PopupNotifications	2016-08-25 15:42:35 -07:00
kumavis	b6b57d928a	Merge pull request #590 from MetaMask/i432PersistFormState ... Persist form state when closing popup	2016-08-25 15:40:49 -07:00
Dan Finlay	a1fd2b6688	Merge branch 'master' into i432PersistFormState	2016-08-25 15:27:37 -07:00
Dan Finlay	ca4127dd5e	Bump changelog	2016-08-25 15:27:19 -07:00
Frankie	4c46997c4a	Add - "npm i -g mocha" to circle	2016-08-25 15:19:44 -07:00
Dan Finlay	6f082dd9e7	Linted	2016-08-25 14:23:41 -07:00
Dan Finlay	a8e40ffe7a	Persist shapeshift form input values	2016-08-25 14:19:09 -07:00
Dan Finlay	aa13f77d6c	Add shapeshift development state	2016-08-25 14:18:55 -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
Frankie	483a7fee0a	Add a back button on lock screen to go back to init menu	2016-08-25 14:13:32 -07:00
Dan Finlay	b39bd5333b	Persist send tx form field values	2016-08-25 14:10:07 -07:00
Dan Finlay	2026b674c5	Remove log	2016-08-25 14:09:54 -07:00
Dan Finlay	3b594db316	Add send form development state	2016-08-25 14:09:41 -07:00
Dan Finlay	fda126582e	Update persistient-form docs	2016-08-25 14:03:34 -07:00
Dan Finlay	d81bde9f6c	Make restore vault form persist	2016-08-25 12:18:04 -07:00
Dan Finlay	f30e4be1a6	Add restore vault development state	2016-08-25 12:17:40 -07:00
Dan Finlay	6eb09c1a79	Add persistent form class	2016-08-25 12:17:21 -07:00
Kevin Serrano	bbb684309e	Merge pull request #587 from MetaMask/kuma-fix ... CI - fix chrome version	2016-08-25 11:14:34 -07:00
kumavis	901f60578c	Merge pull request #586 from MetaMask/kumavis-patch-2 ... CI - add lsb-base dep	2016-08-25 11:11:41 -07:00
kumavis	1d4750b9c4	CI - add lsb-base dep	2016-08-25 11:08:10 -07:00
Kevin Serrano	ca1d500363	add deps.	2016-08-25 11:01:07 -07:00
Kevin Serrano	ef44284323	Bump chrome version.	2016-08-25 10:54:18 -07:00
Kevin Serrano	0ed3a6874b	Modify cirlce.yml	2016-08-25 10:43:36 -07:00
Dan Finlay	b2233f7e0a	Noted initial thoughts	2016-08-25 10:33:01 -07:00
Kevin Serrano	4dff4f2d72	Testing bump for web3 provider engine	2016-08-25 10:31:10 -07:00
Kevin Serrano	2faf3f7063	Merge pull request #584 from MetaMask/shortcut-fix ... Fixed prohibited shortcut combination.	2016-08-24 18:56:42 -07:00
Kevin Serrano	a9b390c58c	Bump versioning.	2016-08-24 18:38:15 -07:00
Kevin Serrano	648dd59890	Merge branch 'master' into shortcut-fix	2016-08-24 18:37:01 -07:00
Kevin Serrano	8dfa701197	Fixed prohibited shortcut combination.	2016-08-24 18:33:27 -07:00
Dan Finlay	793ad6b8d8	Merge branch 'master' into PopupNotifications	2016-08-24 16:59:22 -07:00
Dan Finlay	4448b635b9	Merge pull request #583 from MetaMask/Version-2.9.1 ... Version 2.9.1	2016-08-24 16:39:16 -07:00
Dan Finlay	340d12f0cf	Version 2.9.1	2016-08-24 16:32:15 -07:00
Kevin Serrano	07e5f94da8	Merge pull request #581 from MetaMask/i484PersistPendingSignatures ... Fix bug where unconfirmed message sig is lost when locked.	2016-08-24 16:20:59 -07:00
Dan Finlay	eee08457e5	Merge branch 'master' into i484PersistPendingSignatures	2016-08-24 16:15:43 -07:00