1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

289 Commits

Author SHA1 Message Date
Dan Finlay
a1528674bc Version 5.1.0: East Bay 2018-12-03 10:54:31 -08:00
Dan Finlay
4be3fe5906 Version 5.0.4 RC1 (#5859) 2018-11-29 11:43:00 -10:00
brunobar79
7fb9f91d27 trezor v6 2018-11-20 19:12:11 -05:00
brunobar79
9b1df386de fix merge conflicts 2018-11-20 17:44:28 -05:00
Dan Finlay
5956f8d260 Version 5.0.3 (#5785)
* Version 5.0.3

Includes a fix to the `version:bump` script that now correctly updates
the changelog header.

* Include inpage provider events
2018-11-20 08:34:14 -10:00
brunobar79
484aa6801e Merge branch 'develop' into trezor-v5 2018-11-13 17:21:15 -05:00
Dan Finlay
da1036f2c4 Version 5.0.2 2018-11-09 20:03:18 -08:00
Dan Finlay
e53ceb6bc1 Version 5.0.1 (#5694) 2018-11-07 12:07:14 -05:00
brunobar79
c651212025 fix merge conflicts 2018-11-06 20:21:19 -05:00
Dan Finlay
7b8a73b01f Version 5.0.0 (#5685) 2018-11-06 11:42:22 -05:00
Dan Finlay
2d4ff1dd82 Version 4.17.1 2018-11-05 14:05:33 -08:00
kumavis
e683684e8d 4.17.0 2018-11-01 21:05:37 -04:00
brunobar79
9c1b2108f6 fix merge conflicts 2018-10-21 01:59:53 -04:00
kumavis
09c3611171 4.16.0 2018-10-17 19:49:25 -04:00
brunobar79
13820b6cc1 fix conflicts 2018-10-16 14:01:54 -04:00
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
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
bitpshr
803a79f836 Do not resolve .test domains using ENS 2018-08-24 12:40:37 -04:00
brunobar79
ab7eb73ecc fix merge conflicts 2018-08-20 21:51:35 -04:00
Thomas
d636cc3552 v4.9.3 2018-08-15 10:06:20 -07:00
brunobar79
6f2c4809b6 undo permission change 2018-08-10 13:10:21 -04:00
brunobar79
814c642d95 fixes 2018-08-10 11:44:32 -04:00
brunobar79
35282980cf Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-08-09 18:49:21 -04: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
brunobar79
aaed44f1ec trezor v5 working on firefox 2018-08-05 02:43:02 -04: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