268 Commits

Author	SHA1	Message	Date
kumavis	f194f07801	Merge branch 'master' of github.com:MetaMask/metamask-extension into develop	2018-10-11 22:42:37 -04:00
Dan Finlay	1bbc55a533	Correct 4.14.0 version	2018-10-11 10:21:29 -07:00
Dan Finlay	837eb796e5	Version 4.14.0	2018-10-11 09:42:21 -07:00
Dan Finlay	78709499da	Version 4.13.0	2018-09-27 10:35:37 -07:00
Dan Finlay	9d8f4d547c	Version 4.12.0	2018-09-27 10:12:44 -07:00
Dan Finlay	140cee6c32	Merge remote-tracking branch 'origin/master' into Version-4.12.0	2018-09-27 10:11:51 -07:00
Bruno Barbieri	ed3529b70b	Merge branch 'master' into v4.11.1	2018-09-25 11:58:43 -04:00
brunobar79	e1c6306f83	bump to v4.11.1	2018-09-25 11:57:28 -04:00
Dan Finlay	6920429343	Version 4.11.0	2018-09-21 15:00:45 -07:00
tmashuang	f0f798f7e1	Version 4.10.0	2018-09-17 14:42:04 -05:00
bitpshr	803a79f836	Do not resolve .test domains using ENS	2018-08-24 12:40:37 -04:00
Thomas	d636cc3552	v4.9.3	2018-08-15 10:06:20 -07:00
Thomas	b887730be7	v4.9.2	2018-08-09 14:42:34 -07:00
Thomas	1605c8544a	v4.9.1	2018-08-09 10:23:16 -07:00
Thomas	500ef5cb3a	Merge branch 'master' into develop	2018-08-09 10:09:53 -07:00
Kelvin Tan	7ca402147d	add phishing html page, and redirect to bundled page in-window	2018-07-27 00:03:39 +08:00
Csaba Solya	6921f94bfe	initial test	2018-07-19 22:34:06 +02:00
bitpshr	8df433ca84	Add support for .test Ropsten ENS domains	2018-07-19 08:04:17 -04:00
brunobar79	595447ccac	Merge remote-tracking branch 'upstream/develop' into HEAD	2018-07-03 14:21:17 -04:00
Thomas	ef31eeccb2	v4.8.0	2018-06-14 10:48:38 -07:00
kumavis	f73feccf5a	4.7.4	2018-06-05 13:22:48 -07:00
kumavis	12a7fc4016	4.7.3	2018-06-04 16:11:19 -07:00
kumavis	a09b3737f2	4.7.2	2018-06-03 12:31:09 -07:00
Dan Finlay	b1b90a6bb9	Version 4.7.1	2018-06-01 15:48:16 -07:00
PhyrexTsai	f90d070190	Merge branch 'develop' into portal-metamask	2018-06-01 15:41:18 +08:00
Yung chieh Tsai	4e14313ba8	Update manifest.json	2018-06-01 11:26:44 +08:00
kumavis	e59f606adb	4.7.0	2018-05-30 15:08:44 -07:00
Yung chieh Tsai	86ead431c3	Update manifest.json	2018-05-29 12:39:10 +08:00
MikeCheng1208	8b8cc94f6f	Intergrate ENS with IPFS	2018-05-29 12:38:32 +08:00
MikeCheng1208	695b157e7b	Intergrate ENS with IPFS	2018-05-29 12:38:25 +08:00
kumavis	e447438504	Merge pull request #3997 from jakubsta/master ... Allow other extensions to connect	2018-05-21 13:41:09 -07:00
kumavis	477063a5a0	Version 4.6.1	2018-04-30 13:29:22 -07:00
kumavis	b97457e9e2	v4.6.0	2018-04-26 13:43:44 -07:00
Jakub Stasiak	ad7d38c0dc	Update: allow other extension to connect	2018-04-17 21:49:40 +02:00
kumavis	b91bd818c7	4.5.5	2018-04-06 09:58:51 -07:00
kumavis	000aa55dd3	v4.5.4	2018-04-06 09:02:56 -07:00
kumavis	db177c79f6	4.5.3	2018-04-04 15:20:25 -07:00
kumavis	222f207b78	4.5.2	2018-04-04 09:10:33 -07:00
kumavis	31a9fb38c8	4.5.1	2018-04-03 14:28:30 -07:00
kumavis	cbf94dad4b	4.5.0	2018-04-02 17:19:50 -07:00
kumavis	253abd60fc	build - extension - move js files to toplevel	2018-03-28 21:29:57 -07:00
kumavis	e0576d0526	v4.4.0	2018-03-26 17:05:52 -07:00
kumavis	9362239231	v4.3.0	2018-03-21 14:16:00 -07:00
kumavis	e48934dc04	Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead	2018-03-13 14:49:26 -07:00
Dan Finlay	d0ba2d2d94	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-07 13:39:44 -08:00
Dan Finlay	abe8bc19a8	Merge branch 'master' into i18n	2018-03-06 20:13:53 -08:00
kumavis	e91a521b1b	Version 4.2.0	2018-03-06 17:30:12 -08:00
Dan	9d215bab0f	Merge branch 'master' into i18n	2018-03-06 20:45:45 -03:30
Dan Finlay	423f084cb4	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-06 14:59:09 -08:00
Dan Finlay	452c5d0513	Version 4.1.3	2018-03-02 12:47:40 -08:00