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

7639 Commits

Author SHA1 Message Date
brunobar79
42834fe8be fix e2e tests 2018-08-10 13:11:49 -04:00
brunobar79
6f2c4809b6 undo permission change 2018-08-10 13:10:21 -04:00
brunobar79
eb2f491458 add error messages 2018-08-10 12:09:54 -04:00
brunobar79
e905c9f055 hide export private key for trezor accounts 2018-08-10 11:56:56 -04:00
brunobar79
814c642d95 fixes 2018-08-10 11:44:32 -04:00
brunobar79
728aeb9344 add app/vendor dir to eslintignore 2018-08-09 23:38:01 -04:00
brunobar79
c8d75f3230 use new connect.js file 2018-08-09 23:19:17 -04:00
brunobar79
35282980cf Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-08-09 18:49:21 -04:00
Dan Finlay
be1d5a7dd9
Merge pull request #5020 from MetaMask/FixMigration28
Fixes migration 28
2018-08-09 14:24:38 -07:00
Jenny Pollack
0442e5dfd7
Merge pull request #5022 from MetaMask/sentry-release-version
sentry - change releaseVersion to release
2018-08-09 14:08:47 -07:00
Jenny Pollack
00a2ab21ae sentry - change releaseVersion to release 2018-08-09 13:49:40 -07:00
Esteban MIno
d263d60b4c tests for migration 28 2018-08-09 16:41:16 -04:00
Esteban MIno
8df3f2696c fix migration 28 2018-08-09 16:15:56 -04:00
Dan Finlay
2b25902561
Merge pull request #5017 from MetaMask/v4.9.1
V4.9.1
2018-08-09 10:52:11 -07:00
bobby dresser
438fd5bce0
remove duplicate template (#5016) 2018-08-09 10:48:10 -07:00
Thomas
1605c8544a v4.9.1 2018-08-09 10:23:16 -07:00
Thomas
bbde2ea4fc Bump Changelog 2018-08-09 10:23:03 -07:00
Thomas
2e82f7e7ba Merge branch 'develop' of github.com:MetaMask/metamask-extension into develop 2018-08-09 10:10:03 -07:00
Thomas
500ef5cb3a Merge branch 'master' into develop 2018-08-09 10:09:53 -07:00
bobby dresser
6fb790e9a8
Create issue templates (#4972)
adds issue templates
2018-08-09 10:09:33 -07:00
Thomas Huang
09b81a2d22
Merge pull request #5010 from eduadiez/develop
Fix ENS resolution issues
2018-08-09 09:47:25 -07:00
Eduardo Antuña Díez
a2082bae5c Avoid overwriting a domain that can be resolved by DNS
According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it.
changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.
2018-08-09 12:20:51 +02:00
Eduardo Antuña Díez
543207b5af Fixed ENS to IPFS functionality in Firefox
`tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`
2018-08-09 12:14:09 +02:00
Dan J Miller
d4af5b7bec
Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure
Show error while allowing confirmation of tx where simulation fails
2018-08-08 22:13:41 -02:30
Dan Miller
973325a6c4 Show error while allowing confirmation of transaction where simulation fails 2018-08-08 21:26:25 -02:30
Dan J Miller
1ae668fa5e
Merge pull request #4995 from MetaMask/nonce-for-retry-from-ethquery
Get nonce for showing retry button using ethQuery transaction count.
2018-08-08 21:09:27 -02:30
Whymarrh Whitby
51644962e9
Fix lint error in tx-list 2018-08-08 19:32:45 -02:30
Dan Miller
e98c3b4c01 Get nonce for showing retry button using ethQuery transaction count. 2018-08-08 17:04:42 -02:30
Dan J Miller
1d4ee6bf76
Merge pull request #4986 from MetaMask/approve-calc-token-decimals
Use token decimals when calculating confirm screen token approval amount
2018-08-08 16:26:03 -02:30
brunobar79
de058c128f update package-lock.json 2018-08-08 14:34:54 -04:00
brunobar79
286bde606f fix merge conflicts 2018-08-08 14:30:49 -04:00
Paul Bouchon
8ac4b586eb
Update eth-keyring-controller and eth-hd-keyring versions (#4989) 2018-08-08 13:17: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
Justin Kat
aab6e366c5 Fixing translations in first-time init menu (#4969) 2018-08-07 23:27:52 -02:30
Dan Finlay
e9f74f005d
Merge pull request #4884 from MetaMask/TokensPerAccountBasis
Tokens per account & network basis
2018-08-07 13:30:26 -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
Kevin Serrano
bb40a8169c
Update CHANGELOG.md 2018-08-07 10:05:05 -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
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