66 Commits

Author	SHA1	Message	Date
03-26	ccd4884db1	i18n - ja improvements	2018-06-06 11:38:57 -07:00
Dan	8f0a3b8311	Merge branch 'develop' into handle-import-account-failure-in-ui	2018-06-03 06:46:45 -02:30
Bobby Dresser	966583026a	update helpscout links to zenhub	2018-05-31 15:26:04 -07:00
Alexander Tseung	f4d833cb09	Change btn-secondary styles to btn-default. Make btn-secondary red warning style buttons	2018-05-31 10:37:52 -07:00
Dan	0f3480a97f	Fix then-catch + error handling in import-account	2018-05-30 21:33:40 -02:30
Dan	1c3d2aa18b	Importing account by json and private key shows error and does not change account if no selectedAddress comes after import.	2018-05-30 17:00:50 -02:30
Whymarrh Whitby	924cc1fcf7	Move setAccountLabel into PreferencesController	2018-05-17 12:57:39 -02:30
Paul Bouchon	5ec631cad3	Handle Promise rejections when importing accounts (#4142) ... * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement	2018-04-30 18:07:25 -04:00
Alexander Tseung	4c15c0d3ba	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 23:17:22 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
Alexander Tseung	58f52b2b8d	Fix merge conflicts. Refactor onboarding flow.	2018-03-28 13:23:50 -07:00
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
Alexander Tseung	eb919f4710	Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254	2018-02-08 16:43:31 -08:00
Alexander Tseung	4f1fe1da62	Fix merge conflicts from uat-next	2018-01-31 18:24:20 -08:00
Alexander Tseung	0c6fef3dec	Add create new account routes, fix conflicts from uat updates	2018-01-31 18:08:49 -08:00