1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 20:39:08 +01:00
Commit Graph

2824 Commits

Author SHA1 Message Date
Dan Finlay
d2bd6f3913 Merge branch 'master' into hideseedwordsfromlogstate 2017-03-28 14:42:24 -07:00
kumavis
5d38792910 Merge branch 'ImproveGasEstimates' of github.com:MetaMask/metamask-plugin into ImproveGasEstimates 2017-03-28 14:41:47 -07:00
Dan Finlay
731f665409 Merge pull request #1275 from MetaMask/injection-polish
Fix injection logic.
2017-03-28 14:41:04 -07:00
kumavis
067459da4c Filter txs by txMeta network value in account detail 2017-03-28 14:39:45 -07:00
kumavis
6310a05dae tx manager - emit update on new unapproved tx 2017-03-28 14:39:29 -07:00
Dan Finlay
8681e2540e Filter txs by txMeta network value in account detail 2017-03-28 14:24:05 -07:00
Dan Finlay
0d20b54854 Detect tx network from txMeta 2017-03-28 14:23:01 -07:00
kumavis
e864623d3c tx manager - add eth-query 2017-03-28 13:56:35 -07:00
kumavis
1495240969 tx manager - adjust new tx flow and txMeta decorations 2017-03-28 13:35:27 -07:00
Dan Finlay
81d3658343 Improve UI gas calculation logic
- Now striping hex prefixed gas values, which may have been causing mis-estimation.
- Unified calculation logic to be entirely functional.
- Greatly simplified how the pending-tx form keeps updated form state.

Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.
2017-03-28 11:52:15 -07:00
Kevin Serrano
0625b4a110
Fix injection logic. 2017-03-28 14:30:39 -04:00
Kevin Serrano
a95d96d507
Assure that seed words are placed into state tree upon request. 2017-03-28 11:23:25 -04:00
Kevin Serrano
c227d1944f
Add to changelog. 2017-03-28 10:27:03 -04:00
Kevin Serrano
6af932904d
Remove seedWords from UI state dump. 2017-03-28 10:26:06 -04:00
Dan Finlay
903d3aeb7a Merge pull request #1271 from MetaMask/i1223-InjectIFrames
Inject web3 in iFrames
2017-03-27 17:52:23 -07:00
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
Kevin Serrano
67892c49a6 Merge branch 'master' into kovan-faucet-instructions 2017-03-27 16:45:04 -04: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
Kevin Serrano
6fd7e133bd
Add to changelog. 2017-03-27 16:06:05 -04:00
Kevin Serrano
c1136a6317
Add link to kovan faucet instructions. 2017-03-27 16:05:21 -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