aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5567 from MetaMask/HowardBraham-developkumavis2018-10-302-9/+29
|\
| * Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardB...kumavis2018-10-2613-1383/+1467
| |\
| * | tx-gas-util - set error message when invalidating tx based on tx data but no ...kumavis2018-10-211-4/+5
| * | send tx - validate - simplify error message for attempting to call function o...kumavis2018-10-211-1/+1
| * | Merge branch 'develop' into developkumavis2018-10-2134-1287/+3272
| |\ \
| * | | tx-gas-utils - improve format + commentskumavis2018-10-101-12/+18
| * | | ganache-core merged my PR, so I changed some comments to clarify that ganache...Howard Braham2018-10-101-5/+6
| * | | Bug Fix: #1789 and #4525 eth.getCode() with no contractHoward Braham2018-10-102-7/+19
* | | | Merge pull request #5596 from MetaMask/validateSignTypedDatakumavis2018-10-302-27/+6
|\ \ \ \
| * | | | Add version to unapprovedMessageThomas2018-10-251-2/+2
| * | | | Remove commented out/unused methodsThomas2018-10-251-27/+2
| * | | | Validate signTypedData in eth-json-rpc-middlewareThomas2018-10-252-28/+32
| | |_|/ | |/| |
* | | | Merge pull request #5552 from EthersocialNetwork/eth_chainidkumavis2018-10-301-4/+14
|\ \ \ \
| * \ \ \ Merge branch 'develop' into eth_chainidhackyminer2018-10-2616-1439/+1635
| |\ \ \ \
| * | | | | Update network.jskumavis2018-10-211-0/+1
| * | | | | network - improve logging and type conversionkumavis2018-10-211-4/+6
| * | | | | support both eth_chainId and net_versionhackyminer2018-10-201-4/+11
* | | | | | Merge pull request #5625 from filips123/developkumavis2018-10-301-105/+658
|\ \ \ \ \ \
| * | | | | | Fix Slovenian translationFilip Š2018-10-271-1/+1
| * | | | | | Add Slovenian translation for EIP-1102Filip Š2018-10-271-0/+39
| * | | | | | Fix Slovenian translationFilip Š2018-10-271-105/+619
| | |/ / / / | |/| | | |
* / | | | | preferences - fix typokumavis2018-10-301-1/+1
|/ / / / /
* | / / / Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-265-35/+148
| |/ / / |/| | |
* | | | Add Activity Log entry for onchain failures for a transaction. Change scrolli...Alexander Tseung2018-10-231-0/+3
* | | | Merge pull request #5576 from marijnbent/patch-1kumavis2018-10-231-1/+1
|\ \ \ \
| * | | | Updated translation for main network nameMarijn Bent2018-10-231-1/+1
* | | | | i18n - update haitian translations (#5565)kumavis2018-10-231-1235/+1310
|/ / / /
* | | | ens-ipfs - refactor for readability (#5568)kumavis2018-10-218-125/+131
* | | | Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-211-1/+1
|\ \ \ \
| * | | | add support for wallet_watchAssetEsteban MIno2018-10-201-1/+1
| |/ / /
* | | / i18n - use localized names in language selectionBrandon Wissmann2018-10-211-21/+21
| |_|/ |/| |
* | | specific add and remove methods for frequentRpcList (#5554)Esteban Miño2018-10-202-28/+27
|/ /
* | 4.16.0kumavis2018-10-181-2/+2
* | inpage - increase provider max listeners to avoid warningskumavis2018-10-181-0/+2
* | i18n - add polish (pl)Bartek2018-10-182-0/+1214
* | Merge pull request #5127 from MetaMask/account-tracker-network-changekumavis2018-10-181-1/+7
|\ \
| * \ Merge branch 'develop' into account-tracker-network-changekumavis2018-09-2831-561/+1330
| |\ \
| * | | metamask controller - force account tracker to update balances on network changekumavis2018-08-231-0/+4
* | | | Merge pull request #5536 from whymarrh/add-token-helpWhymarrh Whitby2018-10-181-0/+6
|\ \ \ \
| * | | | Extract Add Token button into its own componentWhymarrh Whitby2018-10-181-0/+6
* | | | | Merge pull request #5522 from MetaMask/fetch-debuggingWhymarrh Whitby2018-10-182-0/+37
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | enable fetch debuggingkumavis2018-10-152-0/+37
* | | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-174-1/+55
* | | | | Fix wording of private key warning shown during exportWhymarrh Whitby2018-10-171-1/+1
* | | | | Update wording on export privkey modalWhymarrh Whitby2018-10-171-1/+1
* | | | | Fix document extension check when injecting web3Whymarrh Whitby2018-10-161-7/+12
* | | | | Improve Korean translations (#5515)Noel Yoo2018-10-161-7/+85
* | | | | Fixed wrong Spanish translation of `key` (#5517)Pedro Gutiérrez2018-10-161-7/+7
* | | | | Add txReceipt data to transaction details (#5513)Alexander Tseung2018-10-163-1/+42
* | | | | Update Italian translations (#5502)matteopey2018-10-161-5/+480
|/ / / /
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into developkumavis2018-10-121-1/+1
|\ \ \ \
| * | | | Version 4.13.0v4.13.0Dan Finlay2018-09-281-2/+2
* | | | | Correct 4.14.0 versionDan Finlay2018-10-121-1/+1
* | | | | Merge pull request #5505 from MetaMask/Version-4.14.0Thomas Huang2018-10-121-1/+1
|\ \ \ \ \
| * | | | | Version 4.14.0v4.14.0Dan Finlay2018-10-121-1/+1
* | | | | | Fix en, ko locales (#5483)Noel Yoo2018-10-112-49/+49
* | | | | | Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-111-0/+4
* | | | | | Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5...Whymarrh Whitby2018-10-111-23/+1
* | | | | | Merge pull request #5480 from noelyoo/typokumavis2018-10-102-236/+236
|\ \ \ \ \ \
| * | | | | | Alphabetize ko locale json keysnoelyoo2018-10-101-224/+224
| * | | | | | Alphabetize en locale json keysnoelyoo2018-10-101-12/+12
| |/ / / / /
* / / / / / transactions - add txReceipt to the txMeta body for confirmed txs (#5375)Frankie2018-10-101-1/+23
|/ / / / /
* | | | | Fix formatting of locale files (#5479)Noel Yoo2018-10-1015-956/+956
* | | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-101-1/+1
* | | | | i18n - fr - improvementsVincent2018-10-101-4/+4
* | | | | Added account options on home screenSantiago Gonzalez Toral2018-10-105-0/+64
| |_|_|/ |/| | |
* | | | Fix Korean typos (#5472)Noel Yoo2018-10-101-7/+7
* | | | Merge pull request #5458 from MetaMask/provider-subsBruno Barbieri2018-10-105-15/+36
|\ \ \ \
| * | | | workaround - fix for drizzlekumavis2018-10-091-2/+11
| * | | | provider - network - restore block-ref-rewrite middleware referenceskumavis2018-10-092-4/+4
| * | | | provider - enable subscription support (newHeads, logs)kumavis2018-10-082-9/+21
* | | | | 100% French locale, reordering of English locale, fixes #5457 (#5470)Vincent2018-10-092-123/+802
* | | | | Refactor buffer constructor (#5468)Noel Yoo2018-10-092-2/+2
* | | | | Added webRequest.RequestFilter to filter main_frame .eth requestsEduardo Antuña Díez2018-10-091-1/+1
* | | | | Merge branch 'develop' into update-balance-on-unlockDan Finlay2018-10-062-0/+2
|\ \ \ \ \
| * | | | | Fix updating of pending transactionsDan Finlay2018-10-062-0/+2
* | | | | | Update all balances on password unlockDan Finlay2018-10-061-0/+1
|/ / / / /
* | | | | Merge pull request #5432 from alextsg/i5362-fix-translateDan Finlay2018-10-061-0/+3
|\ \ \ \ \
| * | | | | Translate method names in the transaction list only when applicableAlexander Tseung2018-10-051-0/+3
* | | | | | Merge pull request #5427 from alextsg/i5371-update-cancel-copyAlexander Tseung2018-10-051-1/+1
|\ \ \ \ \ \
| * | | | | | Update "cancel" copyAlexander Tseung2018-10-051-1/+1
| |/ / / / /
* / / / / / Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-051-1/+1
|/ / / / /
* | | | | Merge pull request #5412 from whymarrh/after-install-stepsWhymarrh Whitby2018-10-041-9/+0
|\ \ \ \ \
| * | | | | Don't open metamask.io after install anymoreWhymarrh Whitby2018-10-021-9/+0
* | | | | | Remove "Copy Contract Address" from token optionsWhymarrh Whitby2018-10-044-14/+2
| |/ / / / |/| | | |
* | | | | Style links on phishing page with an underlineWhymarrh Whitby2018-10-021-0/+1
* | | | | Style links on phishing page with cursor: pointer;Whymarrh Whitby2018-10-021-0/+1
* | | | | Hook MetaMaskController up with phishing detection pageWhymarrh Whitby2018-10-022-2/+60
* | | | | Add domain whitelist method to MetaMaskControllerWhymarrh Whitby2018-10-021-0/+11
* | | | | Add ability to whitelist a blacklisted domain at runtimeWhymarrh Whitby2018-10-021-0/+22
* | | | | Update title and copy of phishing warning pageWhymarrh Whitby2018-10-021-2/+6
|/ / / /
* | | | Reword batch reject confirm as "Reject All"Whymarrh Whitby2018-10-021-0/+3
* | | | Confirm rejecting multiple transactions with modalWhymarrh Whitby2018-10-021-0/+3
* | | | s/Cancel/Reject/ on confirm screen for clarityWhymarrh Whitby2018-10-021-0/+6
* | | | Add "Cancel All" button to confirm footerWhymarrh Whitby2018-10-021-0/+3
* | | | support editable customRPC (#5267)HackyMiner2018-09-292-7/+15
* | | | Merge pull request #5271 from farahbrunache/developkumavis2018-09-282-0/+1241
|\ \ \ \ | |_|_|/ |/| | |
| * | | i18n - ht - fix json formattingkumavis2018-09-281-4/+1
| * | | i18n - index - fix whitespacekumavis2018-09-281-21/+21
| * | | fixed quotes in line 749Farah Brunache2018-09-211-1/+1
| * | | fixed some grammatical errorsFarah Brunache2018-09-171-15/+13
| * | | added Haitian Creole translationsFarah Brunache2018-09-162-20/+1266
* | | | Version 4.12.0Dan Finlay2018-09-281-2/+2
* | | | Merge remote-tracking branch 'origin/master' into Version-4.12.0Dan Finlay2018-09-281-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into v4.11.1Bruno Barbieri2018-09-251-1/+1
| |\ \ \
| | * | | Version 4.11.0Dan Finlay2018-09-221-2/+2
| * | | | bump to v4.11.1brunobar792018-09-251-1/+1
| * | | | Merge pull request #5084 from MetaMask/ledger-support-without-providerDan Finlay2018-08-214-94/+84
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Update extension badge with correct signTypedData countWhymarrh Whitby2018-09-271-0/+1
* | | | | fix tld bug (#5250)Phyrex Tsai2018-09-271-0/+2
* | | | | Merge pull request #5053 from hahnmichaelf/esdb-supportThomas Huang2018-09-273-3/+9
|\ \ \ \ \
| * | | | | additional lint-test fixhahnmichaelf2018-08-141-1/+1
| * | | | | fix for lint-testhahnmichaelf2018-08-142-3/+3
| * | | | | fixed nameshahnmichaelf2018-08-141-1/+1
| * | | | | Re-added GA scripthahnmichaelf2018-08-141-0/+19
| * | | | | change namehahnmichaelf2018-08-142-1/+1
| * | | | | base - working. fixes #4774hahnmichaelf2018-08-133-21/+8
* | | | | | Merge pull request #5367 from dasilvarosa/patch-1Whymarrh Whitby2018-09-271-1/+33
|\ \ \ \ \ \
| * | | | | | Update ledger-logo.svgDavid da Silva Rosa2018-09-261-1/+33
* | | | | | | EIP-1102: Add deprecation message (#5353)Paul Bouchon2018-09-262-6/+6
* | | | | | | bugfix: update eth_signTypedData_v3 parameter orderbitpshr2018-09-261-4/+4
|/ / / / / /
* | | | | | Fix MetaMask web3 version (#5352)Esteban Miño2018-09-261-0/+1
* | | | | | Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-252-2/+21
|\ \ \ \ \ \
| * | | | | | Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModa...Alexander Tseung2018-09-211-1/+1
| * | | | | | Add TransactionDetails modalAlexander Tseung2018-09-201-0/+3
| * | | | | | Switch existing modals from using Notification to Modal. Remove Notification ...Alexander Tseung2018-09-202-2/+18
* | | | | | | Merge pull request #5310 from MetaMask/getPendingNonce-hotfixThomas Huang2018-09-242-1/+15
|\ \ \ \ \ \ \
| * | | | | | | Adds getPendingNonce method to provider initialization options in metamask-co...Dan Miller2018-09-222-1/+15
* | | | | | | | Merge pull request #5241 from MetaMask/refactor-settingsAlexander Tseung2018-09-211-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix translation casingAlexander Tseung2018-09-211-2/+2
| * | | | | | | Add Current Conversion Updated string to translationsAlexander Tseung2018-09-201-0/+3
| * | | | | | | Refactor settings page to use JSX and follow component file folder structureAlexander Tseung2018-09-201-0/+9
| |/ / / / / /
* | | | | | | Remove EAL google analytics link. (#5081)Dan Finlay2018-09-201-1/+1
* | | | | | | Update messages.json (#5280)Kevin Serrano2018-09-201-0/+9
|/ / / / / /
* | | | | | Version 4.10.0tmashuang2018-09-181-1/+1
* | | | | | Merge branch 'develop' into eip-712Paul Bouchon2018-09-181-0/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | EIP-1102: Transitionary API (#5256)Paul Bouchon2018-09-151-0/+19
* | | | | | Update new method namespace from v2 to v3bitpshr2018-09-142-3/+3
* | | | | | Update error message for chainId mis-matchbitpshr2018-09-141-1/+1
* | | | | | Implement latest EIP-712 protocolbitpshr2018-09-142-39/+112
|/ / / / /
* | | | | Fix identicon address. Fix styling of New Contract recipient. Fix Activity Lo...Alexander Tseung2018-09-131-5/+8
* | | | | Add TransactionListItemDetails componentAlexander Tseung2018-09-131-0/+3
* | | | | Add tests for TransactionActivityLog. Make changes to rendering eventsAlexander Tseung2018-09-131-0/+24
* | | | | Add ActivityLog componentAlexander Tseung2018-09-131-0/+3
* | | | | Merge pull request #5240 from MetaMask/i5238-account-balance-updateDan Finlay2018-09-121-0/+3
|\ \ \ \ \
| * | | | | Ensure account-tracker currentBlockNumber is set on first block update.Dan Miller2018-09-111-0/+3
* | | | | | Default NoticeController ctor opts to empty objWhymarrh Whitby2018-09-121-1/+1
* | | | | | Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-124-341/+27
|/ / / / /
* | | | | Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-113-2/+73
|\ \ \ \ \
| * | | | | Add createCancelTransaction methodAlexander Tseung2018-09-113-2/+73
* | | | | | Merge pull request #5223 from whymarrh/tx-error-tooltipsFrankie2018-09-111-0/+1
|\ \ \ \ \ \
| * | | | | | Attach the RPC error value to txMetaWhymarrh Whitby2018-09-091-0/+1
| |/ / / / /
* / / / / / Upgrade obs-store and fix memory leaksConnor Christie2018-09-101-3/+7
|/ / / / /
* | | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-dataDan J Miller2018-09-041-0/+6
|\ \ \ \ \
| * | | | | Adds feature flag toggle for the hex data row on the send screen.Dan Miller2018-08-271-0/+6
* | | | | | Merge pull request #5115 from jdetychey/patch-1Dan J Miller2018-09-041-1/+1
|\ \ \ \ \ \
| * | | | | | Typo in "send" translationJerome de Tychey2018-08-221-1/+1
* | | | | | | fix conflictsEsteban MIno2018-08-2913-153/+798
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #4919 from MetaMask/refactor-tx-listDan Finlay2018-08-281-1/+22
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix naming, add eth.getCode check for actions, fix translations for statusesAlexander Tseung2018-08-241-0/+3
| | * | | | | | Change "Outgoing" to "Sent Ether" or "Sent Token"Alexander Tseung2018-08-241-0/+6
| | * | | | | | Fix integration testsAlexander Tseung2018-08-241-0/+3
| | * | | | | | Use css grid for TransactionListItem for responsive layoutAlexander Tseung2018-08-241-6/+6
| | * | | | | | Refactor transactions list views. Add redesign componentsAlexander Tseung2018-08-241-1/+10
| * | | | | | | Do not resolve .test domains using ENSbitpshr2018-08-252-2/+1
| |/ / / / / /
| * | | | | | update Korean translation (#4630)HackyMiner2018-08-241-124/+698
| * | | | | | updated docs, small improvement of recent RPC renderingEvgeniy Filatov2018-08-231-1/+1
| * | | | | | implemented improvements to RPC historyEvgeniy Filatov2018-08-231-1/+1
| * | | | | | Merge pull request #5122 from MetaMask/lazy-account-trackerDan Finlay2018-08-232-2/+37
| |\ \ \ \ \ \
| | * | | | | | Add todo to dedupe UI tracking in backgroundDan Finlay2018-08-231-0/+1
| | * | | | | | account-tracker - only track blocks when there are activeControllerConnectionskumavis2018-08-222-2/+24
| | * | | | | | metamask controller - track active controller connectionskumavis2018-08-221-0/+12
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #5066 from whymarrh/fix-key-exportWhymarrh Whitby2018-08-231-13/+29
| |\ \ \ \ \ \
| | * | | | | | Update unlock logic to not overwrite existing selected addressWhymarrh Whitby2018-08-231-13/+29
| | |/ / / / /
| * / / / / / Add new variant for SenderToRecipient componentAlexander Tseung2018-08-237-9/+9
| |/ / / / /
* | | | | | watchAsset small changesEsteban MIno2018-08-281-1/+1
* | | | | | delete web3.metamassk.watchAssetEsteban MIno2018-08-241-17/+0
* | | | | | typo watchAsset imageUrl to imageEsteban MIno2018-08-241-6/+6
* | | | | | expose web3.metamask.watchAssetEsteban MIno2018-08-231-0/+17
* | | | | | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-229-279/+10
|\| | | | |
| * | | | | Merge pull request #5109 from MetaMask/MoveOutInpageProviderDan Finlay2018-08-227-276/+4
| |\ \ \ \ \
| | * | | | | Move inpage-provider and port-stream outsideDan Finlay2018-08-217-276/+4
| * | | | | | Merge pull request #5118 from MetaMask/provider2-bugfixDan Finlay2018-08-221-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | bugfix - prevents old blocktracker from getting internal hooks migratedkumavis2018-08-221-1/+1
| | |/ / / /
| * | | | | fix hardware wallets account namebrunobar792018-08-211-1/+3
| * | | | | fix account removalbrunobar792018-08-211-1/+2
| |/ / / /
* | | | | returning error in watchAssetEsteban MIno2018-08-221-4/+12
* | | | | refactor watchToken related functionsEsteban MIno2018-08-211-37/+36
* | | | | watchAsset returns result wether token was added or notEsteban MIno2018-08-213-10/+30
* | | | | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-2146-501/+864
|\| | | |
| * | | | Update logo wordmarkAlexander Tseung2018-08-192-0/+115
| * | | | Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-181-2/+47
| |\ \ \ \
| | * | | | Restores accounts until one with a zero balance is foundDan Matthews2018-08-171-2/+47
| | * | | | Merge pull request #4279 from MetaMask/network-remove-provider-engineDan Finlay2018-08-1621-369/+489
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge branch 'develop' into network-remove-provider-engineThomas2018-08-1528-54/+251
| | | |\ \ \
| | | * \ \ \ Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-08-072-23/+29
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'network-remove-provider-engine' into network-remove-provider-en...frankiebee2018-08-071-1/+1
| | | |\ \ \ \ \
| | | | * | | | | network - fix blockTracker reference to return the blockTrackerProxy instead ...frankiebee2018-08-071-1/+1
| | | * | | | | | Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-028-16/+104
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'develop' into network-remove-provider-engineThomas2018-07-2640-28/+1242
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0425-51/+50
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0316-83/+154
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | lint - fix lint for networkkumavis2018-06-133-3/+0
| | | * | | | | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache mi...kumavis2018-06-133-37/+4
| | | * | | | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
| | | * | | | | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST...kumavis2018-06-121-1/+2
| | | * | | | | | | | | test - e2e - inject metamask config to point at localhostkumavis2018-06-121-1/+3
| | | * | | | | | | | | lint - controllers - whitepace fixkumavis2018-06-121-5/+5
| | | * | | | | | | | | network - provider - infura - use block-reemit middlewarekumavis2018-06-081-2/+2
| | | * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-083-0/+22
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-076-4/+86
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | lint - remove unused requirekumavis2018-06-071-1/+0
| | | * | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-0714-28/+305
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
| | | * | | | | | | | | | | | controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
| | | * | | | | | | | | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| | | * | | | | | | | | | | | metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
| | | * | | | | | | | | | | | controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
| | | * | | | | | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-294-96/+69
| | | * | | | | | | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until bloc...kumavis2018-05-261-1/+10
| | | * | | | | | | | | | | | tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
| | | * | | | | | | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet middleware...kumavis2018-05-251-1/+13
| | | * | | | | | | | | | | | provider - update wallet hooks for new wallet middlewarekumavis2018-05-254-64/+110
| | | * | | | | | | | | | | | metamask-controller - fix account lookup hookkumavis2018-05-251-2/+2
| | | * | | | | | | | | | | | account-tracker - guard against empty blockkumavis2018-05-251-1/+2
| | | * | | | | | | | | | | | controllers - recent-blocks - guard against empty blockkumavis2018-05-251-3/+3
| | | * | | | | | | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catchkumavis2018-05-241-1/+7
| | | * | | | | | | | | | | | Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask...kumavis2018-05-242-9/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-242-9/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-2314-67/+215
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-7/+18
| | | | | * | | | | | | | | | | | | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
| | | * | | | | | | | | | | | | | | sentry - setupRaven - ensure message is truthykumavis2018-05-241-2/+2
| | | * | | | | | | | | | | | | | | controllers - recent-blocks - ensure full blockskumavis2018-05-241-2/+2
| | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | controllers - account-tracker - refactor + update for eth-block-tracker@4kumavis2018-05-241-67/+56
| | | * | | | | | | | | | | | | | controllers - recent-blocks - doc updatekumavis2018-05-241-4/+4
| | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-231-15/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-2313-52/+208
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | recent-blocks - fix backfill blockNumber trackingkumavis2018-05-171-3/+2
| | | * | | | | | | | | | | | | | controllers - recent-blocks - fix pifyd setTimeout argskumavis2018-05-171-1/+1
| | | * | | | | | | | | | | | | | deps - fix incorrect dep paths and versionskumavis2018-05-174-4/+4
| | | * | | | | | | | | | | | | | controllers - balance - update for eth-block-tracker@4kumavis2018-05-171-3/+3
| | | * | | | | | | | | | | | | | recent-blocks - update for eth-block-tracker@4kumavis2018-05-171-27/+14
| | | * | | | | | | | | | | | | | remove unused events-proxy, was replaced with module swappable-obj-proxykumavis2018-05-172-43/+0
| | | * | | | | | | | | | | | | | lint fixkumavis2018-05-175-13/+18
| | | * | | | | | | | | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-178-70/+217
| | * | | | | | | | | | | | | | | v4.9.3v4.9.3Thomas2018-08-161-1/+1
| | * | | | | | | | | | | | | | | Merge pull request #5037 from MetaMask/masterDan Finlay2018-08-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | v4.9.2Thomas2018-08-101-1/+1
| * | | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-1822-370/+490
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:18:15 +0800