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

6911 Commits

Author SHA1 Message Date
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
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
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
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
kumavis
4789e981c2
Merge pull request #4374 from MetaMask/test-unit-fail-on-only
test - unit - fail if tests contain a .only call
2018-05-29 21:40:28 -07:00
Alexander Tseung
a19b911feb
Add rpc key to i18n messages (#4375) 2018-05-29 18:31:32 -07:00
Thomas
f90ad6191c Add account 2018-05-29 18:20:54 -07:00
kumavis
d6965c7cdb deps - bump eth-keyring-controller + update package-lock 2018-05-29 17:38:00 -07:00
Dan J Miller
e3cc89cc7b
Update changelog 2018-05-29 21:59:53 -02:30
kumavis
ff6976b8a5
Merge pull request #4399 from MetaMask/merge-master
Pull master changes back into develop
2018-05-29 16:47:30 -07:00
kumavis
4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
kumavis
219cb83d94
Merge pull request #4394 from MetaMask/MissionStatement
Add mission statement v1
2018-05-29 14:32:05 -07:00
kumavis
39069710d1
Merge pull request #4390 from MetaMask/i18n-brave-fix
i18n - getFirstPreferredLangCode - guard against missing i18n api
2018-05-29 11:05:12 -07:00
kumavis
5fc24930a7
Merge pull request #4384 from antonper/master
UI Errors stack cleaned
2018-05-29 11:04:08 -07:00
Alexander Tseung
41e38fe553
Add notification for dropped retry transactions (#4363) 2018-05-29 10:23:06 -07:00
Alexander Tseung
e3c9629130
Fix add-token token list placeholder width (#4365) 2018-05-29 10:03:08 -07:00
Dan Finlay
1333cd470b Mission v2 2018-05-29 09:30:59 -07:00
Dan Finlay
344f0f2eea Add mission statement v1 2018-05-29 09:27:02 -07:00
Alexander Tseung
d1f5d8ccc6
Fix text field labels of first time flow. Add text fields to storybook (#4389) 2018-05-29 09:35:18 -05:00
kumavis
32293a959c test - unit - tx-controller - fix blockTracker stub 2018-05-29 01:08:55 -07:00
kumavis
58de5671cc controllers - transactions - fix tx status update on boot 2018-05-29 00:53:44 -07:00
kumavis
16d0db15e0 controllers - transactions - fix tx confirmation 2018-05-29 00:41:28 -07:00
kumavis
c665fe191d
Merge pull request #4393 from MetaMask/newui-unlock-catch
newui - unlock - dont catch errors unrelated to tryUnlockMetamask
2018-05-28 23:52:19 -07:00
kumavis
76c5851df1
Merge pull request #4391 from MetaMask/newui-imported-accounts-select-fix
metamask-controller - update preferences controller addresses after import account
2018-05-28 23:51:59 -07:00
kumavis
7d449e974d newui - unlock - dont catch errors unrelated to tryUnlockMetamask 2018-05-28 23:44:51 -07:00
kumavis
a7b7c8f034 newui - unlock - dont catch errors unrelated to tryUnlockMetamask 2018-05-28 23:34:40 -07:00
kumavis
c9f3404ca5 metamask-controller - lint fix 2018-05-28 23:25:48 -07:00
kumavis
7e87600042
metamask-controller - lint fix 2018-05-28 23:14:38 -07:00
kumavis
09601439e3 metamask-controller - update preferences controller addresses after import account 2018-05-28 23:00:22 -07:00
kumavis
fe42de4642 metamask-controller - update preferences controller addresses after import account 2018-05-28 22:58:14 -07:00