Dan Finlay
3a1f1b3bc4
Bump changelog
2017-03-27 17:43:15 -07:00
Dan Finlay
ec9f73ed91
Merge branch 'master' into master
2017-03-27 16:15:40 -07:00
Dan Finlay
a298130357
Merge pull request #1269 from MetaMask/notice-fix
...
Notice fix for when notices are short
2017-03-27 13:44:17 -07:00
Dan Finlay
d41c8ef598
Version 3.5.1
2017-03-27 13:39:19 -07:00
Kevin Serrano
c69ebf3420
Add to changelog.
2017-03-27 16:33:54 -04:00
Kevin Serrano
9a8bf5a605
Fix edge case where notice does not require scrollbar.
2017-03-27 16:33:04 -04:00
Frankie
d6d85d28bb
Merge pull request #1266 from MetaMask/Version-3.5.0
...
Version 3.5.0
2017-03-27 11:57:20 -07:00
Dan Finlay
d9c2f4f5e8
Version 3.5.0
2017-03-27 11:48:10 -07:00
Dan Finlay
4819f3a91d
Merge pull request #1265 from MetaMask/ropsten-fix
...
Block explorer - fix ropsten links
2017-03-27 11:45:05 -07:00
kumavis
918f388463
explorer - fix ropsten explorer link tests
2017-03-27 11:32:00 -07:00
kumavis
e4543bc104
Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into ropsten-fix
2017-03-27 11:04:58 -07:00
kumavis
4b9f1c0e0c
tests - fix ropsten link check
2017-03-27 11:01:10 -07:00
kumavis
dca4486a65
block explorer - ropsten
...
etherscan differentiates between "attacked ropsten" vs "revived ropsten"
https://ropsten.etherscan.io/ is the revived ropsten
2017-03-27 10:57:04 -07:00
kumavis
bd4a68531b
block explorer - account link - ropsten
...
etherscan differentiates between "attacked ropsten" vs "revived ropsten"
https://ropsten.etherscan.io/ is the revived ropsten
2017-03-27 10:55:40 -07:00
Stefaan Ponnet
0faddb2ed2
Allow injection in IFrames + dynamic IFrames
2017-03-26 13:57:44 +02:00
Dan Finlay
1c956bdb62
Merge pull request #1253 from MetaMask/i1210-txdisappearance
...
Fix transactions disappearing on other networks when creating transactions on a network
2017-03-24 14:51:01 -07:00
Kevin Serrano
15d987ccce
Merge branch 'i1210-txdisappearance' of github.com:MetaMask/metamask-plugin into i1210-txdisappearance
2017-03-24 17:24:21 -04:00
Kevin Serrano
f8b404a478
correct bug in test.
2017-03-24 17:23:56 -04:00
Kevin Serrano
360afacd70
Add tests.
2017-03-24 17:21:58 -04:00
Kevin Serrano
30e8d25013
Merge branch 'master' into i1210-txdisappearance
2017-03-24 17:13:57 -04:00
Kevin Serrano
21f41718ce
Merge branch 'master' into i1210-txdisappearance
2017-03-24 14:07:48 -07:00
Kevin Serrano
fb39539214
Merge pull request #1249 from MetaMask/kovan-notice
...
Kovan notice
2017-03-24 14:07:37 -07:00
Dan Finlay
ae310ed006
Merge branch 'master' into kovan-notice
2017-03-24 14:03:54 -07:00
Dan Finlay
c45ed395a6
Merge pull request #1250 from MetaMask/notice-modification
...
Erase notice body when read
2017-03-24 14:02:07 -07:00
Dan Finlay
3a888ede2a
Merge branch 'master' into notice-modification
2017-03-24 13:56:30 -07:00
Dan Finlay
c15dfccaa4
Merge branch 'master' into kovan-notice
2017-03-24 13:53:45 -07:00
Dan Finlay
393c7faf28
Merge pull request #1248 from MetaMask/i1234-HardGasLimits-BrowserForm
...
Hard gas limits browser form
2017-03-24 13:52:57 -07:00
Kevin Serrano
5cd917b0e9
Add personalMessages to function to calculate pending tx index.
2017-03-24 16:39:55 -04:00
Dan Finlay
5cc934f18c
Fix tx selecting bug
2017-03-24 12:50:39 -07:00
Kevin Serrano
1dfcc54381
Remove goHome action causing erratic UI behavior.
2017-03-24 13:57:04 -04:00
Dan Finlay
8e7b5d6a13
Remove unnecessary log
2017-03-24 10:26:50 -07:00
Dan Finlay
abe9223a8a
Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
2017-03-24 09:45:36 -07:00
Dan Finlay
0e74cf2cba
Disable accept button when gas limit is too low
2017-03-24 09:45:03 -07:00
Kevin Serrano
9c6391f6e0
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
2017-03-23 17:11:56 -07:00
Kevin Serrano
9e39f85ea1
Merge pull request #1257 from MetaMask/i1256-RemoveGasLimitParam
...
Remove gas limit param
2017-03-23 17:11:39 -07:00
Dan Finlay
6a46e9ce06
Make gas calculations on render more consistent
2017-03-23 17:00:59 -07:00
Dan Finlay
9bea31a402
Fix initial tx fee estimation
2017-03-23 16:37:29 -07:00
Dan Finlay
3400ed0955
Fix a couple things
...
Sorry apparently the gas fixes weren't in the last commit, but are in this one.
As reported in previous commit, fixes a bug where initial estimate is not derived from the network.
Also fixes a bug where clicking "reset" does not clear our custom validation warnings.
2017-03-23 16:02:40 -07:00
Dan Finlay
018b1d006f
Make reset button clear errors
2017-03-23 15:14:18 -07:00
Dan Finlay
31c1839ed7
Fix initial gas price estimate
2017-03-23 15:11:52 -07:00
Dan Finlay
612bace17d
Prevent default for reset and reject buttons
2017-03-23 15:01:05 -07:00
Dan Finlay
bda821f144
Override browser default validation message
2017-03-23 14:57:35 -07:00
Dan Finlay
55e8a717e6
Fix some broken refs
2017-03-23 14:55:59 -07:00
Dan Finlay
2cab2f767c
Remove gas limit param
...
Fixes #1256 by removing redundant param.
2017-03-23 13:56:32 -07:00
Dan Finlay
6b100163e9
Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
2017-03-23 13:46:09 -07:00
Dan Finlay
e7a3330b98
Combine pending-tx-details component into pending-tx-details
...
These were only separated originally so we could make the notification-based TX approval work, which provided its own buttons.
This two templates are logically highly coupled, and keeping them working while separate has been difficult at times, and has even required resorting to dubious practices, like using React's `refs` pattern.
This combines them into one fairly large component, but I think it's ok, we can still break this up into components, just not the separation that it had previously.
2017-03-23 13:44:09 -07:00
Kevin Serrano
b8500d384b
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
2017-03-23 12:05:42 -07:00
Dan Finlay
f29a116d40
Merge pull request #1251 from MetaMask/kovan-tx-etherscan
...
Enable etherscan linking on Kovan transaction list items.
2017-03-23 08:42:02 -07:00
Kevin Serrano
2e446eb588
Add to changelog.
2017-03-23 11:28:52 -04:00
Kevin Serrano
fa0bbd66b6
Fix persistence of transactions between networks.
2017-03-23 11:28:06 -04:00
