1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-23 18:41:38 +01:00
Commit Graph

7969 Commits

Author SHA1 Message Date
brunobar79
f269021dc3 add submit button type 2018-08-08 12:22:48 -04:00
Bruno Barbieri
bb52985722
Merge pull request #4988 from MetaMask/remove-engine-restrictions
Remove engine restrictions
2018-08-08 12:13:45 -04:00
brunobar79
a92e5ec527 remove engine restrictions 2018-08-08 11:46:54 -04:00
Dan Finlay
fdfcc7d687
Merge pull request #4982 from MetaMask/sig-version-fix
Reestablish old versions of eth-keyring-controller and eth-hd-keyring
2018-08-08 08:26:49 -07:00
Dan Miller
c4f1dfb82e Use token decimals when calculating confirm screen amount for token approvals. 2018-08-08 12:36:59 -02:30
bitpshr
365e349ec4 Reestablish old versions of eth-keyring-controller and eth-hd-keyring 2018-08-08 08:17:16 -04:00
brunobar79
cbbd0d3c75 lint 2018-08-08 03:21:37 -04:00
brunobar79
a46cf39f9b update package-lock.json 2018-08-08 03:03:17 -04:00
brunobar79
c6b7e460b5 code review changes 2018-08-08 03:00:39 -04:00
brunobar79
2e0916d8ff fix merge conflicts 2018-08-08 02:32:35 -04:00
Justin Kat
aab6e366c5 Fixing translations in first-time init menu (#4969) 2018-08-07 23:27:52 -02:30
Esteban MIno
c245405acb show token address summary on old ui 2018-08-07 20:07:26 -04:00
Esteban MIno
33357e3538 refactor unused code 2018-08-07 19:12:16 -04:00
Esteban MIno
15ea8c04b2 fix merge 2018-08-07 17:53:36 -04:00
Esteban Miño
3f57d5f66b
Merge branch 'develop' into WatchTokenFeature 2018-08-07 17:50:58 -04:00
Esteban MIno
00d1f6fec5 watch token on old ui 2018-08-07 17:40:45 -04:00
Dan Finlay
e9f74f005d
Merge pull request #4884 from MetaMask/TokensPerAccountBasis
Tokens per account & network basis
2018-08-07 13:30:26 -07:00
Thomas
562764ccb2 Use develop e2e beta tests 2018-08-07 12:07:22 -07:00
Dan Finlay
0601df9dae
Merge pull request #4954 from MetaMask/v4.9.0
V4.9.0
2018-08-07 11:31:42 -07:00
Esteban MIno
66c76c04ef CHANGELOG 2018-08-07 14:25:21 -04:00
Esteban MIno
b3af9cdf2e Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:20:49 -04:00
Dan Finlay
d549c4b871
Merge pull request #4965 from MetaMask/4.9.0
Update CHANGELOG.md
2018-08-07 11:20:09 -07:00
Esteban MIno
c0cdda8321 Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:17:40 -04:00
Esteban MIno
1f8a808a00 wip watch token old ui 2018-08-07 14:16:54 -04:00
frankiebee
2df46c1392 Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into network-remove-provider-engine 2018-08-07 11:16:04 -07:00
frankiebee
ff53a33f81 lint fixes 2018-08-07 11:14:56 -07:00
Kevin Serrano
bb40a8169c
Update CHANGELOG.md 2018-08-07 10:05:05 -07:00
frankiebee
e8a8711854 deps - update package-lock 2018-08-07 02:25:53 -07:00
frankiebee
cbade51ebd Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into network-remove-provider-engine-tests 2018-08-07 01:53:13 -07:00
frankiebee
115d3c9aaf Merge branch 'network-remove-provider-engine' into network-remove-provider-engine-tests 2018-08-07 01:38:32 -07:00
frankiebee
c2d4b237eb network - fix blockTracker reference to return the blockTrackerProxy instead of the direct blockTracker reference 2018-08-07 01:35:30 -07:00
Whymarrh Whitby
564fb9f563
Merge pull request #4960 from whymarrh/import-account-error
Show invalid seed phrase error when importing new account
2018-08-07 02:37:14 -02:30
Whymarrh Whitby
d0611741a2 Show invalid seed phrase error when importing new account 2018-08-07 02:09:26 -02:30
Esteban MIno
a57f56fdca clean confirm add token component 2018-08-06 20:06:13 -04:00
Esteban MIno
af35b415ab new confirm add suggested token component 2018-08-06 20:03:49 -04:00
Esteban MIno
88933f3a66 fix duplicated action 2018-08-06 18:48:18 -04:00
Esteban MIno
78ad3c38e2 add suggested token params validation 2018-08-06 18:28:47 -04:00
Thomas
f6490a2a6e Bump Changelog 2018-08-06 13:32:25 -07:00
Thomas
845a1a3df2 v4.9.0 Release 2018-08-06 13:09:07 -07:00
Thomas
941a920b15 Update Changelog 2018-08-06 13:08:40 -07:00
Whymarrh Whitby
7325ccf0fe
Merge pull request #4951 from whymarrh/update-pkgs
Update e2e test packages 📦
2018-08-06 16:22:04 -02:30
Whymarrh Whitby
46046c6915 Update chromedriver pkg 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
d1435fb883 Switch superstatic for static-server pkg 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
29488b2c53 Add static-server devDependency 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
6132238302 Remove superstatic package
Install and uninstalling superstatic doesn't work on Node 8 at the time of
writing:

    $ npm install -D superstatic@6
    npm ERR! code ENOTSUP
    npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"})
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Required: {"node":">=0.10.0 <7"}
    npm ERR! notsup Actual:   {"npm":"6.3.0","node":"8.11.3"}

This commit removes the package (using Node 6!) and it will have to be replaced.
2018-08-06 15:47:57 -02:30
Whymarrh Whitby
c3ed8e56ab Refresh package-lock.json file with npm@6.3.0 2018-08-06 15:47:57 -02:30
Dan J Miller
f8bb6ef7cf
Merge pull request #4868 from MetaMask/further-e2e-improvements
Further new ui e2e test improvements
2018-08-06 15:31:00 -02:30
Dan Miller
7de2a0687d Fix seed word confirmation step of e2e beta tests. 2018-08-06 12:14:06 -02:30
Dan Miller
aff66f4b07 Use unmodified constant for test delay in from-import-beta-spec. 2018-08-06 11:07:16 -02:30
Dan Miller
74e2225f36 Improve waits for new tx-list-items after first contract method call in e2e beta tests. 2018-08-06 11:07:16 -02:30