1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 02:58:09 +01:00
Commit Graph

5731 Commits

Author SHA1 Message Date
Thomas
ae795c9770 Persist rinkeby.infura.io and clean nock after 2018-03-09 11:20:18 -08:00
Dan Finlay
174f57b464 Document process of adding a new translation 2018-03-09 11:18:43 -08:00
kumavis
51b806797a
Merge pull request #3496 from MetaMask/nsp-fix
node security - ignore known hoek advisory
2018-03-09 11:07:58 -08:00
kumavis
4c698be1d5 node security - ignore known hoek advisory 2018-03-09 10:53:10 -08:00
Alexander Tseung
a07550d2ab Increase tap areas for menu buttons on mobile 2018-03-09 18:50:00 +01:00
Alexander Tseung
ab1b39f554
Remove de-selected token from selectedTokens hash instead of setting to null (#3494) 2018-03-09 16:31:53 +01:00
Alexander Tseung
d84341f323
Add empty object default value for tokenData (#3493) 2018-03-09 16:31:17 +01:00
Alexander Tseung
4b2e52795d
Explicitly define state in import account from json component (#3491) 2018-03-09 16:30:31 +01:00
Dan Finlay
f28bbe5b03
Merge pull request #3485 from MetaMask/package-lock
meta - add package-lock to git
2018-03-08 17:25:20 -08:00
kumavis
4af2066298 meta - add package-lock to git 2018-03-08 16:20:23 -08:00
kumavis
a88e436b7d lint fix 2018-03-08 14:55:35 -08:00
kumavis
455faece9e Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-08 14:14:49 -08:00
kumavis
1712ab3fff gitignore - add yarn.lock 2018-03-08 14:13:12 -08:00
kumavis
98efca0a97 background - storage - cleanup storage wiring 2018-03-08 14:10:28 -08:00
Dan
91c890041c Add welcome screen to new-ui browser first time flow. 2018-03-08 14:21:54 -03:30
Alexander Tseung
cbb65cc493
Fix flashing to Log in screen after logging in or restoring from seed phrase (#3466) 2018-03-08 16:29:29 +01:00
Dan
09dae760bc Correct caps of Send button on main screen. 2018-03-07 22:47:29 -03:30
Dan
6c400c2e92 Update first time flow button fonts, and first-time-flow default font, to Roboto. 2018-03-07 22:37:53 -03:30
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification
Add seed phrase verification script into background process
2018-03-07 16:47:13 -08:00
Dan Finlay
64fcd27102 Tighten up data loading code 2018-03-07 14:42:59 -08:00
Dan Finlay
b97ac5106f Add clarifying comment 2018-03-07 14:38:26 -08:00
Dan Finlay
d58e47edec Some fixes for new storage strategy
- Don't persist undefined data
- Write to new storage strategy without waiting for completion.
- Continue writing to localStorage as fallback.
2018-03-07 14:23:31 -08:00
Dan Finlay
8965e59ba7 Update yarn.lock 2018-03-07 13:50:28 -08:00
Dan Finlay
ab55c184c7 Increase storage debounce to 2s 2018-03-07 13:50:22 -08:00
Dan Finlay
d0ba2d2d94 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-07 13:39:44 -08:00
Dan J Miller
ca047b1ea0
Update network colours for better accessibility. (#3469) 2018-03-07 15:22:10 -03:30
Thomas Huang
a74439a1a7
Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0
Update karma to the latest version 🚀
2018-03-07 13:50:41 -05:00
Thomas Huang
bd67deae13
Merge pull request #3460 from trigun0x2/master
fix typo in transaction.js
2018-03-07 13:48:14 -05:00
Jeffrey Tong
cad5f5f000 fix typo in tests and tx-state-manager 2018-03-07 10:24:36 -08:00
Dan
e290d70086 Change fonts in new-ui onboarding to Roboto, with weight 400. 2018-03-07 14:50:23 -03:30
Dan
b8dec68271 Make new-ui create password screen responsive. 2018-03-07 12:47:33 -03:30
Jeffrey Tong
57dc5a6e9b fix typo in transaction.js 2018-03-06 20:37:26 -08:00
Dan Finlay
abe8bc19a8
Merge branch 'master' into i18n 2018-03-06 20:13:53 -08:00
Dan
2420ad2477 Correct merge conflict resolution errors. 2018-03-06 22:26:13 -03:30
Thomas Huang
5ebdb215ae
Merge pull request #3458 from MetaMask/version-4.2.0
Version 4.2.0
2018-03-06 20:51:53 -05:00
kumavis
e91a521b1b Version 4.2.0 2018-03-06 17:30:12 -08:00
kumavis
d901268475
Merge pull request #3335 from MetaMask/ImportAccountMessageV2
Import account disclaimer and change loose label to imported.
2018-03-06 17:25:49 -08:00
kumavis
8a444ec96f
Merge pull request #3259 from MetaMask/controllerStubs
Offline testing
2018-03-06 17:21:36 -08:00
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 17:13:57 -08:00
kumavis
8e0131cbb5
Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording
Replace Lock wording with Log Out / Log In
2018-03-06 17:12:32 -08:00
kumavis
36c5bf203e
Merge pull request #3411 from MetaMask/AutoVersionBump
Clean up run version bump script
2018-03-06 17:11:49 -08:00
Dan
7c2257e09c Missing comma in messages.json 2018-03-06 21:25:30 -03:30
Dan
9d215bab0f Merge branch 'master' into i18n 2018-03-06 20:45:45 -03:30
Dan Finlay
f06bca1151 Implemented feedback to make i18n work on mac 2018-03-06 15:32:35 -08:00
Dan Finlay
9762a73041
Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined
Shapeshift form handles 'market info unavailable' errors.
2018-03-06 15:07:51 -08:00
Dan Finlay
52b4876cf9
Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit
Gracefully handle null token balance in new ui send.
2018-03-06 15:05:43 -08:00
Dan Finlay
31e7d9263f
Merge pull request #3444 from danjm/i3348-minus-not-a-number
Prevent user from selecting max amount until gas is estimated.
2018-03-06 15:05:25 -08:00
Dan Finlay
423f084cb4 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-06 14:59:09 -08:00
Dan Finlay
cb4ad60800 Merge branch 'master' into i2475-UnifyLogInWording 2018-03-06 14:57:01 -08:00
Dan Finlay
b87687110d Replace Lock wording with Log Out / Log In
Fixes #2475
2018-03-06 14:51:26 -08:00