1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 11:46:13 +02:00
Commit Graph

6881 Commits

Author SHA1 Message Date
Dan Finlay
83c7de2169
Merge pull request #4471 from MetaMask/master
4.7.2 - Merge master into develop
2018-06-03 13:19:35 -07:00
Dan Finlay
750ec87699
Merge pull request #4470 from MetaMask/v4.7.2
Version 4.7.2
2018-06-03 13:09:42 -07:00
kumavis
0a7584999e 4.7.2 - additional changelog notes 2018-06-03 12:35:32 -07:00
kumavis
a09b3737f2 4.7.2 2018-06-03 12:31:09 -07:00
kumavis
a3cc2b0a7b deps - update package-lock via npm@5.10.0 2018-06-03 12:29:19 -07:00
Dan Finlay
8cd692e37c
Merge pull request #4467 from MetaMask/preferences-account-sync
bugfix - update preferences controller identities on keyring controller update
2018-06-03 12:26:11 -07:00
kumavis
123d74c4b2
Merge pull request #4353 from MetaMask/publishing-guide-update
Update publishing guide
2018-06-03 12:25:43 -07:00
kumavis
eb3241ccba metamask-controller - clear account labels on restore from seed phrase 2018-06-03 12:02:35 -07:00
kumavis
54a9c62fd6 preferences controller - jsdoc fix 2018-06-03 11:30:11 -07:00
kumavis
d4cdd1a0f3 metamask - update preferences controller identities on keyring controller update 2018-06-03 11:27:25 -07:00
kumavis
a08e58f0fd
Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix
sentry - message rewrite - guard against missing message
2018-06-03 10:50:05 -07:00
Dan
8f0a3b8311 Merge branch 'develop' into handle-import-account-failure-in-ui 2018-06-03 06:46:45 -02:30
Dan J Miller
e6769bde5b
Merge pull request #4432 from alextsg/fix-tokenlist-balance-overflow
Fix ellipses
2018-06-02 03:02:48 -02:30
kumavis
72dde75e58
Merge pull request #4425 from MetaMask/master
Merge Master into Develop
2018-06-01 17:06:30 -07:00
Dan Finlay
1da103a6ed
Merge pull request #4436 from MetaMask/bmd/update-zenhub-links
update helpscout links to zendesk
2018-06-01 16:12:00 -07:00
Dan Finlay
475bb1ca92
Merge pull request #4438 from wjmelements/yarn
Suggest Yarn for Node >= 10
2018-06-01 16:11:38 -07:00
kumavis
4be8e780cd
Merge pull request #4449 from MetaMask/Version-4.7.1
Version 4.7.1
2018-06-01 16:03:56 -07:00
Dan Finlay
8a2d75f3a6
Merge pull request #4450 from MetaMask/fix-migration-26
Fix return value of migration 26 when missing KC or PC
2018-06-01 16:00:52 -07:00
Dan Finlay
b1b90a6bb9 Version 4.7.1 2018-06-01 15:48:16 -07:00
Dan Finlay
fbcea7043f Merge branch 'master' into develop 2018-06-01 15:47:28 -07:00
Whymarrh Whitby
1a18f03e2f
Fix return value of migration 26 when missing KC or PC 2018-06-01 15:46:31 -07:00
kumavis
003172231a
Merge pull request #4433 from MetaMask/i4431-error-throwing
End json-rpc-engine stack on error
2018-06-01 11:16:41 -07:00
bitpshr
ccae937f41 Properly end the middleware stack on RPC error 2018-06-01 12:57:57 -04:00
William Morriss
545043a364 recommend yarn for node >= 10 2018-05-31 19:01:25 -07:00
Bobby Dresser
966583026a update helpscout links to zenhub 2018-05-31 15:26:04 -07:00
Alexander Tseung
fd98ed570e Fix ellipses 2018-05-31 11:16:41 -07:00
Alexander Tseung
cc73d869fe Add new alert modals 2018-05-31 10:37:52 -07:00
Alexander Tseung
f4d833cb09 Change btn-secondary styles to btn-default. Make btn-secondary red warning style buttons 2018-05-31 10:37:52 -07:00
Dan
d454b5de2b Token name is not hidden in wallet if balance is exceptionally long. 2018-05-31 13:32:18 -02:30
kumavis
e2e4496c87 sentry - message rewrite - guard against missing message 2018-05-30 17:42:41 -07:00
Dan
0f3480a97f Fix then-catch + error handling in import-account 2018-05-30 21:33:40 -02:30
Thomas Huang
dc5477be3c
Merge pull request #4408 from MetaMask/v4.7.0rc2
Version 4.7.0 - rc2
2018-05-30 16:04:02 -07:00
kumavis
e59f606adb 4.7.0 2018-05-30 15:08:44 -07:00
kumavis
adfa033829 changelog - add note on brave 2018-05-30 15:07:46 -07:00
kumavis
39d22a4ddb
Merge pull request #4419 from MetaMask/deps-bump-keyring-controller
deps - bump eth-keyring-controller for bugfix
2018-05-30 14:57:44 -07:00
kumavis
b69da50095 deps - bump eth-keyring-controller for bugfix 2018-05-30 14:29:14 -07:00
Dan
1c3d2aa18b Importing account by json and private key shows error and does not change account if no selectedAddress comes after import. 2018-05-30 17:00:50 -02:30
Csaba Solya
1dda0c6469 remove generating blocked accounts and use a config file instead 2018-05-30 21:15:59 +02:00
Alexander Tseung
389346913b
Prevent loading screen from overlaying the app bar (#4417) 2018-05-30 10:38:53 -07:00
kumavis
b5c91d240b
Merge pull request #4407 from MetaMask/e2e-test
Adds account in e2e test
2018-05-30 10:12:20 -07:00
Alexander Tseung
d40971e7f3
Fix error handling on incorrect password (#4401) 2018-05-30 09:23:31 -07:00
Csaba Solya
3e489ea165 fix documentation 2018-05-30 17:42:41 +02:00
Csaba Solya
cf73581c0e adding tests for recipient blacklist checker 2018-05-30 17:38:27 +02:00
Csaba Solya
6affd8f949 adding transaction controller tests 2018-05-30 16:24:40 +02:00
Csaba Solya
afb5788861 initial implementation 2018-05-30 15:53:18 +02:00
Thomas
be6776897f Delay before getting address text 2018-05-29 23:07:45 -07:00
kumavis
f5fb06020d
Merge pull request #4402 from MetaMask/danjm-changelog-update-52918
Update changelog
2018-05-29 22:35:47 -07:00
Thomas
54ccf5e930 Merge branch 'develop' into e2e-test 2018-05-29 22:34:17 -07:00
kumavis
77c55ecd83
Merge pull request #4403 from MetaMask/bugfix-keyring-controller
deps - bump eth-keyring-controller + update package-lock
2018-05-29 22:31:58 -07:00
kumavis
73afb263cb ci - job-screens - use e2e funcs 2018-05-29 22:13:58 -07:00