aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update MetaMascara READMEfrankiebee2017-04-031-11/+3
* Rename mascara root directoryfrankiebee2017-04-0312-0/+0
* Check to see if connection is from popupfrankiebee2017-04-031-1/+1
* Make Popup close after approving a transactionfrankiebee2017-04-031-7/+14
* Merge branch 'master' into mascarafrankiebee2017-04-0319-334/+213
|\
| * Merge pull request #1300 from MetaMask/platformFrankie2017-04-0319-334/+213
| |\
| | * notification-manager - rename show -> showPoup + make getPopup privatekumavis2017-04-012-11/+11
| | * ui - use global.platform for extension interactionkumavis2017-04-016-22/+21
| | * Merge branch 'master' of github.com:MetaMask/metamask-plugin into platformkumavis2017-04-015-50/+101
| | |\ | | |/ | |/|
| | * ui - move popup auto-close after tx conf to ui entrypointkumavis2017-04-012-6/+9
| | * ui - startPopup returns store after bootkumavis2017-04-014-39/+46
| | * ui - reducer - app - code cleanupkumavis2017-04-011-27/+20
| | * etc - fix notification-manager ref, remove duplicated test filekumavis2017-03-312-79/+4
| | * Merge branch 'master' of github.com:MetaMask/metamask-plugin into platformkumavis2017-03-311-1/+1
| | |\
| | * | extension - remove local extension files, we use extensionizerkumavis2017-03-312-85/+0
| | * | introduce platform api and rename notifications to notification-managerkumavis2017-03-317-80/+117
| | * | extension - prefer extensionizer modulekumavis2017-03-317-7/+7
* | | | Merge branch 'master' into mascarafrankiebee2017-04-0315-82/+197
|\| | |
| * | | Merge pull request #1297 from MetaMask/eip155Dan Finlay2017-04-014-35/+83
| |\ \ \
| | * | | tests - tx-manager - fix assert and clean formattingkumavis2017-03-312-10/+2
| | * | | tx-manager - add eip155 supportkumavis2017-03-313-35/+91
| * | | | Merge pull request #1299 from MetaMask/test-notice-fixDan Finlay2017-04-011-15/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | test - fix notice-controller testkumavis2017-03-311-15/+18
| |/ / /
| * | | Merge pull request #1298 from MetaMask/tests-fixFrankie2017-03-313-10/+54
| |\ \ \ | | |/ / | |/| |
| | * | tests - add missing donekumavis2017-03-311-1/+1
| | |/
| | * meta - package.json - rename npm test scriptskumavis2017-03-311-5/+5
| | * tests - helper - add notekumavis2017-03-311-9/+11
| | * tests - unit - fail on unhandled promise rejectionkumavis2017-03-312-4/+46
| |/
| * Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecksKevin Serrano2017-03-301-1/+2
| |\
| | * Fix currency checking for firefoxDan Finlay2017-03-301-1/+2
| * | Merge pull request #1293 from MetaMask/ImproveGasEstimatesKevin Serrano2017-03-302-14/+21
| |\ \
| | * | tests - tx-utils gasBuffer calc - fix bug and user easier numberskumavis2017-03-301-11/+17
| | * | tx-utils - gas buffer ceiling at 90% of block gas limitkumavis2017-03-301-3/+4
| * | | Merge pull request #1287 from MetaMask/kumavis-patch-1Dan Finlay2017-03-301-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | deps - bump provider-enginekumavis2017-03-301-1/+1
| * | | Merge pull request #1283 from MetaMask/i1267-textfixkumavis2017-03-302-4/+8
| |\ \ \ | | |/ / | |/| |
| | * | Fix potential formatting issues for seed word display.Kevin Serrano2017-03-292-4/+8
| * | | Merge pull request #1284 from MetaMask/FixFirefoxPopupkumavis2017-03-303-2/+9
| |\ \ \
| | * | | LintedDan Finlay2017-03-301-1/+1
| | * | | Bump changelogDan Finlay2017-03-301-0/+2
| | * | | Fix popup behavior for FirefoxDan Finlay2017-03-302-2/+7
| |/ / /
| * | | Merge pull request #1281 from MetaMask/migration-enableDan Finlay2017-03-291-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Add missing migration.Kevin Serrano2017-03-291-0/+1
| |/ /
* | | Rename and move around filesfrankiebee2017-04-0311-110/+21
* | | Clean upfrankiebee2017-03-316-181/+11
* | | fix streamfrankiebee2017-03-301-1/+1
* | | Bump sw-stream and setup "untrusted and trusted comunication"frankiebee2017-03-304-6/+12
* | | Create a Transaction from within the dappfrankiebee2017-03-301-1/+1
* | | WIP: lost enital call from dapp to getAccountsfrankiebee2017-03-308-24/+14
* | | Merge branch 'master' into mascarafrankiebee2017-03-2933-593/+720
|\| |
| * | Merge pull request #1277 from MetaMask/Version-2.5.2Dan Finlay2017-03-292-1/+4
| |\ \
| | * | Version 2.5.2v3.5.2v2.5.2Dan Finlay2017-03-292-1/+4
| |/ /
| * | Merge pull request #1268 from MetaMask/kovan-faucet-instructionsDan Finlay2017-03-293-2/+14
| |\ \
| | * \ Merge branch 'master' into kovan-faucet-instructionsDan Finlay2017-03-2912-177/+108
| | |\ \
| | * \ \ Merge branch 'master' into kovan-faucet-instructionsKevin Serrano2017-03-283-1/+8
| | |\ \ \
| | * | | | Add to changelog.Kevin Serrano2017-03-281-0/+2
| | * | | | Add link to kovan faucet instructions.Kevin Serrano2017-03-282-2/+13
| * | | | | Merge pull request #1273 from MetaMask/i1267-seedfixDan Finlay2017-03-294-33/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Assure that seed words are placed into state tree upon request.Kevin Serrano2017-03-284-33/+6
| * | | | | Merge pull request #1272 from MetaMask/hideseedwordsfromlogstateDan Finlay2017-03-291-1/+5
| |\ \ \ \ \
| | * | | | | Remove a noteDan Finlay2017-03-291-1/+0
| | * | | | | Merge branch 'master' into hideseedwordsfromlogstateDan Finlay2017-03-293-3/+17
| | |\ \ \ \ \
| | * | | | | | Add to changelog.Kevin Serrano2017-03-281-0/+2
| | * | | | | | Remove seedWords from UI state dump.Kevin Serrano2017-03-281-1/+5
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #1276 from MetaMask/ImproveGasEstimateskumavis2017-03-298-173/+86
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'ImproveGasEstimates' of github.com:MetaMask/metamask-plugin int...kumavis2017-03-290-0/+0
| | |\ \ \ \
| | | * | | | Filter txs by txMeta network value in account detailDan Finlay2017-03-291-1/+1
| | * | | | | Filter txs by txMeta network value in account detailkumavis2017-03-292-3/+3
| | * | | | | tx manager - emit update on new unapproved txkumavis2017-03-291-1/+2
| | |/ / / /
| | * | | | Detect tx network from txMetaDan Finlay2017-03-291-1/+1
| | * | | | tx manager - add eth-querykumavis2017-03-291-1/+3
| | * | | | tx manager - adjust new tx flow and txMeta decorationskumavis2017-03-292-41/+32
| | * | | | Improve UI gas calculation logicDan Finlay2017-03-294-127/+46
| | | |/ / | | |/| |
| * | | | Merge pull request #1275 from MetaMask/injection-polishDan Finlay2017-03-291-3/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix injection logic.Kevin Serrano2017-03-291-3/+16
| |/ / /
| * | | 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 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
| | | | | |/
* | | | | | WIP: Untrusted external connections eg: dappsfrankiebee2017-03-299-54/+221
* | | | | | add versioning and migrateing datafrankiebee2017-03-242-51/+28
* | | | | | Merge branch 'master' into mascarafrankiebee2017-03-2467-1037/+573
|\| | | | |
| * | | | | 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 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
| |/
* | Fix state persistencefrankiebee2017-03-241-1/+1
* | Clean up messy mergefrankiebee2017-03-241-11/+2
* | Merge branch 'mascaraMix' into mascarafrankiebee2017-03-242-23/+12
|\ \
| * | Get mascara to send a transaction in the uifrankiebee2017-03-245-18/+11
* | | WIP: indexdb is at an err state "provider is undefined"frankiebee2017-03-245-13/+26
|/ /
* | WIP: streams->indexdbfrankiebee2017-03-2410-54/+96
* | WIP:streamfrankiebee2017-03-223-12/+13
* | notes and clean upfrankiebee2017-03-103-179/+7
* | put background in service workerfrankiebee2017-03-107-2/+378
|/
* 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
| |\ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 14:54:53 +0800