6273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	34fe88af8f	Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters ... improved verification of restore from seed phrase	2018-03-13 14:39:59 -07:00
frankiebee	c6dff98ee1	tests - add tests for transactions#retryTransaction and transactions#_markNonceDuplicatesDropped	2018-03-13 14:30:59 -07:00
Vincent Le Gallic	c15d3e0e23	Add French translation	2018-03-13 22:04:13 +01:00
Orange	c33eeb0d3e	update ... update	2018-03-14 03:21:31 +08:00
Dan Finlay	239d7106ab	Merge pull request #3538 from MetaMask/lazaridiscom-patch-1 ... cross platform - use 'cross-env' for env-variables within npm scripts	2018-03-13 11:41:13 -07:00
kumavis	9378ac5d62	deps - update package-lock	2018-03-13 11:35:53 -07:00
Lazaridis	af4116cf39	use 'cross-env' for env-variables within npm scripts, re #3426	2018-03-13 11:31:11 -07:00
kumavis	15722b4e6c	Merge pull request #3456 from MetaMask/i18n ... Add i18n	2018-03-13 11:25:31 -07:00
Thomas	5a1b2093f8	Update Changelog	2018-03-13 11:20:15 -07:00
Thomas Huang	508d2c3eb7	Merge branch 'master' into i18n	2018-03-13 11:16:26 -07:00
Thomas	13c3166f38	Update Changelog	2018-03-13 11:15:40 -07:00
Thomas	9bb7fa365d	Remove windows.h from i18n.js	2018-03-13 11:15:10 -07:00
Thomas	b1871bf32d	Add closing parens to appName	2018-03-13 11:04:41 -07:00
Thomas Huang	1d2cb46eff	Merge branch 'master' into i18n	2018-03-13 11:00:52 -07:00
kumavis	3cbf66a6de	Merge pull request #3527 from danjm/changelog-updates-march13 ... Changlog updates for PRs 3468, 3470 and 3495.	2018-03-13 10:54:39 -07:00
kumavis	6a17a0cdf1	Merge pull request #3468 from danjm/i3033-responsive-newui-onboarding ... Make new-ui create password screen responsive.	2018-03-13 10:53:21 -07:00
Dan	e99644afd5	Changlog updates for PRs 3468, 3470 and 3495.	2018-03-13 15:20:58 -02:30
kumavis	572234e383	Merge branch 'master' into i3033-responsive-newui-onboarding	2018-03-13 10:46:14 -07:00
kumavis	1fa5cec2ec	Merge pull request #3470 from danjm/newui-onboarding-fonts ... Change fonts in new-ui onboarding to Roboto, with weight 400.	2018-03-13 10:44:08 -07:00
kumavis	c1387cdc54	Merge pull request #3495 from alextsg/cb-290 ... Increase tap areas for menu buttons on mobile	2018-03-13 10:42:59 -07:00
kumavis	50e21fa9d3	Merge pull request #3525 from anticlimactic/move-dev-files ... Moved mock-dev.js and ui-dev.js to development folder.	2018-03-13 10:40:19 -07:00
Thomas Huang	6857e5eb27	Merge pull request #3518 from MetaMask/ci-moar-fast ... CI - make CI moar fast	2018-03-13 10:29:16 -07:00
Thomas	b45ea44aa5	Add missing opening parens to pag-container__subtitle	2018-03-13 10:28:33 -07:00
Thomas Huang	829b0a8926	Merge branch 'master' into i18n	2018-03-13 10:21:03 -07:00
frankiebee	9fd349d740	transactions:state - add a submittedTime stamp so the ui has a better grasp of the time of submission	2018-03-13 09:51:37 -07:00
Vincent	0e28e8fa3d	Moved mock-dev.js and ui-dev.js to development folder.	2018-03-14 00:15:19 +11:00
Dan	179066fe6b	Set txMeta.time to reflect time of tx approval.	2018-03-13 03:26:37 -02:30
Dan	e6d1ce56e7	Improve phrasing of copy.	2018-03-13 03:11:45 -02:30
Dan	f805a2eb73	Fix gas calculation and nonce / forceGasMin state setting errors; retry button shows on correct tx.	2018-03-13 03:09:38 -02:30
Dan	70f33d4747	Left align create password.	2018-03-12 20:17:44 -02:30
Thomas	f7138d81e3	Add sigRequest for Signature Request	2018-03-12 11:41:26 -07:00
Thomas	23a8e24a1b	Add loglevel and window.log to i18n.js	2018-03-12 11:40:03 -07:00
Alexander Tseung	08542c18e1	Update deposit ether styling (#3510)	2018-03-12 19:25:12 +01:00
Dan	0dad6db973	Styling fixes to welcome; hide network component on create password; shown welcoem in popup.	2018-03-12 14:33:45 -02:30
Thomas	208b3bc4c1	Add i18n back into JsonImportSubview	2018-03-12 08:07:12 -07:00
Thomas Huang	b7c7083a11	Merge branch 'master' into i18n	2018-03-12 10:50:55 -04:00
kumavis	4bc69f72c3	test - mascara - fix async wrap	2018-03-11 21:39:46 -07:00
kumavis	3537c391db	test - use new async selectors for faster testing	2018-03-11 19:29:35 -07:00
kumavis	ecb792ae50	genStates - fix fs api calls	2018-03-11 19:06:14 -07:00
kumavis	07fa26d1f0	test - add comment about test behavior oddity	2018-03-11 18:52:27 -07:00
kumavis	0419276958	test - poll for element instead of manual timeouts	2018-03-11 14:52:29 -07:00
kumavis	7e56c6b6fa	test - genStates - use async api	2018-03-11 14:51:54 -07:00
Jeffrey Tong	4f853bbd3c	remove console log	2018-03-11 10:18:55 -07:00
Jeffrey Tong	bda493dc9d	add comments that need clarification on naming convention	2018-03-11 10:17:08 -07:00
kumavis	2c3e6552d2	ci - wrap env var in quotes	2018-03-10 11:13:27 -08:00
kumavis	74502296ed	ci - split integration tests into parallel firefox and chrome runs	2018-03-10 11:09:45 -08:00
Thomas	a3af225e49	Merge branch 'master' into selenium-e2e	2018-03-09 23:58:56 -08:00
Thomas	a62fe4f7ea	Update selenium tests	2018-03-09 23:57:44 -08:00
Thomas	c18f2a17fc	Add selenium-webdriver and chromedriver	2018-03-09 23:57:03 -08:00
kumavis	ddc85354d3	Merge pull request #3501 from MetaMask/circleci-2.0 ... ci - introduce circle ci 2.0	2018-03-09 16:07:28 -08:00