aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #1271 from MetaMask/i1223-InjectIFramesDan Finlay2017-03-283-2/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump changelogDan Finlay2017-03-281-0/+2
| * | | | Merge branch 'master' into masterDan Finlay2017-03-287-11/+25
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1269 from MetaMask/notice-fixDan Finlay2017-03-283-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Version 3.5.1v3.5.1Dan Finlay2017-03-282-1/+3
| * | | | Add to changelog.Kevin Serrano2017-03-281-0/+2
| * | | | Fix edge case where notice does not require scrollbar.Kevin Serrano2017-03-281-0/+3
|/ / / /
* | | | Merge pull request #1266 from MetaMask/Version-3.5.0Frankie2017-03-282-1/+3
|\ \ \ \
| * | | | Version 3.5.0v3.5.0Dan Finlay2017-03-282-1/+3
|/ / / /
* | | | Merge pull request #1265 from MetaMask/ropsten-fixDan Finlay2017-03-284-10/+15
|\ \ \ \
| * | | | explorer - fix ropsten explorer link testskumavis2017-03-282-8/+13
| * | | | Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into rops...kumavis2017-03-281-1/+1
| |\ \ \ \
| | * | | | block explorer - ropstenkumavis2017-03-281-1/+1
| |/ / / / |/| | | |
| * | | | tests - fix ropsten link checkkumavis2017-03-281-2/+2
| * | | | block explorer - account link - ropstenkumavis2017-03-281-1/+1
|/ / / /
| * / / Allow injection in IFrames + dynamic IFramesStefaan Ponnet2017-03-262-2/+2
|/ / /
* | | Merge pull request #1253 from MetaMask/i1210-txdisappearanceDan Finlay2017-03-253-10/+34
|\ \ \
| * \ \ Merge branch 'i1210-txdisappearance' of github.com:MetaMask/metamask-plugin i...Kevin Serrano2017-03-250-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' into i1210-txdisappearanceKevin Serrano2017-03-2518-458/+627
| | |\ \ \ | |_|/ / / |/| | | |
| * | | | correct bug in test.Kevin Serrano2017-03-251-1/+1
| * | | | Add tests.Kevin Serrano2017-03-251-0/+11
| * | | | Merge branch 'master' into i1210-txdisappearanceKevin Serrano2017-03-2518-458/+627
| |\ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge pull request #1249 from MetaMask/kovan-noticeKevin Serrano2017-03-254-3/+7
|\ \ \ \
| * \ \ \ Merge branch 'master' into kovan-noticeDan Finlay2017-03-254-0/+51
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1250 from MetaMask/notice-modificationDan Finlay2017-03-254-0/+51
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into notice-modificationDan Finlay2017-03-2510-455/+569
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Create migration to erase body in read notices.Kevin Serrano2017-03-231-0/+36
| * | | | | Add migration tests to ensure that bodies are erased properly in notices.Kevin Serrano2017-03-232-0/+14
| * | | | | Remove notice body after reading.Kevin Serrano2017-03-231-0/+1
| | * | | | Merge branch 'master' into kovan-noticeDan Finlay2017-03-2510-455/+569
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1248 from MetaMask/i1234-HardGasLimits-BrowserFormDan Finlay2017-03-258-451/+565
|\ \ \ \ \ \
| * | | | | | Add personalMessages to function to calculate pending tx index.Kevin Serrano2017-03-251-1/+2
| * | | | | | Fix tx selecting bugDan Finlay2017-03-252-2/+3
| * | | | | | Remove goHome action causing erratic UI behavior.Kevin Serrano2017-03-251-1/+0
| * | | | | | Remove unnecessary logDan Finlay2017-03-251-2/+0
| * | | | | | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas...Dan Finlay2017-03-251-3/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-241-3/+3
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1257 from MetaMask/i1256-RemoveGasLimitParamKevin Serrano2017-03-241-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Remove gas limit paramDan Finlay2017-03-241-3/+3
|/ / / / / / /
| * / / / / / Disable accept button when gas limit is too lowDan Finlay2017-03-251-8/+5
| |/ / / / /
| * | | | | Make gas calculations on render more consistentDan Finlay2017-03-241-10/+16
| * | | | | Fix initial tx fee estimationDan Finlay2017-03-242-4/+5
| * | | | | Fix a couple thingsDan Finlay2017-03-242-15/+42
| * | | | | Make reset button clear errorsDan Finlay2017-03-241-0/+1
| * | | | | Fix initial gas price estimateDan Finlay2017-03-241-4/+5
| * | | | | Prevent default for reset and reject buttonsDan Finlay2017-03-242-1/+3
| * | | | | Override browser default validation messageDan Finlay2017-03-241-0/+1
| * | | | | Fix some broken refsDan Finlay2017-03-241-2/+2
| * | | | | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas...Dan Finlay2017-03-2418-22/+65
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-241-1/+1
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #1251 from MetaMask/kovan-tx-etherscanDan Finlay2017-03-231-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Enable etherscan linking on Kovan transaction list items.Kevin Serrano2017-03-231-1/+1
|/ / / / / /
| | * | | | Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-2314-17/+53
| | |\ \ \ \ | |_|/ / / / |/| | | | |
| | * | | | Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-234-4/+11
| | |\ \ \ \
| * | | | | | Combine pending-tx-details component into pending-tx-detailsDan Finlay2017-03-242-370/+346
| |/ / / / /
| * | | | | Bump changelogDan Finlay2017-03-231-0/+3
| * | | | | Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-238-52/+227
| |\ \ \ \ \
| * | | | | | Got basic validations workingDan Finlay2017-03-235-108/+199
| * | | | | | Some progressDan Finlay2017-03-232-7/+16
| | | | * | | Reset disabled state for confirm button after every notice.Kevin Serrano2017-03-231-1/+4
| | | | * | | Create announcement for Kovan.Kevin Serrano2017-03-233-2/+3
| |_|_|/ / / |/| | | | |
| | | | * | Add to changelog.Kevin Serrano2017-03-231-0/+1
| | | | * | Fix persistence of transactions between networks.Kevin Serrano2017-03-231-10/+22
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1243 from MetaMask/i238-kovanDan Finlay2017-03-2310-4/+45
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i238-kovanDan Finlay2017-03-231-9/+5
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1241 from MetaMask/i1237-xmlfix2Dan Finlay2017-03-231-9/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into i1237-xmlfix2Kevin Serrano2017-03-231-0/+1
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into i1237-xmlfix2Dan Finlay2017-03-232-4/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into i1237-xmlfix2Kevin Serrano2017-03-231-1/+5
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'master' into i1237-xmlfix2Dan Finlay2017-03-233-3/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into i1237-xmlfix2Kevin Serrano2017-03-233-6/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Modify logic for injection conditions.Kevin Serrano2017-03-231-9/+5
| | | | | | * | | Merge branch 'master' into i238-kovanKevin Serrano2017-03-233-4/+3
| | | | | | |\ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1247 from MetaMask/hide-passwordKevin Serrano2017-03-231-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into hide-passwordKevin Serrano2017-03-232-4/+2
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1245 from MetaMask/i1193-errorstylefixDan Finlay2017-03-232-4/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into i1193-errorstylefixDan Finlay2017-03-234-4/+11
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix styling of error message.Kevin Serrano2017-03-232-4/+2
| | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch 'master' into hide-passwordKevin Serrano2017-03-234-4/+11
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | * | | | | | Hide the password in the private key retrieval screen.Kevin Serrano2017-03-231-0/+1
| |/ / / / / /
| | | | * | | Merge branch 'master' into i238-kovanKevin Serrano2017-03-231-1/+5
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #1244 from MetaMask/i1227-uidumpblockhashDan Finlay2017-03-231-1/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'master' into i1227-uidumpblockhashDan Finlay2017-03-233-3/+6
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add current block number and hash to the state.Kevin Serrano2017-03-231-1/+5
| |/ / / / /
| | | * | | Merge branch 'master' into i238-kovanDan Finlay2017-03-233-3/+6
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1225 from MetaMask/i1033-spinnerfixDan Finlay2017-03-233-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into i1033-spinnerfixkumavis2017-03-238-51/+226
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add one more loading indication.Kevin Serrano2017-03-231-0/+1
| * | | | | Uncomment lines relating to showing indicator.Kevin Serrano2017-03-221-2/+2
| * | | | | Remove redundant removal of loading indicator. Integrate loading indicator di...Kevin Serrano2017-03-222-5/+3
| * | | | | Changelog addition.Kevin Serrano2017-03-211-0/+1
| * | | | | Add action to hide loading indication on an incorrect pw.Kevin Serrano2017-03-211-2/+5
| | |_|/ / | |/| | |
| | | * | Changelog bump.Kevin Serrano2017-03-231-0/+1
| | | * | Add Kovan test network to our application.Kevin Serrano2017-03-231-0/+9
| | | * | Add kovan to drop-menu-itemKevin Serrano2017-03-231-1/+4
| | | * | Add conditional kovan to current network component.Kevin Serrano2017-03-231-0/+12
| | | * | Add kovan conditional to config screen.Kevin Serrano2017-03-231-0/+5
| | | * | Add conditional kovan logic to etherscan link generators.Kevin Serrano2017-03-232-2/+7
| | | * | Modify css rule for unused hollow diamond.Kevin Serrano2017-03-231-1/+1
| | | * | Add kovan config settings to config manager.Kevin Serrano2017-03-231-0/+4
| | | * | Add kovan to config file.Kevin Serrano2017-03-231-0/+2
| |_|/ / |/| | |
* | | | Merge pull request #1239 from MetaMask/betterErrorskumavis2017-03-232-5/+11
|\ \ \ \
| * | | | Add to CHANGELOGfrankiebee2017-03-231-0/+1
| * | | | Have better error messagesfrankiebee2017-03-231-5/+10
|/ / / /
* | / / Require redux-logger of 2.10.2 and up (#1235)Kevin Serrano2017-03-231-1/+1
| |/ / |/| |
* | | Merge pull request #1226 from MetaMask/i1195-privatekeyexportstyleDan Finlay2017-03-226-46/+215
|\ \ \ | |/ / |/| |
| * | Add to changelog.Kevin Serrano2017-03-211-0/+1
| * | Adjust private key confirmation style and logic.Kevin Serrano2017-03-213-46/+75
| * | Add new development states for UI development.Kevin Serrano2017-03-212-0/+139
|/ /
* | Merge pull request #1214 from MetaMask/i1181-RemoveLightwalletKevin Serrano2017-03-2110-903/+2
|\ \
| * \ Merge branch 'master' into i1181-RemoveLightwalletKevin Serrano2017-03-212-11/+23
| |\ \ | |/ / |/| |
* | | Merge pull request #1215 from MetaMask/ImprovePersonalSignStyleDan Finlay2017-03-212-11/+23
|\ \ \
| * | | Improve personal_sign styleDan Finlay2017-03-172-11/+23
|/ / /
| * / Remove eth-lightwalletDan Finlay2017-03-1710-903/+2
|/ /
* | Merge pull request #1198 from MetaMask/i1165-predictiveDan Finlay2017-03-1710-6/+211
|\ \
| * \ Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-1531-43/+40
| |\ \ | |/ / |/| |
* | | Merge pull request #1212 from MetaMask/i1211-currencyretentionkumavis2017-03-1531-43/+40
|\ \ \
| * \ \ Merge branch 'master' into i1211-currencyretentionKevin Serrano2017-03-152-1/+6
| |\ \ \ | |/ / / |/| | |
| * | | Rename variables to proper currency state variables.Kevin Serrano2017-03-155-17/+14
| * | | Fix description of some migrations.Kevin Serrano2017-03-152-2/+2
| * | | Fix development to use new currency state.Kevin Serrano2017-03-1524-24/+24
| | |/ | |/|
| | * Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i...Kevin Serrano2017-03-152-1/+6
| | |\
| | | * Merge branch 'master' into i1165-predictivekumavis2017-03-152-1/+6
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #1207 from MetaMask/i1206-customrpcKevin Serrano2017-03-142-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Changelog addition.Kevin Serrano2017-03-141-0/+1
| * | | Render config screen from unlock.Kevin Serrano2017-03-141-0/+4
| * | | Display Custom RPC on lock screen.Kevin Serrano2017-03-141-1/+1
|/ / /
| * / Minor change in removing opts object.Kevin Serrano2017-03-151-4/+1
| |/
| * Add to changelog.Kevin Serrano2017-03-151-0/+1
| * Limit the number of addresses stored in our book.Kevin Serrano2017-03-141-0/+4
| * Add test to account for prevention of identities duplication.Kevin Serrano2017-03-111-1/+22
| * Connect keyring controller to address book to prevent additional duplicates.Kevin Serrano2017-03-112-9/+23
| * Add another test for duplicates.Kevin Serrano2017-03-111-0/+7
| * Improve duplicate checking in address book.Kevin Serrano2017-03-111-2/+2
| * Add basic tests.Kevin Serrano2017-03-112-1/+29
| * Add comments.Kevin Serrano2017-03-113-4/+25
| * Allow for adding recently used addresses to address book.Kevin Serrano2017-03-104-4/+40
| * Rename functions for consistency.Kevin Serrano2017-03-101-6/+6
| * Create persistence address book.Kevin Serrano2017-03-103-0/+58
| * Create distinct labels and names for addresses.Kevin Serrano2017-03-102-2/+8
| * Display owned addresses in datalist.Kevin Serrano2017-03-102-0/+12
|/
* Merge pull request #1197 from MetaMask/i1130-ResolveENSKevin Serrano2017-03-096-33/+223
|\
| * Bump changelogDan Finlay2017-03-091-0/+2
| * Add ENS click to copyDan Finlay2017-03-092-10/+9
| * Get basic ENS workingDan Finlay2017-03-0932-168/+519
| |\ | |/ |/|
* | Merge pull request #1196 from MetaMask/Version-3.4.0Dan Finlay2017-03-092-1/+3
|\ \
| * | Version 3.4.0v3.4.0Dan Finlay2017-03-092-1/+3
|/ /
* | Merge pull request #1191 from MetaMask/i1065-removealertDan Finlay2017-03-092-2/+10
|\ \
| * | Modify message.Kevin Serrano2017-03-091-1/+1
| * | Add more informative messageKevin Serrano2017-03-092-1/+9
| * | Merge branch 'master' into i1065-removealertKevin Serrano2017-03-092-26/+60
| |\ \ | |/ / |/| |
* | | Merge pull request #1189 from MetaMask/kumavis-patch-1Dan Finlay2017-03-092-26/+60
|\ \ \
| * \ \ Merge branch 'master' into kumavis-patch-1Dan Finlay2017-03-0914-51/+153
| |\ \ \ | |/ / / |/| | |
| * | | tx-utils - add encoding utilskumavis2017-03-082-9/+15
| * | | tx-utils - stricter naming type-based conventionkumavis2017-03-082-23/+29
| * | | test - tx-utilskumavis2017-03-081-3/+29
| * | | tx-utils - clean and commentkumavis2017-03-081-15/+11
| | * | Convert alert to a log.errorKevin Serrano2017-03-091-1/+1
| |/ / |/| |
* | | Merge pull request #1147 from MetaMask/i1144-moarrpcKevin Serrano2017-03-0914-51/+153
|\ \ \ | |/ / |/| |
| * | Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into i114...Kevin Serrano2017-03-095-7/+58
| |\ \
| | * \ Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-095-7/+58
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1187 from MetaMask/i1118-IncreaseGasBufferDan Finlay2017-03-083-5/+35
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1118-IncreaseGasBufferDan Finlay2017-03-081-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1186 from MetaMask/grammarFixDan Finlay2017-03-081-1/+1
|\ \ \ \ \
| * | | | | Fix grammar in erro messagefrankiebee2017-03-081-1/+1
|/ / / / /
| * | | | Bump changelogDan Finlay2017-03-081-0/+1
| * | | | Merge branch 'master' into i1118-IncreaseGasBufferjaredpereira2017-03-083-3/+24
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1185 from MetaMask/i#1032kumavis2017-03-081-1/+22
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i#1032Frankie2017-03-081-1/+1
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1183 from MetaMask/provider-ten-oh-onekumavis2017-03-081-1/+1
|\ \ \ \ \ \
| * | | | | | deps - bump web3-provider-engine to 10.0.1kumavis2017-03-081-1/+1
|/ / / / / /
| * | | | | Merge branch 'master' into i#1032frankiebee2017-03-0811-57/+161
| |\ \ \ \ \
| * | | | | | fix issue where account import allows for duplicatesfrankiebee2017-03-081-1/+22
| | | * | | | change BN.mul to BN.mulnJared Pereira2017-03-082-10/+8
| | | * | | | add gas buffer multiply testJared Pereira2017-03-081-16/+6
| | | * | | | remove constant buffer and add multiplierJared Pereira2017-03-081-5/+8
| | | * | | | Add gas buffer testDan Finlay2017-03-081-0/+38
| | | | * | | Fix typo, switch to log.errorKevin Serrano2017-03-091-3/+3
| | | | |/ /
| | | | * | Remove unneeded setrpc method.Kevin Serrano2017-03-091-20/+8
| | | | * | Nodeify and promisify calls to background.Kevin Serrano2017-03-092-11/+29
| | | | * | Fix tests until new ones to-be-written.Kevin Serrano2017-03-081-17/+0
| | | | * | Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into i114...Kevin Serrano2017-03-080-0/+0
| | | | |\ \
| | | | | * \ Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-081-1/+1
| | | | | |\ \
| | | | * | \ \ Merge github.com:MetaMask/metamask-plugin into i1144-moarrpcKevin Serrano2017-03-082-2/+2
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #1182 from MetaMask/provider-tenkumavis2017-03-081-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | deps - bump web3-provider-enginekumavis2017-03-081-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #1180 from MetaMask/kumavis-patch-1kumavis2017-03-081-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'master' into kumavis-patch-1Dan Finlay2017-03-081-1/+1
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1179 from MetaMask/FixHexEncodingkumavis2017-03-081-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fixed encodingDan Finlay2017-03-082-15/+2
| * | | | | | Remove unrelated test fileDan Finlay2017-03-081-38/+0
| * | | | | | Fix test nameDan Finlay2017-03-071-1/+1
| * | | | | | Fixed internal encoding test caseDan Finlay2017-03-072-1/+39
| * | | | | | LintedDan Finlay2017-03-071-2/+2
| * | | | | | Fix hex encoding of message to create valid hex stringsDan Finlay2017-03-071-1/+14
|/ / / / / /
| * / / / / deps - bump web3-provider-enginekumavis2017-03-081-1/+1
|/ / / / /
| | * / / Refactor of code into separate reducers and actions.Kevin Serrano2017-03-085-36/+26
| | |/ /
| | * | Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-0811-56/+160
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1177 from MetaMask/i1173-ShowPersonalMessagekumavis2017-03-075-21/+106
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1173-ShowPersonalMessageDan Finlay2017-03-072-5/+5
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1178 from MetaMask/i#1168kumavis2017-03-072-5/+5
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i#1168Frankie2017-03-074-30/+49
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix issue where old txMeta object was being used to pass the txHash to the cbFrankie2017-03-072-5/+5
| | |/ / / | |/| | |
| | * | | Merge branch 'i1173-ShowPersonalMessage' of github.com:MetaMask/metamask-plug...Dan Finlay2017-03-071-1/+1
| | |\ \ \
| | | * \ \ Merge branch 'master' into i1173-ShowPersonalMessagekumavis2017-03-071-1/+1
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1176 from MetaMask/i1162-FixLoosePersonalSignkumavis2017-03-071-1/+1
|\ \ \ \ \ \
| * | | | | | Fix personal sign for loose accountsDan Finlay2017-03-071-1/+1
|/ / / / / /
| | * / / / Fix normalizeMsgData function to always return hex prefixedDan Finlay2017-03-072-3/+3
| | |/ / /
| | * | | Remove logDan Finlay2017-03-071-1/+0
| | * | | Fix function namesDan Finlay2017-03-071-6/+6
| | * | | Render personal_sign messages as utf-8 textDan Finlay2017-03-075-21/+107
| |/ / / |/| | |
* | | | Merge pull request #1161 from MetaMask/DebuggingDan Finlay2017-03-073-29/+48
|\ \ \ \ | |/ / / |/| | |
| * | | Prevent submission of invalid gas parameters.Kevin Serrano2017-03-022-3/+26
| * | | Various improvements to gas input.Kevin Serrano2017-03-023-27/+22
| * | | Only allow numbers in gas inputsDan Finlay2017-03-021-0/+1
|/ / /
| * | Modify tests.'Kevin Serrano2017-03-081-15/+19
| * | Break out rpc update and rpclist into two reducers.Kevin Serrano2017-03-083-11/+31
| * | More conflict resolution.Kevin Serrano2017-03-028-7/+16
| |\ \
| | * | Fix test referenceDan Finlay2017-02-281-1/+1
| | * | add controllers to root scripts folderDan Finlay2017-02-284-3/+3
| | * | Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-2830-658/+717
| | |\ \
| | * | | Concatenate custom RPC labels that are too longDan Finlay2017-02-281-1/+9
| * | | | Fix merge conflicts.Kevin Serrano2017-03-0237-797/+1214
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Fix spelling error.Kevin Serrano2017-02-251-1/+1
| |/ / /
| * | | Tested against code to play nice with unit tests.Kevin Serrano2017-02-246-14/+54
| * | | Make the UI play nice with empty RPC lists.Kevin Serrano2017-02-232-1/+2
| * | | LintoKevin Serrano2017-02-231-1/+1
| * | | Changelog.Kevin Serrano2017-02-231-0/+2
| * | | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-233-16/+41
| * | | Connect to actions.Kevin Serrano2017-02-222-0/+2
| * | | Fix namingKevin Serrano2017-02-222-3/+3
| * | | Basic infrasture for RPC list added.Kevin Serrano2017-02-222-3/+24
| | | * Add ens recognition to send form inputDan Finlay2017-03-013-5/+144
| | | * Fix loading indication for conf-tx viewDan Finlay2017-03-011-1/+1
| |_|/ |/| |
* | | Merge pull request #1154 from MetaMask/i765-gaslimitsKevin Serrano2017-03-0116-145/+505
|\ \ \ | |_|/ |/| |
| * | Add reset button to reset gas fields.Kevin Serrano2017-03-012-4/+20
| * | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Dan Finlay2017-03-011-2/+12
| |\ \
| | * \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Kevin Serrano2017-03-013-3/+4
| | |\ \
| | * | | Gas and Gaslimit revert to default if set to 0Kevin Serrano2017-03-011-2/+12
| * | | | Bump changelogDan Finlay2017-03-011-0/+1
| * | | | Add a couple more debug logsDan Finlay2017-03-012-0/+2
| | |/ / | |/| |
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Dan Finlay2017-03-011-18/+4
| |\| |
| | * | lintsKevin Serrano2017-03-011-3/+0
| | * | Remove advanced options for now.Kevin Serrano2017-03-011-15/+4
| * | | Use correct action to update and submit txDan Finlay2017-03-013-3/+4
| |/ /
| * | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Dan Finlay2017-03-011-0/+2
| |\ \
| | * | lintKevin Serrano2017-03-011-2/+4
| * | | LintedDan Finlay2017-03-013-5/+2
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Dan Finlay2017-03-012-4/+17
| |\| |
| | * | Hide gas options behind an advanced options checkbox.Kevin Serrano2017-03-011-4/+16
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:33:37 +0800