1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 03:36:18 +02:00
Commit Graph

1599 Commits

Author SHA1 Message Date
Dan Finlay
0bad941433 Merge pull request #768 from MetaMask/i762-RenameWalletToAccount
Rename wallet to account
2016-10-26 11:43:52 -07:00
Dan Finlay
0bf139188e Merge branch 'master' into i762-RenameWalletToAccount 2016-10-26 11:38:09 -07:00
Dan Finlay
c834b4f637 Merge branch 'master' into i762-RenameWalletToAccount 2016-10-26 11:31:08 -07:00
Kevin Serrano
2dad59b561 Merge pull request #764 from MetaMask/761-FixCustomMordenIndication
Fix provider menu selection indication
2016-10-26 11:06:29 -07:00
Dan Finlay
f1bbaeea50 Merge branch 'master' into 761-FixCustomMordenIndication 2016-10-26 10:51:07 -07:00
Dan Finlay
693c30d784 Merge pull request #769 from MetaMask/FixDelegateCall
Fix delegate call function reference 2
2016-10-25 17:45:18 -07:00
Dan Finlay
21e7331111 Fix delegate call function reference 2 2016-10-25 17:41:50 -07:00
Dan Finlay
1cabeb2fc4 Merge pull request #766 from MetaMask/FixDelegateCallCheck
Fix delegate call analysis
2016-10-25 17:38:03 -07:00
Dan Finlay
b3613232a2 Rename wallet to account
Fixes #762
2016-10-25 16:54:43 -07:00
Dan Finlay
bda64ab132 Fix delegate call analysis
Fixed reference allowing transactions to be analyzed for delegate call again.
2016-10-25 14:58:04 -07:00
Dan Finlay
f2497c5a97 Bump changelog 2016-10-25 14:17:15 -07:00
Dan Finlay
b1fb8da3b0 Fix provider menu selection indication 2016-10-25 14:16:04 -07:00
kumavis
f7688ac3cf Merge pull request #745 from MetaMask/i743-FixDelegateCallFlag
Reproduced issue 743 in test case
2016-10-24 16:24:29 -07:00
kumavis
3af3565000 test - fix delegate-call test 2016-10-24 16:12:44 -07:00
kumavis
85d03cc8fb Merge branch 'master' into i743-FixDelegateCallFlag 2016-10-24 12:24:19 -07:00
Dan Finlay
eba37e773d Merge pull request #752 from MetaMask/i#741
Add validations to txData param in send form
2016-10-21 17:24:04 -07:00
Frankie
7d9e295b75 Change regex in isHex function 2016-10-21 16:39:14 -07:00
Frankie
8326258b58 Merge branch 'i#741' of https://github.com/MetaMask/metamask-plugin into i#741 2016-10-21 16:07:49 -07:00
Frankie
d79424e9c0 clean up the isHex function 2016-10-21 16:05:39 -07:00
Frankie
eedca82167 Merge branch 'master' into i#741 2016-10-20 12:37:08 -07:00
Frankie
8d2ec8b820 Merge pull request #751 from MetaMask/ClarifyCallbackRole
Add note about callback param to sync method warning
2016-10-20 12:36:41 -07:00
Frankie
d4c0a4949b Clean up tests 2016-10-20 12:26:35 -07:00
Frankie
aa4746f4c7 Add test and ability for isHex to handle hex strings with hex-prefix 2016-10-19 19:35:44 -07:00
Frankie
ac7dca22c3 Fix up wording 2016-10-19 17:39:41 -07:00
Frankie
7140c04ef9 Fix CHANGELOG 2016-10-19 15:26:19 -07:00
Frankie
2f7ce1ca4c Merge branch 'master' into i#741 2016-10-19 15:25:27 -07:00
Frankie
4366f72fe1 Add unit test for isHex and add to CHANGELOG.md 2016-10-19 15:22:56 -07:00
Dan Finlay
090959470b Add note about callback param to sync method warning 2016-10-19 15:16:27 -07:00
Frankie
5fb1e492fb Add valdations to txData param 2016-10-19 14:33:30 -07:00
Kevin Serrano
82489129d5 Merge branch 'master' into i743-FixDelegateCallFlag 2016-10-18 14:20:16 -07:00
Kevin Serrano
a88a48ba14 Merge pull request #749 from MetaMask/Version-2.13.5
Version 2.13.5
2016-10-18 14:20:09 -07:00
Dan Finlay
f31fef034f Fix changelog date 2016-10-18 14:07:47 -07:00
Dan Finlay
182fd30db5 Fix cli flag capitalization 2016-10-18 14:02:06 -07:00
Dan Finlay
70f3d24e90 Version 2.13.5 2016-10-18 14:00:33 -07:00
Dan Finlay
60097d8fba Remove livereload from prod builds 2016-10-18 14:00:20 -07:00
kumavis
a542118a55 Merge pull request #748 from MetaMask/i746-ReloadBug
Wait for first metamask data to establish ping-pong stream.
2016-10-18 13:58:14 -07:00
Dan Finlay
cc23158bfe Wait for first metamask data to establish ping-pong stream.
Prevents infinite reload loops when dapps take too long to load.

Fixes #746.
2016-10-18 13:51:50 -07:00
Dan Finlay
049705004f Reproduced issue 743 in test case
This contract hex does include the value `f4`, but it was compiled from a contract with no instance of `.delegatecall`. I believe `f4` in this case is part of some other value or contract address, and `ethBinToOps` has some error in how it skips pushed data.

@kumavis
2016-10-17 14:48:25 -07:00
kumavis
0f0951ba54 Merge pull request #744 from MetaMask/i738-IncreaseGas
Increase gas estimate by 100000 wei
2016-10-17 13:33:02 -07:00
Dan Finlay
827d7553fc Restore hex prefix to gas price 2016-10-17 13:05:45 -07:00
Dan Finlay
91f43fa213 Increase gas estimate by 100000 wei
To prevent minor gas estimation errors, probably usually related to operating on dynamic state.

Fixes #738.
2016-10-17 12:47:37 -07:00
Kevin Serrano
101e839f9a Merge pull request #737 from MetaMask/Version-2.13.4
Version 2.13.4
2016-10-17 10:52:04 -07:00
Dan Finlay
5864044538 Version 2.13.4 2016-10-17 10:37:23 -07:00
Dan Finlay
6d4c685636 Merge pull request #736 from MetaMask/i735-xmlfix
Prevent injections on XML
2016-10-17 10:31:15 -07:00
Kevin Serrano
bc6092e111
Merge branch 'master' into i735-xmlfix 2016-10-17 10:25:00 -07:00
kumavis
11c114599c Merge pull request #720 from MetaMask/i#495CustomGasField
add a gasPrice field
2016-10-16 12:54:23 -07:00
Kevin Serrano
0d495372da
Lint. 2016-10-15 15:41:24 -07:00
Kevin Serrano
91a8977d27
Bump changelog. 2016-10-15 15:33:55 -07:00
Kevin Serrano
8a5eacd35f
Prevent XML from web3 injections. 2016-10-15 15:33:49 -07:00
Frankie
35232c5e29 Fix for linting 2016-10-13 18:08:15 -07:00