Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Assure that seed words are placed into state tree upon request. | Kevin Serrano | 2017-03-28 | 4 | -33/+6 |
* | Merge pull request #1271 from MetaMask/i1223-InjectIFrames | Dan Finlay | 2017-03-28 | 3 | -2/+4 |
|\ | |||||
| * | Bump changelog | Dan Finlay | 2017-03-28 | 1 | -0/+2 |
| * | Merge branch 'master' into master | Dan Finlay | 2017-03-28 | 7 | -11/+25 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1269 from MetaMask/notice-fix | Dan Finlay | 2017-03-28 | 3 | -1/+8 |
|\ \ | |||||
| * | | Version 3.5.1v3.5.1 | Dan Finlay | 2017-03-28 | 2 | -1/+3 |
| * | | Add to changelog. | Kevin Serrano | 2017-03-28 | 1 | -0/+2 |
| * | | Fix edge case where notice does not require scrollbar. | Kevin Serrano | 2017-03-28 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #1266 from MetaMask/Version-3.5.0 | Frankie | 2017-03-28 | 2 | -1/+3 |
|\ \ | |||||
| * | | Version 3.5.0v3.5.0 | Dan Finlay | 2017-03-28 | 2 | -1/+3 |
|/ / | |||||
* | | Merge pull request #1265 from MetaMask/ropsten-fix | Dan Finlay | 2017-03-28 | 4 | -10/+15 |
|\ \ | |||||
| * | | explorer - fix ropsten explorer link tests | kumavis | 2017-03-28 | 2 | -8/+13 |
| * | | Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into rops... | kumavis | 2017-03-28 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | block explorer - ropsten | kumavis | 2017-03-28 | 1 | -1/+1 |
| |/ / |/| | | |||||
| * | | tests - fix ropsten link check | kumavis | 2017-03-28 | 1 | -2/+2 |
| * | | block explorer - account link - ropsten | kumavis | 2017-03-28 | 1 | -1/+1 |
|/ / | |||||
| * | Allow injection in IFrames + dynamic IFrames | Stefaan Ponnet | 2017-03-26 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #1253 from MetaMask/i1210-txdisappearance | Dan Finlay | 2017-03-25 | 3 | -10/+34 |
|\ | |||||
| * | Merge branch 'i1210-txdisappearance' of github.com:MetaMask/metamask-plugin i... | Kevin Serrano | 2017-03-25 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge branch 'master' into i1210-txdisappearance | Kevin Serrano | 2017-03-25 | 18 | -458/+627 |
| | |\ | |_|/ |/| | | |||||
| * | | correct bug in test. | Kevin Serrano | 2017-03-25 | 1 | -1/+1 |
| * | | Add tests. | Kevin Serrano | 2017-03-25 | 1 | -0/+11 |
| * | | Merge branch 'master' into i1210-txdisappearance | Kevin Serrano | 2017-03-25 | 18 | -458/+627 |
| |\ \ | |/ / |/| / | |/ | |||||
* | | Merge pull request #1249 from MetaMask/kovan-notice | Kevin Serrano | 2017-03-25 | 4 | -3/+7 |
|\ \ | |||||
| * \ | Merge branch 'master' into kovan-notice | Dan Finlay | 2017-03-25 | 4 | -0/+51 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1250 from MetaMask/notice-modification | Dan Finlay | 2017-03-25 | 4 | -0/+51 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into notice-modification | Dan Finlay | 2017-03-25 | 10 | -455/+569 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Create migration to erase body in read notices. | Kevin Serrano | 2017-03-23 | 1 | -0/+36 |
| * | | | 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 branch 'master' into kovan-notice | Dan Finlay | 2017-03-25 | 10 | -455/+569 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #1248 from MetaMask/i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-25 | 8 | -451/+565 |
|\ \ \ \ | |||||
| * | | | | Add personalMessages to function to calculate pending tx index. | Kevin Serrano | 2017-03-25 | 1 | -1/+2 |
| * | | | | Fix tx selecting bug | Dan Finlay | 2017-03-25 | 2 | -2/+3 |
| * | | | | Remove goHome action causing erratic UI behavior. | Kevin Serrano | 2017-03-25 | 1 | -1/+0 |
| * | | | | Remove unnecessary log | Dan Finlay | 2017-03-25 | 1 | -2/+0 |
| * | | | | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas... | Dan Finlay | 2017-03-25 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Kevin Serrano | 2017-03-24 | 1 | -3/+3 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1257 from MetaMask/i1256-RemoveGasLimitParam | Kevin Serrano | 2017-03-24 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove gas limit param | Dan Finlay | 2017-03-24 | 1 | -3/+3 |
|/ / / / / / | |||||
| * / / / / | Disable accept button when gas limit is too low | Dan Finlay | 2017-03-25 | 1 | -8/+5 |
| |/ / / / | |||||
| * | | | | Make gas calculations on render more consistent | Dan Finlay | 2017-03-24 | 1 | -10/+16 |
| * | | | | Fix initial tx fee estimation | Dan Finlay | 2017-03-24 | 2 | -4/+5 |
| * | | | | Fix a couple things | Dan Finlay | 2017-03-24 | 2 | -15/+42 |
| * | | | | Make reset button clear errors | Dan Finlay | 2017-03-24 | 1 | -0/+1 |
| * | | | | Fix initial gas price estimate | Dan Finlay | 2017-03-24 | 1 | -4/+5 |
| * | | | | Prevent default for reset and reject buttons | Dan Finlay | 2017-03-24 | 2 | -1/+3 |
| * | | | | Override browser default validation message | Dan Finlay | 2017-03-24 | 1 | -0/+1 |
| * | | | | Fix some broken refs | Dan Finlay | 2017-03-24 | 1 | -2/+2 |
| * | | | | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas... | Dan Finlay | 2017-03-24 | 18 | -22/+65 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Kevin Serrano | 2017-03-24 | 1 | -1/+1 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1251 from MetaMask/kovan-tx-etherscan | Dan Finlay | 2017-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Enable etherscan linking on Kovan transaction list items. | Kevin Serrano | 2017-03-23 | 1 | -1/+1 |
|/ / / / / | |||||
| | * | | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-23 | 14 | -17/+53 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
| | * | | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Kevin Serrano | 2017-03-23 | 4 | -4/+11 |
| | |\ \ \ | |||||
| * | | | | | Combine pending-tx-details component into pending-tx-details | Dan Finlay | 2017-03-24 | 2 | -370/+346 |
| |/ / / / | |||||
| * | | | | Bump changelog | Dan Finlay | 2017-03-23 | 1 | -0/+3 |
| * | | | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-23 | 8 | -52/+227 |
| |\ \ \ \ | |||||
| * | | | | | Got basic validations working | Dan Finlay | 2017-03-23 | 5 | -108/+199 |
| * | | | | | Some progress | Dan Finlay | 2017-03-23 | 2 | -7/+16 |
| | | | * | | Reset disabled state for confirm button after every notice. | Kevin Serrano | 2017-03-23 | 1 | -1/+4 |
| | | | * | | Create announcement for Kovan. | Kevin Serrano | 2017-03-23 | 3 | -2/+3 |
| |_|_|/ / |/| | | | | |||||
| | | | * | Add to changelog. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| | | | * | Fix persistence of transactions between networks. | Kevin Serrano | 2017-03-23 | 1 | -10/+22 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #1243 from MetaMask/i238-kovan | Dan Finlay | 2017-03-23 | 10 | -4/+45 |
|\ \ \ \ | |||||
| * \ \ \ | 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 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | 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 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | 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 di... | Kevin Serrano | 2017-03-22 | 2 | -5/+3 |
| * | | | | 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 |
|\ \ \ | |||||
| * | | | 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 |
| |/ |/| | |||||
* | | Merge pull request #1226 from MetaMask/i1195-privatekeyexportstyle | Dan Finlay | 2017-03-22 | 6 | -46/+215 |
|\ \ | |/ |/| | |||||
| * | 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 |
|\ | |||||
| * | 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 | Dan Finlay | 2017-03-17 | 2 | -11/+23 |
|/ / | |||||
| * | 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 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * \ | 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 i... | Kevin Serrano | 2017-03-15 | 2 | -1/+6 |
| | |\ | |||||
| | | * | 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 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
|\ | |||||
| * | Bump changelog | Dan Finlay | 2017-03-09 | 1 | -0/+2 |
| * | Add ENS click to copy | Dan Finlay | 2017-03-09 | 2 | -10/+9 |
| * | Get basic ENS working | Dan Finlay | 2017-03-09 | 32 | -168/+519 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1196 from MetaMask/Version-3.4.0 | Dan Finlay | 2017-03-09 | 2 | -1/+3 |
|\ \ | |||||
| * | | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * \ \ | 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 |
| * | | | 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 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into i114... | Kevin Serrano | 2017-03-09 | 5 | -7/+58 |
| |\ \ | |||||
| | * \ | 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 |
|\ \ \ \ | |||||
| * \ \ \ | 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 | 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 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | 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 | kumavis | 2017-03-08 | 1 | -1/+1 |
|/ / / / / / | |||||
| * | | | | | 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 i114... | Kevin Serrano | 2017-03-08 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * \ | 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 | kumavis | 2017-03-08 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1180 from MetaMask/kumavis-patch-1 | kumavis | 2017-03-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | 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 |
|/ / / / / | |||||
| | * / / | 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 |
|\ \ \ \ | |||||
| * \ \ \ | 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 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | 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 github.com:MetaMask/metamask-plug... | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * \ \ | 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 | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
|/ / / / / / | |||||
| | * / / / | 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 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1161 from MetaMask/Debugging | Dan Finlay | 2017-03-07 | 3 | -29/+48 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
| | | * | 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 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 i76... | Dan Finlay | 2017-03-01 | 1 | -2/+12 |
| |\ \ | |||||
| | * \ | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Kevin Serrano | 2017-03-01 | 3 | -3/+4 |
| | |\ \ | |||||
| | * | | | 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 i76... | Dan Finlay | 2017-03-01 | 1 | -18/+4 |
| |\| | | |||||
| | * | | 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 i76... | Dan Finlay | 2017-03-01 | 1 | -0/+2 |
| |\ \ | |||||
| | * | | 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 i76... | Dan Finlay | 2017-03-01 | 2 | -4/+17 |
| |\| | |