26 Commits

Author	SHA1	Message	Date
Dan	6bc8cc819a	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-14 11:44:50 -02:30
Dan	7c49009854	Unit tests for containers, utils and selectors in send_/	2018-05-05 11:58:14 -04:00
Alexander Tseung	9e41f58af2	Clean up network config	2018-04-23 10:18:05 -07:00
Alexander Tseung	2fdf45b418	Show correct MetaMask version number in the Info page	2018-04-18 18:44:51 -07:00
Alexander Tseung	b0a105ce80	Fix confirmation popup not always opening	2018-04-17 08:58:37 -07:00
bitpshr	7129d7c0f3	Require loglevel singleton in each module that uses it	2018-04-13 17:56:28 -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	9d7e49fc3b	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 10:07:14 -07:00
Alexander Tseung	34e608e9dc	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-03 17:06:00 -07:00
Alexander Tseung	bf38aa6f1d	Fix transaction confirmations	2018-04-03 16:59:32 -07:00
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
Alexander Tseung	516c1869b0	Fix lint errors	2018-04-02 16:24:37 -07:00
Alexander Tseung	6277a4c46a	Refactor onboarding flow	2018-04-02 02:59:49 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
Alexander Tseung	bdc4a6964a	Fix merge conflicts. Refactor renderPrimary into Home component	2018-03-30 15:07:00 -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
Alexander Tseung	ecc39c5a7a	Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254	2018-01-29 18:22:52 -08:00
Alexander Tseung	5d1187c37b	Add route for signature request	2017-12-14 14:11:23 -08:00
Alexander Tseung	706a6b0ad6	Add initialized checks for first time flow routes	2017-12-14 14:11:23 -08:00
Alexander Tseung	dde39e82b5	Add routes for mascara	2017-12-14 14:11:23 -08:00
Alexander Tseung	e226b10a89	Add react-router to allow use of the browser back button	2017-12-14 12:50:20 -08:00