6035 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	9482af6157	i18n - add locales index json	2018-03-27 17:52:26 -07:00
kumavis	9e1bdcb09d	test - integration - add locale build step	2018-03-27 17:17:34 -07:00
kumavis	b26788e9d4	Merge branch 'i18n-translator-redux' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-27 17:17:26 -07:00
kumavis	5290570c8f	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-27 17:17:04 -07:00
Dan	2053cac691	Don't query for undefined.	2018-03-27 21:35:12 -02:30
kumavis	b6b18339e2	Merge pull request #3758 from MetaMask/i#3731 ... I#3731	2018-03-27 17:01:01 -07:00
frankiebee	fefbf40a06	Merge branch 'master' into i#3731	2018-03-27 16:50:57 -07:00
frankiebee	f0f45e6fe1	migration for removing unnecessary transactions from state	2018-03-27 16:49:13 -07:00
Thomas Huang	cd3e092c14	Merge pull request #3755 from MetaMask/revert-3730-revert-3665-ci-build ... Restore "Ci - introduce a build job"	2018-03-27 16:24:47 -07:00
kumavis	fe8472ab22	ci - end by flowing all required tests into a single job	2018-03-27 16:10:27 -07:00
kumavis	3ec3b09c12	ci - end by flowing all required tests into a single job	2018-03-27 16:09:11 -07:00
kumavis	1dea4124f5	ci - end by flowing all required tests into a single job	2018-03-27 14:40:04 -07:00
kumavis	4ee48acf56	deps - update package-lock	2018-03-27 14:30:50 -07:00
kumavis	914a098c8a	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-27 14:28:37 -07:00
kumavis	62e1cbd33b	ci - run e2e tests after build step	2018-03-27 14:16:58 -07:00
kumavis	e0d98e73e3	Revert "Revert "Ci - introduce a build job""	2018-03-27 14:08:20 -07:00
Thomas Huang	246287ff1c	Merge pull request #3754 from MetaMask/selenium-e2e ... test - e2e testing with selenium	2018-03-27 14:03:47 -07:00
kumavis	c2b5538ff3	deps - update package-lock	2018-03-27 13:54:32 -07:00
kumavis	5a309328f1	ci - run e2e jobs	2018-03-27 13:36:09 -07:00
Thomas Huang	8648aee907	Merge branch 'master' into selenium-e2e	2018-03-27 13:28:58 -07:00
kumavis	0fe0d8b7a5	Merge pull request #3739 from gasolin/zhtwfix ... [zh-TW] fix translation and add missing strings	2018-03-27 09:21:40 -07:00
kumavis	bd2b08f5f1	Merge pull request #3746 from nyatla/master ... Updated the Japanese expression and added some translations.	2018-03-27 09:17:31 -07:00
Dan	f74e802026	Undo unnecessary line removals.	2018-03-27 10:52:19 -02:30
Dan	be2254b880	Remove comments and console.logs	2018-03-27 10:37:45 -02:30
R.IIzuka	bfa62f719f	Update messages.json ... Fixed Japanese phrases. Add some translations.	2018-03-27 22:05:37 +09:00
Dan	d2bd5687e8	Merge branch 'master' into i18n-translator-redux	2018-03-27 10:17:48 -02:30
gasolin	81e2ab20d9	[zh-TW] fix translation and add missing strings	2018-03-27 10:27:19 +08:00
kumavis	dac66b8ee9	Merge pull request #3737 from MetaMask/include-migration-22 ... include migration 22	2018-03-26 18:58:15 -07:00
frankiebee	0a2616a37f	include migration 22	2018-03-26 18:12:16 -07:00
Dan Finlay	91ce48b7ad	Merge pull request #3735 from MetaMask/v4.4.0 ... v4.4.0	2018-03-26 17:14:49 -07:00
kumavis	3b54541a5f	changelog - add note ofr i18n zh_tw th sl	2018-03-26 17:11:00 -07:00
kumavis	e0576d0526	v4.4.0	2018-03-26 17:05:52 -07:00
frankiebee	43dde3cbde	transactions - only save up to 40 txs totall across all networks	2018-03-26 15:58:36 -07:00
Dan Finlay	bd7e5dbf38	Merge pull request #3732 from MetaMask/i3706-FixLocalStoreWrite ... Fix bug where full localStorage would crash on start	2018-03-26 15:50:45 -07:00
Dan Finlay	e196b6dcb7	Fix bug where full localStorage would crash on start	2018-03-26 15:25:26 -07:00
Thomas Huang	e001c0900b	Merge pull request #3680 from danjm/i3517-popup-newui-onboarding ... Popup uses new ui onboarding when in beta.	2018-03-26 14:55:50 -07:00
Thomas Huang	b0fae2ca39	Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate ... Updates Add token screen to latest design.	2018-03-26 14:55:30 -07:00
Thomas Huang	ec3cca03fe	Merge pull request #3728 from MetaMask/changle-updates-march26 ... New-ui changelog updates (March 26)	2018-03-26 14:53:58 -07:00
Thomas Huang	8b719a418a	Merge pull request #3729 from MetaMask/test-timeout-fix ... test - remove timeout causing mocha disconnect issues	2018-03-26 14:53:21 -07:00
Dan Finlay	ce2bd9dfbb	Merge pull request #3730 from MetaMask/revert-3665-ci-build ... Revert "Ci - introduce a build job"	2018-03-26 14:34:17 -07:00
Dan Finlay	63967ebf47	Revert "Ci - introduce a build job"	2018-03-26 14:26:39 -07:00
Frankie	5a61a6d57a	migration for adding submittedTime to the txMeta (#3727) ... * test for migration 022 * write migration 022 adding submittedTime to txMetas whove been submitted	2018-03-26 14:24:12 -07:00
kumavis	15952816c1	test - remove timeout causing mocha disconnect issues ... Revert "test - flat - add extra timeout" This reverts commit 4c2cf15d2a.	2018-03-26 13:58:21 -07:00
Dan	e5af7e1abd	New-ui changelog updates (March 26)	2018-03-26 17:37:40 -02:30
Dan	c9e3e99385	Empty commit.	2018-03-26 17:26:46 -02:30
Dan	bd3a6d3744	Empty commit.	2018-03-26 17:22:55 -02:30
Dan	55ca92736c	Empty commit.	2018-03-26 17:19:56 -02:30
Dan	30d751c553	Empty commit.	2018-03-26 17:16:01 -02:30
Dan	2163be1e1b	Empty commit.	2018-03-26 17:12:53 -02:30
Dan	6acc25cce1	Empty commit.	2018-03-26 17:09:23 -02:30