Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add migration tests to ensure that bodies are erased properly in notices. | Kevin Serrano | 2017-03-23 | 2 | -0/+14 |
| | |||||
* | Remove notice body after reading. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1243 from MetaMask/i238-kovan | Dan Finlay | 2017-03-23 | 10 | -4/+45 |
|\ | | | | | Add Kovan Test Net | ||||
| * | Merge branch 'master' into i238-kovan | Dan Finlay | 2017-03-23 | 1 | -9/+5 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1241 from MetaMask/i1237-xmlfix2 | Dan Finlay | 2017-03-23 | 1 | -9/+5 |
|\ \ | | | | | | | Modify logic for injection conditions. | ||||
| * \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| |\ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into i1237-xmlfix2 | Dan Finlay | 2017-03-23 | 2 | -4/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i1237-xmlfix2 | Dan Finlay | 2017-03-23 | 3 | -3/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 3 | -6/+12 |
| |\ \ \ \ \ | |||||
| * | | | | | | Modify logic for injection conditions. | Kevin Serrano | 2017-03-23 | 1 | -9/+5 |
| | | | | | | | |||||
| | | | | | * | Merge branch 'master' into i238-kovan | Kevin Serrano | 2017-03-23 | 3 | -4/+3 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #1247 from MetaMask/hide-password | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Hide the password in the private key retrieval screen. | ||||
| * | | | | | | Merge branch 'master' into hide-password | Kevin Serrano | 2017-03-23 | 2 | -4/+2 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1245 from MetaMask/i1193-errorstylefix | Dan Finlay | 2017-03-23 | 2 | -4/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Fix styling of error message in import accounts | ||||
| * | | | | | | Merge branch 'master' into i1193-errorstylefix | Dan Finlay | 2017-03-23 | 4 | -4/+11 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix styling of error message. | Kevin Serrano | 2017-03-23 | 2 | -4/+2 |
| | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge branch 'master' into hide-password | Kevin Serrano | 2017-03-23 | 4 | -4/+11 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | Hide the password in the private key retrieval screen. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| |/ / / / | |||||
| | | | * | Merge branch 'master' into i238-kovan | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
| | | | |\ | |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1244 from MetaMask/i1227-uidumpblockhash | Dan Finlay | 2017-03-23 | 1 | -1/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add current block number and hash to the state. | ||||
| * | | | | Merge branch 'master' into i1227-uidumpblockhash | Dan Finlay | 2017-03-23 | 3 | -3/+6 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add current block number and hash to the state. | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
| |/ / / | |||||
| | | * | Merge branch 'master' into i238-kovan | Dan Finlay | 2017-03-23 | 3 | -3/+6 |
| | | |\ | |_|_|/ |/| | | | |||||
* | | | | Merge pull request #1225 from MetaMask/i1033-spinnerfix | Dan Finlay | 2017-03-23 | 3 | -3/+6 |
|\ \ \ \ | |/ / / |/| | | | Fix spinner issue on seed word request | ||||
| * | | | Merge branch 'master' into i1033-spinnerfix | kumavis | 2017-03-23 | 8 | -51/+226 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Add one more loading indication. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | Uncomment lines relating to showing indicator. | Kevin Serrano | 2017-03-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Remove redundant removal of loading indicator. Integrate loading indicator ↵ | Kevin Serrano | 2017-03-22 | 2 | -5/+3 |
| | | | | | | | | | | | | | | | | disappear with display warning. | ||||
| * | | | Changelog addition. | Kevin Serrano | 2017-03-21 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add action to hide loading indication on an incorrect pw. | Kevin Serrano | 2017-03-21 | 1 | -2/+5 |
| | | | | |||||
| | | * | Changelog bump. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| | | | | |||||
| | | * | Add Kovan test network to our application. | Kevin Serrano | 2017-03-23 | 1 | -0/+9 |
| | | | | |||||
| | | * | Add kovan to drop-menu-item | Kevin Serrano | 2017-03-23 | 1 | -1/+4 |
| | | | | |||||
| | | * | Add conditional kovan to current network component. | Kevin Serrano | 2017-03-23 | 1 | -0/+12 |
| | | | | |||||
| | | * | Add kovan conditional to config screen. | Kevin Serrano | 2017-03-23 | 1 | -0/+5 |
| | | | | |||||
| | | * | Add conditional kovan logic to etherscan link generators. | Kevin Serrano | 2017-03-23 | 2 | -2/+7 |
| | | | | |||||
| | | * | Modify css rule for unused hollow diamond. | Kevin Serrano | 2017-03-23 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add kovan config settings to config manager. | Kevin Serrano | 2017-03-23 | 1 | -0/+4 |
| | | | | |||||
| | | * | Add kovan to config file. | Kevin Serrano | 2017-03-23 | 1 | -0/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1239 from MetaMask/betterErrors | kumavis | 2017-03-23 | 2 | -5/+11 |
|\ \ \ | | | | | | | | | Better errors | ||||
| * | | | Add to CHANGELOG | frankiebee | 2017-03-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | Have better error messages | frankiebee | 2017-03-23 | 1 | -5/+10 |
|/ / / | |||||
* | / | Require redux-logger of 2.10.2 and up (#1235) | Kevin Serrano | 2017-03-23 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | * Require redux-logger of 2.8.1 and up * Bump to 2.10.2 and above, 2.10.1 had critical bug. | ||||
* | | Merge pull request #1226 from MetaMask/i1195-privatekeyexportstyle | Dan Finlay | 2017-03-22 | 6 | -46/+215 |
|\ \ | |/ |/| | Polish Private Key Export UI | ||||
| * | Add to changelog. | Kevin Serrano | 2017-03-21 | 1 | -0/+1 |
| | | |||||
| * | Adjust private key confirmation style and logic. | Kevin Serrano | 2017-03-21 | 3 | -46/+75 |
| | | |||||
| * | Add new development states for UI development. | Kevin Serrano | 2017-03-21 | 2 | -0/+139 |
|/ | |||||
* | Merge pull request #1214 from MetaMask/i1181-RemoveLightwallet | Kevin Serrano | 2017-03-21 | 10 | -903/+2 |
|\ | | | | | Remove eth-lightwallet | ||||
| * | Merge branch 'master' into i1181-RemoveLightwallet | Kevin Serrano | 2017-03-21 | 2 | -11/+23 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1215 from MetaMask/ImprovePersonalSignStyle | Dan Finlay | 2017-03-21 | 2 | -11/+23 |
|\ \ | | | | | | | Improve personal_sign style | ||||
| * | | Improve personal_sign style | Dan Finlay | 2017-03-17 | 2 | -11/+23 |
|/ / | | | | | | | textarea was not resizing the way I'd expected, so made it permanently larger, to accomodate larger messages. | ||||
| * | Remove eth-lightwallet | Dan Finlay | 2017-03-17 | 10 | -903/+2 |
|/ | |||||
* | Merge pull request #1198 from MetaMask/i1165-predictive | Dan Finlay | 2017-03-17 | 10 | -6/+211 |
|\ | | | | | Add predictive address functionality to recipient field in send | ||||
| * | Merge branch 'master' into i1165-predictive | Kevin Serrano | 2017-03-15 | 31 | -43/+40 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1212 from MetaMask/i1211-currencyretention | kumavis | 2017-03-15 | 31 | -43/+40 |
|\ \ | | | | | | | Fix currency settings retention | ||||
| * \ | Merge branch 'master' into i1211-currencyretention | Kevin Serrano | 2017-03-15 | 2 | -1/+6 |
| |\ \ | |/ / |/| | | |||||
| * | | Rename variables to proper currency state variables. | Kevin Serrano | 2017-03-15 | 5 | -17/+14 |
| | | | |||||
| * | | Fix description of some migrations. | Kevin Serrano | 2017-03-15 | 2 | -2/+2 |
| | | | |||||
| * | | Fix development to use new currency state. | Kevin Serrano | 2017-03-15 | 24 | -24/+24 |
| | | | |||||
| | * | Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-03-15 | 2 | -1/+6 |
| | |\ | | | | | | | | | | | | | i1165-predictive | ||||
| | | * | Merge branch 'master' into i1165-predictive | kumavis | 2017-03-15 | 2 | -1/+6 |
| | | |\ | |_|_|/ |/| | | | |||||
* | | | | Merge pull request #1207 from MetaMask/i1206-customrpc | Kevin Serrano | 2017-03-14 | 2 | -1/+6 |
|\ \ \ \ | |/ / / |/| | | | Allow changing custom RPCs from lock screen | ||||
| * | | | Changelog addition. | Kevin Serrano | 2017-03-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | Render config screen from unlock. | Kevin Serrano | 2017-03-14 | 1 | -0/+4 |
| | | | | |||||
| * | | | Display Custom RPC on lock screen. | Kevin Serrano | 2017-03-14 | 1 | -1/+1 |
|/ / / | |||||
| * / | Minor change in removing opts object. | Kevin Serrano | 2017-03-15 | 1 | -4/+1 |
| |/ | |||||
| * | Add to changelog. | Kevin Serrano | 2017-03-15 | 1 | -0/+1 |
| | | |||||
| * | Limit the number of addresses stored in our book. | Kevin Serrano | 2017-03-14 | 1 | -0/+4 |
| | | |||||
| * | Add test to account for prevention of identities duplication. | Kevin Serrano | 2017-03-11 | 1 | -1/+22 |
| | | |||||
| * | Connect keyring controller to address book to prevent additional duplicates. | Kevin Serrano | 2017-03-11 | 2 | -9/+23 |
| | | |||||
| * | Add another test for duplicates. | Kevin Serrano | 2017-03-11 | 1 | -0/+7 |
| | | |||||
| * | Improve duplicate checking in address book. | Kevin Serrano | 2017-03-11 | 1 | -2/+2 |
| | | |||||
| * | Add basic tests. | Kevin Serrano | 2017-03-11 | 2 | -1/+29 |
| | | |||||
| * | Add comments. | Kevin Serrano | 2017-03-11 | 3 | -4/+25 |
| | | |||||
| * | Allow for adding recently used addresses to address book. | Kevin Serrano | 2017-03-10 | 4 | -4/+40 |
| | | |||||
| * | Rename functions for consistency. | Kevin Serrano | 2017-03-10 | 1 | -6/+6 |
| | | |||||
| * | Create persistence address book. | Kevin Serrano | 2017-03-10 | 3 | -0/+58 |
| | | |||||
| * | Create distinct labels and names for addresses. | Kevin Serrano | 2017-03-10 | 2 | -2/+8 |
| | | |||||
| * | Display owned addresses in datalist. | Kevin Serrano | 2017-03-10 | 2 | -0/+12 |
|/ | |||||
* | Merge pull request #1197 from MetaMask/i1130-ResolveENS | Kevin Serrano | 2017-03-09 | 6 | -33/+223 |
|\ | | | | | Allow ENS Names in Send Form | ||||
| * | Bump changelog | Dan Finlay | 2017-03-09 | 1 | -0/+2 |
| | | |||||
| * | Add ENS click to copy | Dan Finlay | 2017-03-09 | 2 | -10/+9 |
| | | | | | | | | Also bump ethjs-ens version to get proper error for unregistered names. | ||||
| * | Get basic ENS working | Dan Finlay | 2017-03-09 | 32 | -168/+519 |
| |\ | |/ |/| | | | & merge master into ENS branch. | ||||
* | | Merge pull request #1196 from MetaMask/Version-3.4.0 | Dan Finlay | 2017-03-09 | 2 | -1/+3 |
|\ \ | | | | | | | Version 3.4.0 | ||||
| * | | Version 3.4.0v3.4.0 | Dan Finlay | 2017-03-09 | 2 | -1/+3 |
|/ / | |||||
* | | Merge pull request #1191 from MetaMask/i1065-removealert | Dan Finlay | 2017-03-09 | 2 | -2/+10 |
|\ \ | | | | | | | Convert alert to a log.error | ||||
| * | | Modify message. | Kevin Serrano | 2017-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | Add more informative message | Kevin Serrano | 2017-03-09 | 2 | -1/+9 |
| | | | |||||
| * | | Merge branch 'master' into i1065-removealert | Kevin Serrano | 2017-03-09 | 2 | -26/+60 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1189 from MetaMask/kumavis-patch-1 | Dan Finlay | 2017-03-09 | 2 | -26/+60 |
|\ \ \ | | | | | | | | | tx-utils - clean and comment | ||||
| * \ \ | Merge branch 'master' into kumavis-patch-1 | Dan Finlay | 2017-03-09 | 14 | -51/+153 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | tx-utils - add encoding utils | kumavis | 2017-03-08 | 2 | -9/+15 |
| | | | | |||||
| * | | | tx-utils - stricter naming type-based convention | kumavis | 2017-03-08 | 2 | -23/+29 |
| | | | | |||||
| * | | | test - tx-utils | kumavis | 2017-03-08 | 1 | -3/+29 |
| | | | | | | | | | | | | add tests for `addGasBuffer` | ||||
| * | | | tx-utils - clean and comment | kumavis | 2017-03-08 | 1 | -15/+11 |
| | | | | |||||
| | * | | Convert alert to a log.error | Kevin Serrano | 2017-03-09 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1147 from MetaMask/i1144-moarrpc | Kevin Serrano | 2017-03-09 | 14 | -51/+153 |
|\ \ \ | |/ / |/| | | Save recently used RPCs | ||||
| * | | Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-03-09 | 5 | -7/+58 |
| |\ \ | | | | | | | | | | | | | i1144-moarrpc | ||||
| | * \ | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-09 | 5 | -7/+58 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #1187 from MetaMask/i1118-IncreaseGasBuffer | Dan Finlay | 2017-03-08 | 3 | -5/+35 |
|\ \ \ \ | | | | | | | | | | | I1118 increase gas buffer | ||||
| * \ \ \ | Merge branch 'master' into i1118-IncreaseGasBuffer | Dan Finlay | 2017-03-08 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1186 from MetaMask/grammarFix | Dan Finlay | 2017-03-08 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix grammar in erro message | ||||
| * | | | | | Fix grammar in erro message | frankiebee | 2017-03-08 | 1 | -1/+1 |
|/ / / / / | |||||
| * | | | | Bump changelog | Dan Finlay | 2017-03-08 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i1118-IncreaseGasBuffer | jaredpereira | 2017-03-08 | 3 | -3/+24 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1185 from MetaMask/i#1032 | kumavis | 2017-03-08 | 1 | -1/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix issue where account import allows for duplicates | ||||
| * \ \ \ \ | Merge branch 'master' into i#1032 | Frankie | 2017-03-08 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1183 from MetaMask/provider-ten-oh-one | kumavis | 2017-03-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | deps - bump web3-provider-engine to 10.0.1 | ||||
| * | | | | | | deps - bump web3-provider-engine to 10.0.1 | kumavis | 2017-03-08 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Fixes https://github.com/MetaMask/metamask-plugin/issues/1163 Fixes https://github.com/MetaMask/provider-engine/issues/121 | ||||
| * | | | | | Merge branch 'master' into i#1032 | frankiebee | 2017-03-08 | 11 | -57/+161 |
| |\ \ \ \ \ | |||||
| * | | | | | | fix issue where account import allows for duplicates | frankiebee | 2017-03-08 | 1 | -1/+22 |
| | | | | | | | |||||
| | | * | | | | change BN.mul to BN.muln | Jared Pereira | 2017-03-08 | 2 | -10/+8 |
| | | | | | | | |||||
| | | * | | | | add gas buffer multiply test | Jared Pereira | 2017-03-08 | 1 | -16/+6 |
| | | | | | | | |||||
| | | * | | | | remove constant buffer and add multiplier | Jared Pereira | 2017-03-08 | 1 | -5/+8 |
| | | | | | | | |||||
| | | * | | | | Add gas buffer test | Dan Finlay | 2017-03-08 | 1 | -0/+38 |
| | | | | | | | |||||
| | | | * | | | Fix typo, switch to log.error | Kevin Serrano | 2017-03-09 | 1 | -3/+3 |
| | | | |/ / | |||||
| | | | * | | Remove unneeded setrpc method. | Kevin Serrano | 2017-03-09 | 1 | -20/+8 |
| | | | | | | |||||
| | | | * | | Nodeify and promisify calls to background. | Kevin Serrano | 2017-03-09 | 2 | -11/+29 |
| | | | | | | |||||
| | | | * | | Fix tests until new ones to-be-written. | Kevin Serrano | 2017-03-08 | 1 | -17/+0 |
| | | | | | | |||||
| | | | * | | Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-03-08 | 0 | -0/+0 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | i1144-moarrpc | ||||
| | | | | * \ | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 1 | -1/+1 |
| | | | | |\ \ | |||||
| | | | * | \ \ | Merge github.com:MetaMask/metamask-plugin into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 2 | -2/+2 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1182 from MetaMask/provider-ten | kumavis | 2017-03-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | deps - bump web3-provider-engine | ||||
| * | | | | | | | deps - bump web3-provider-engine | kumavis | 2017-03-08 | 1 | -1/+1 |
|/ / / / / / / | | | | | | | | | | | | | | | resolves https://github.com/MetaMask/metamask-plugin/issues/1159 | ||||
* | | | | | | | Merge pull request #1180 from MetaMask/kumavis-patch-1 | kumavis | 2017-03-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | deps - bump web3-provider-engine | ||||
| * | | | | | | Merge branch 'master' into kumavis-patch-1 | Dan Finlay | 2017-03-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1179 from MetaMask/FixHexEncoding | kumavis | 2017-03-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Fix hex encoding of message to create valid hex strings | ||||
| * | | | | | | Fixed encoding | Dan Finlay | 2017-03-08 | 2 | -15/+2 |
| | | | | | | | |||||
| * | | | | | | Remove unrelated test file | Dan Finlay | 2017-03-08 | 1 | -38/+0 |
| | | | | | | | |||||
| * | | | | | | Fix test name | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fixed internal encoding test case | Dan Finlay | 2017-03-07 | 2 | -1/+39 |
| | | | | | | | |||||
| * | | | | | | Linted | Dan Finlay | 2017-03-07 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Fix hex encoding of message to create valid hex strings | Dan Finlay | 2017-03-07 | 1 | -1/+14 |
|/ / / / / / | |||||
| * / / / / | deps - bump web3-provider-engine | kumavis | 2017-03-08 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | include fix for https://github.com/MetaMask/provider-engine/pull/122 | ||||
| | * / / | Refactor of code into separate reducers and actions. | Kevin Serrano | 2017-03-08 | 5 | -36/+26 |
| | |/ / | |||||
| | * | | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 11 | -56/+160 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #1177 from MetaMask/i1173-ShowPersonalMessage | kumavis | 2017-03-07 | 5 | -21/+106 |
|\ \ \ \ | | | | | | | | | | | Render personal_sign messages as utf-8 text | ||||
| * \ \ \ | Merge branch 'master' into i1173-ShowPersonalMessage | Dan Finlay | 2017-03-07 | 2 | -5/+5 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1178 from MetaMask/i#1168 | kumavis | 2017-03-07 | 2 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix issue txMetaObject had no hash | ||||
| * \ \ \ \ | Merge branch 'master' into i#1168 | Frankie | 2017-03-07 | 4 | -30/+49 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix issue where old txMeta object was being used to pass the txHash to the cb | Frankie | 2017-03-07 | 2 | -5/+5 |
| | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'i1173-ShowPersonalMessage' of ↵ | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-plugin into i1173-ShowPersonalMessage | ||||
| | | * \ \ | Merge branch 'master' into i1173-ShowPersonalMessage | kumavis | 2017-03-07 | 1 | -1/+1 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #1176 from MetaMask/i1162-FixLoosePersonalSign | kumavis | 2017-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix personal sign for loose accounts | ||||
| * | | | | | | Fix personal sign for loose accounts | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Fix was written, but not published to npm. Now fixing semver at the correct version. | ||||
| | * / / / | Fix normalizeMsgData function to always return hex prefixed | Dan Finlay | 2017-03-07 | 2 | -3/+3 |
| | |/ / / | |||||
| | * | | | Remove log | Dan Finlay | 2017-03-07 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Fix function names | Dan Finlay | 2017-03-07 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | Render personal_sign messages as utf-8 text | Dan Finlay | 2017-03-07 | 5 | -21/+107 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173 | ||||
* | | | | Merge pull request #1161 from MetaMask/Debugging | Dan Finlay | 2017-03-07 | 3 | -29/+48 |
|\ \ \ \ | |/ / / |/| | | | Tune up master | ||||
| * | | | Prevent submission of invalid gas parameters. | Kevin Serrano | 2017-03-02 | 2 | -3/+26 |
| | | | | |||||
| * | | | Various improvements to gas input. | Kevin Serrano | 2017-03-02 | 3 | -27/+22 |
| | | | | |||||
| * | | | Only allow numbers in gas inputs | Dan Finlay | 2017-03-02 | 1 | -0/+1 |
|/ / / | |||||
| * | | Modify tests.' | Kevin Serrano | 2017-03-08 | 1 | -15/+19 |
| | | | |||||
| * | | Break out rpc update and rpclist into two reducers. | Kevin Serrano | 2017-03-08 | 3 | -11/+31 |
| | | | |||||
| * | | More conflict resolution. | Kevin Serrano | 2017-03-02 | 8 | -7/+16 |
| |\ \ | |||||
| | * | | Fix test reference | Dan Finlay | 2017-02-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 4 | -3/+3 |
| | | | | |||||
| | * | | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 30 | -658/+717 |
| | |\ \ | |||||
| | * | | | Concatenate custom RPC labels that are too long | Dan Finlay | 2017-02-28 | 1 | -1/+9 |
| | | | | | |||||
| * | | | | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 37 | -797/+1214 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix spelling error. | Kevin Serrano | 2017-02-25 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 6 | -14/+54 |
| | | | | |||||
| * | | | Make the UI play nice with empty RPC lists. | Kevin Serrano | 2017-02-23 | 2 | -1/+2 |
| | | | | |||||
| * | | | Linto | Kevin Serrano | 2017-02-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changelog. | Kevin Serrano | 2017-02-23 | 1 | -0/+2 |
| | | | | |||||
| * | | | Implemented functionality for displaying recent custom RPCs | Kevin Serrano | 2017-02-23 | 3 | -16/+41 |
| | | | | |||||
| * | | | Connect to actions. | Kevin Serrano | 2017-02-22 | 2 | -0/+2 |
| | | | | |||||
| * | | | Fix naming | Kevin Serrano | 2017-02-22 | 2 | -3/+3 |
| | | | | |||||
| * | | | Basic infrasture for RPC list added. | Kevin Serrano | 2017-02-22 | 2 | -3/+24 |
| | | | | |||||
| | | * | Add ens recognition to send form input | Dan Finlay | 2017-03-01 | 3 | -5/+144 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempts to lookup `.eth` addresses on ENS. Is currently failing. I've written an isolation example of the problem here: https://github.com/flyswatter/ens-test | ||||
| | | * | Fix loading indication for conf-tx view | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1154 from MetaMask/i765-gaslimits | Kevin Serrano | 2017-03-01 | 16 | -145/+505 |
|\ \ \ | |_|/ |/| | | Add ability to customize gas and gasPrice on tx confirmation screen | ||||
| * | | Add reset button to reset gas fields. | Kevin Serrano | 2017-03-01 | 2 | -4/+20 |
| | | | |||||
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2017-03-01 | 1 | -2/+12 |
| |\ \ | | | | | | | | | | | | | i765-gaslimits | ||||
| | * \ | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-03-01 | 3 | -3/+4 |
| | |\ \ | | | | | | | | | | | | | | | | i765-gaslimits | ||||
| | * | | | Gas and Gaslimit revert to default if set to 0 | Kevin Serrano | 2017-03-01 | 1 | -2/+12 |
| | | | | | |||||
| * | | | | Bump changelog | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add a couple more debug logs | Dan Finlay | 2017-03-01 | 2 | -0/+2 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2017-03-01 | 1 | -18/+4 |
| |\| | | | | | | | | | | | | | | i765-gaslimits | ||||
| | * | | lints | Kevin Serrano | 2017-03-01 | 1 | -3/+0 |
| | | | | |||||
| | * | | Remove advanced options for now. | Kevin Serrano | 2017-03-01 | 1 | -15/+4 |
| | | | | |||||
| * | | | Use correct action to update and submit tx | Dan Finlay | 2017-03-01 | 3 | -3/+4 |
| |/ / | |||||
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2017-03-01 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | i765-gaslimits | ||||
| | * | | lint | Kevin Serrano | 2017-03-01 | 1 | -2/+4 |
| | | | | |||||
| * | | | Linted | Dan Finlay | 2017-03-01 | 3 | -5/+2 |
| | | | | |||||
| * | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2017-03-01 | 2 | -4/+17 |
| |\| | | | | | | | | | | | | | | i765-gaslimits | ||||
| | * | | Hide gas options behind an advanced options checkbox. | Kevin Serrano | 2017-03-01 | 1 | -4/+16 |
| | | | | |||||
| | * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-03-01 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | i765-gaslimits | ||||
| | * \ \ | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-03-01 | 3 | -2/+4 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | i765-gaslimits | ||||
| | * \ \ \ | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-03-01 | 2 | -30/+39 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | i765-gaslimits | ||||
| | * | | | | | Add margins to align. | Kevin Serrano | 2017-03-01 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 9 | -128/+11 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter. | ||||
| * | | | | | Fix bug that showed conf-tx screen on boot at wrong times | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
| * | | | | Fixed bug that made send screen sometimes transition to account detail | Dan Finlay | 2017-03-01 | 3 | -2/+4 |
| | |/ / | |/| | | |||||
| * | | | Fix infinite loop bug | Dan Finlay | 2017-03-01 | 2 | -30/+39 |
| |/ / | |||||
| * | | Fix reference | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Reorder rows for better table logic | Dan Finlay | 2017-02-28 | 1 | -32/+37 |
| | | | |||||
| * | | Emit updated tx values on accept click | Dan Finlay | 2017-02-28 | 2 | -1/+20 |
| | | | |||||
| * | | Remove unused function | Dan Finlay | 2017-02-28 | 1 | -5/+0 |
| | | | |||||
| * | | Add action for updating and approving a tx in one action | Dan Finlay | 2017-02-28 | 1 | -0/+15 |
| | | | |||||
| * | | Add background method for updating and approving a tx in one call | Dan Finlay | 2017-02-28 | 1 | -2/+9 |
| | | | |||||
| * | | Got gas live re-estimating | Dan Finlay | 2017-02-28 | 2 | -20/+23 |
| | | | |||||
| * | | Align input fields for gas. | Kevin Serrano | 2017-02-28 | 1 | -0/+1 |
| | | | |||||
| * | | Fix merge conflicts. | Kevin Serrano | 2017-02-28 | 2 | -8/+68 |
| |\ \ | |||||
| | * | | Linted | Dan Finlay | 2017-02-28 | 2 | -12/+6 |
| | | | | |||||
| | * | | Add non-working gas recalculating logic to tx-details view | Dan Finlay | 2017-02-28 | 1 | -6/+69 |
| | | | | |||||
| * | | | Further styling to get hex component working. Fix some typos. | Kevin Serrano | 2017-02-28 | 3 | -16/+44 |
| |/ / | |||||
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-02-28 | 30 | -644/+702 |
| |\ \ | | | | | | | | | | | | | i765-gaslimits | ||||
| | * \ | Merge branch 'master' into i765-gaslimits | Dan Finlay | 2017-02-28 | 30 | -644/+702 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #1149 from MetaMask/i1114-AddPersonalSign | Dan Finlay | 2017-02-28 | 30 | -658/+716 |
|\ \ \ \ | |_|_|/ |/| | | | Add personal_sign | ||||
| * | | | Remove claim for ecRecover support | Dan Finlay | 2017-02-28 | 1 | -1/+0 |
| | | | | |||||
| * | | | Reduce provider-engine requirement | Dan Finlay | 2017-02-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Removed redundant personal_recover logic | Dan Finlay | 2017-02-25 | 2 | -18/+0 |
| | | | | |||||
| * | | | Add personal_sign development ui state | Dan Finlay | 2017-02-25 | 1 | -0/+99 |
| | | | | |||||
| * | | | Mostly fix personal_recover | Dan Finlay | 2017-02-25 | 2 | -6/+6 |
| | | | | |||||
| * | | | Bump changelog | Dan Finlay | 2017-02-25 | 1 | -1/+2 |
| | | | | |||||
| * | | | Bump provider engine to require compliant personal_recover | Dan Finlay | 2017-02-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed reference | Dan Finlay | 2017-02-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix references in tests | Dan Finlay | 2017-02-24 | 1 | -5/+5 |
| | | | | |||||
| * | | | Improve pending tx blue dot style | Dan Finlay | 2017-02-24 | 2 | -9/+4 |
| | | | | |||||
| * | | | Remove irrelevant tests | Dan Finlay | 2017-02-24 | 1 | -8/+4 |
| | | | | |||||
| * | | | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 5 | -19/+45 |
| | | | | |||||
| * | | | Make personal sign view look nice | Dan Finlay | 2017-02-24 | 1 | -5/+16 |
| | | | | |||||
| * | | | Got personal_sign working | Dan Finlay | 2017-02-24 | 11 | -69/+175 |
| | | | | | | | | | | | | | | | | Also fixed bug where signing would not close popup. | ||||
| * | | | Add alternate UI for pending personal_sign messages | Dan Finlay | 2017-02-24 | 4 | -15/+15 |
| | | | | |||||
| * | | | Add personal sign actions and template | Dan Finlay | 2017-02-23 | 5 | -26/+111 |
| | | | | |||||
| * | | | Allow provider to init before keyringController | Dan Finlay | 2017-02-22 | 1 | -2/+6 |
| | | | | |||||
| * | | | Fix reference | Dan Finlay | 2017-02-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Point metamask-controller personalSignRecover method to keyring-controller | Dan Finlay | 2017-02-22 | 1 | -9/+5 |
| | | | | |||||
| * | | | Move sigUtil and keyrings to external modules | Dan Finlay | 2017-02-22 | 14 | -537/+294 |
| | | | | | | | | | | | | | | | | These external modules now have their own test coverage and build enforcement. This allowed me to somewhat more easily add good tests around our personalSign strategy (held now in [eth-sig-util](https://github.com/flyswatter/eth-sig-util), and allow each of the keyrings to import that, etc. | ||||
| * | | | Move changelog entry | Dan Finlay | 2017-02-22 | 1 | -1/+2 |
|/ / / | |||||
| * | | Move input boxes into table and into details component. | Kevin Serrano | 2017-02-28 | 3 | -17/+39 |
| | | | |||||
| * | | Fix state to render gasPrice for ui dev. | Kevin Serrano | 2017-02-28 | 1 | -2/+3 |
| |/ | |||||
| * | Make gasPrice accessible to the UI. | Kevin Serrano | 2017-02-25 | 2 | -2/+2 |
| | | |||||
| * | Merge github.com:MetaMask/metamask-plugin into i765-gaslimits | Kevin Serrano | 2017-02-24 | 19 | -20/+215 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1143 from MetaMask/FixTxApprovalUiMode | Frankie | 2017-02-21 | 10 | -5/+125 |
|\ \ | | | | | | | Fix UI Dev Mode for Tx Approval | ||||
| * | | Add log global to test suite | Dan Finlay | 2017-02-21 | 1 | -0/+6 |
| | | | |||||
| * | | Fix UI Dev Mode for Tx Approval | Dan Finlay | 2017-02-21 | 9 | -5/+119 |
|/ / | | | | | | | | | | | | | | | | | | | The state object had been changed, but our mock states for tx approval were using the old keys. Rather than try to muck about and figure out each and every change, I've re-generated a UI dev state for tx approval, which should help @zanibas on his current project. We can continue adding new dev states as needed from here. If anyone catches a state that doesn't render correctly, it's worth checking if a new snapshot doesn't solve things. Debugged by adding new debugging loggers, and I've left them in place for easier future debugging. | ||||
* | | Merge pull request #1140 from MetaMask/i1128-noticesdev | Kevin Serrano | 2017-02-21 | 4 | -14/+52 |
|\ \ | | | | | | | Add notice functionality | ||||
| * \ | Merge branch 'master' into i1128-noticesdev | Dan Finlay | 2017-02-21 | 6 | -0/+34 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1138 from MetaMask/AddBetterLogger | Kevin Serrano | 2017-02-21 | 6 | -0/+34 |
|\ \ \ | | | | | | | | | Add better logger | ||||
| * \ \ | Merge branch 'master' into AddBetterLogger | Kevin Serrano | 2017-02-21 | 2 | -1/+3 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'master' into AddBetterLogger | Dan Finlay | 2017-02-21 | 2 | -2/+3 |
| |\ \ \ | |||||
| * | | | | Set default log levels | Dan Finlay | 2017-02-21 | 3 | -0/+3 |
| | | | | | |||||
| * | | | | Add debug logging to ui routing logic. | Dan Finlay | 2017-02-21 | 6 | -0/+31 |
| | | | | | |||||
| | | * | | Merge branch 'master' into i1128-noticesdev | Kevin Serrano | 2017-02-21 | 3 | -3/+6 |
| | | |\ \ | |_|_|/ / |/| | | | | | | | | | borts | ||||
* | | | | | Merge pull request #1139 from MetaMask/Version-3.3.0 | Dan Finlay | 2017-02-21 | 2 | -1/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Version 3.3.0 | ||||
| * | | | | Version 3.3.0v3.3.0 | Dan Finlay | 2017-02-21 | 2 | -1/+3 |
|/ / / / |