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
Thomas
de6f8b6811
Delay
2018-08-08 21:06:08 -07:00
Thomas
66120c627f
confirms a deplay contract tx in the popup
2018-08-08 18:04:48 -07: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
brunobar79
d0ccc59e45
add comment
2018-08-08 15:42:25 -04:00
brunobar79
656afeefad
fix merge conflicts
2018-08-08 15:40:04 -04:00
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
Paul Bouchon
8ac4b586eb
Update eth-keyring-controller and eth-hd-keyring versions ( #4989 )
2018-08-08 13:17:48 -04:00
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
