aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix integration test for asset images selectorsEsteban MIno2018-08-312-2/+2
* fix watched tokens images showing in tx listEsteban MIno2018-08-314-4/+16
* fix watched asset image rendering on confirm transaction headerEsteban MIno2018-08-302-1/+5
* fix images for watched tokensEsteban MIno2018-08-308-4/+28
* Merge pull request #5155 from MetaMask/i5154-confirm-spinnerAlexander Tseung2018-08-294-7/+20
|\
| * Fix infinite spinner on failed transactionsAlexander Tseung2018-08-294-7/+20
* | Merge pull request #4606 from MetaMask/WatchTokenFeatureBruno Barbieri2018-08-2924-6184/+6858
|\ \ | |/ |/|
| * fix conflictsEsteban MIno2018-08-29123-2426/+3454
| |\ | |/ |/|
* | Merge pull request #5121 from MetaMask/i5099-approveAlexander Tseung2018-08-281-29/+87
|\ \
| * | Use eth-contract-metadata data if the token symbol or decimals fail on retrievalAlexander Tseung2018-08-231-29/+87
* | | Merge pull request #4919 from MetaMask/refactor-tx-listDan Finlay2018-08-2892-8116/+8102
|\ \ \
| * | | Revert changes to tx-list-items.json, and to mock getTransactionCount method ...Dan Miller2018-08-282-2/+2
| * | | Fix testsAlexander Tseung2018-08-246-15/+25
| * | | Fix naming, add eth.getCode check for actions, fix translations for statusesAlexander Tseung2018-08-2424-97/+85
| * | | Reduce large timeoutsAlexander Tseung2018-08-241-6/+6
| * | | Increase e2e timeouts for firefoxAlexander Tseung2018-08-241-7/+7
| * | | Change "Outgoing" to "Sent Ether" or "Sent Token"Alexander Tseung2018-08-244-8/+14
| * | | Fix Firefox e2e testsAlexander Tseung2018-08-241-2/+2
| * | | Fix integration testsAlexander Tseung2018-08-241-1/+1
| * | | Update package-lock.jsonAlexander Tseung2018-08-241-6126/+6121
| * | | Add CurrencyDisplay and TokenCurrencyDisplay componentsAlexander Tseung2018-08-2414-74/+425
| * | | Fix e2e testsAlexander Tseung2018-08-242-14/+6
| * | | Fix integration testsAlexander Tseung2018-08-241-1/+1
| * | | Update retry transaction logic to use network nonceAlexander Tseung2018-08-243-12/+46
| * | | Fix e2e testsAlexander Tseung2018-08-247-91/+108
| * | | Fix integration testsAlexander Tseung2018-08-2414-28/+47
| * | | Fix e2e testsAlexander Tseung2018-08-242-8/+8
| * | | Fix shapeshift transactions. Delete unused filesAlexander Tseung2018-08-249-689/+34
| * | | Show token amounts in TransactionListItem for token transfersAlexander Tseung2018-08-2410-79/+75
| * | | Fix testsAlexander Tseung2018-08-241-10/+7
| * | | Add retry button to TransactionListItemAlexander Tseung2018-08-2411-50/+175
| * | | Code cleanupAlexander Tseung2018-08-242-30/+14
| * | | Use css grid for TransactionListItem for responsive layoutAlexander Tseung2018-08-249-72/+94
| * | | Add tOrKey function to I18nProviderAlexander Tseung2018-08-241-2/+9
| * | | Update package-lock.jsonAlexander Tseung2018-08-241-11/+28
| * | | Refactor transactions list views. Add redesign componentsAlexander Tseung2018-08-2440-381/+936
| * | | Delete unused filesAlexander Tseung2018-08-243-189/+0
| * | | Add withMethodData HOC, add higher-order-component folderAlexander Tseung2018-08-2410-25/+75
| * | | Add TransactionStatus componentAlexander Tseung2018-08-243-0/+67
| * | | Add MenuBar componentAlexander Tseung2018-08-244-0/+97
| * | | Add react-media package to prevent rendering wallet-view twice in the popup viewAlexander Tseung2018-08-242-1/+6
| * | | Refactor home screen and remove unused filesAlexander Tseung2018-08-2410-620/+116
* | | | Merge pull request #5136 from MetaMask/remove-test-ensDan Finlay2018-08-252-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Do not resolve .test domains using ENSbitpshr2018-08-252-2/+1
|/ / /
* | | update Korean translation (#4630)HackyMiner2018-08-241-124/+698
* | | Merge pull request #5096 from evgeniuz/developDan J Miller2018-08-234-11/+76
|\ \ \
| * | | updated docs, small improvement of recent RPC renderingEvgeniy Filatov2018-08-233-4/+6
| * | | backported RPC improvements to olduiEvgeniy Filatov2018-08-232-5/+6
| * | | implemented improvements to RPC historyEvgeniy Filatov2018-08-233-5/+67
| |/ /
* / / Minimum Browsers Supported (#4873)Antoine Nauleau2018-08-232-2/+6
|/ /
* | Merge pull request #5089 from MetaMask/i5085-ethcodeAlexander Tseung2018-08-235-37/+99
|\ \
| * | Use eth_getCode to sort transaction action typeAlexander Tseung2018-08-235-37/+99
* | | Merge pull request #4830 from MetaMask/page-container-tabsAlexander Tseung2018-08-236-86/+125
|\ \ \ | |/ / |/| |
| * | Fix code readability, use PureComponent over ComponentAlexander Tseung2018-08-233-33/+23
| * | Add tabs support for PageContainerAlexander Tseung2018-08-236-84/+133
|/ /
* | 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 #5102 from whymarrh/fix-account-export-pw-bugWhymarrh Whitby2018-08-232-5/+20
|\ \ \
| * | | Clear warnings when exportAccount succeedsWhymarrh Whitby2018-08-231-4/+19
| * | | Handle case where keyring is missing in AccountDetailsModalWhymarrh Whitby2018-08-231-1/+1
| |/ /
* | | Merge pull request #5066 from whymarrh/fix-key-exportWhymarrh Whitby2018-08-234-23/+119
|\ \ \
| * | | Add test cases for MetaMaskController#_onKeyringControllerUpdateWhymarrh Whitby2018-08-231-0/+71
| * | | Update unlock logic to not overwrite existing selected addressWhymarrh Whitby2018-08-231-13/+29
| * | | Don't re-render the export modal when the selected identity changesWhymarrh Whitby2018-08-231-8/+17
| * | | Update AccountModalContainer to accept a selectedIdentity propWhymarrh Whitby2018-08-231-2/+2
| |/ /
* | | Merge pull request #5111 from MetaMask/sender-to-recipient2Alexander Tseung2018-08-2313-107/+210
|\ \ \ | |/ / |/| |
| * | Add new variant for SenderToRecipient componentAlexander Tseung2018-08-2313-107/+210
|/ /
| * watchAsset small changesEsteban MIno2018-08-282-2/+2
| * add watchAsset CHANGELOGEsteban MIno2018-08-241-0/+2
| * delete web3.metamassk.watchAssetEsteban MIno2018-08-241-17/+0
| * typo watchAsset imageUrl to imageEsteban MIno2018-08-2410-28/+28
| * expose web3.metamask.watchAssetEsteban MIno2018-08-231-0/+17
| * fix integration tests on balance component with new watchAssetEsteban MIno2018-08-221-3/+3
| * Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-2214-307/+100
| |\ | |/ |/|
* | Merge pull request #5109 from MetaMask/MoveOutInpageProviderDan Finlay2018-08-229-276/+72
|\ \
| * | Move inpage-provider and port-stream outsideDan Finlay2018-08-219-284/+87
* | | Merge pull request #5118 from MetaMask/provider2-bugfixDan Finlay2018-08-223-13/+20
|\ \ \
| * | | bugfix - prevents old blocktracker from getting internal hooks migratedkumavis2018-08-223-13/+20
| |/ /
* | | Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flagDan J Miller2018-08-222-15/+2
|\ \ \
| * | | Remove unnecessary checks and user actions in metamask-beta-ui.specDan Miller2018-08-222-15/+2
| * | | Run ganache with a blocktime flag for npm:run:ganache:start.Dan Miller2018-08-221-2/+2
* | | | Merge pull request #5112 from MetaMask/hardware-wallet-fixesBruno Barbieri2018-08-212-3/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | fix unit testsbrunobar792018-08-211-1/+1
| * | | fix hardware wallets account namebrunobar792018-08-211-1/+3
| * | | fix account removalbrunobar792018-08-211-1/+2
|/ / /
| | * unit tests for watchAssetEsteban MIno2018-08-222-2/+110
| | * returning error in watchAssetEsteban MIno2018-08-221-4/+12
| | * refactor watchToken related functionsEsteban MIno2018-08-214-46/+45
| | * watchAsset returns result wether token was added or notEsteban MIno2018-08-213-10/+30
| | * Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-21128-33151/+32991
| | |\ | |_|/ |/| |
* | | Merge pull request #5095 from MetaMask/i4953-update-logoDan Finlay2018-08-218-56/+143
|\ \ \ | |/ / |/| |
| * | Update logo wordmarkAlexander Tseung2018-08-198-56/+143
* | | Merge pull request #5090 from whymarrh/fix-cikumavis2018-08-185-151/+99
|\ \ \ | |/ / |/| |
| * | ci: Use workspaces instead of caches for passing data downstreamWhymarrh Whitby2018-08-181-89/+47
| * | ci: Install any npm@6Whymarrh Whitby2018-08-181-1/+1
| * | ci: Use Firefox 61.0.2Whymarrh Whitby2018-08-181-1/+1
| * | ci: Disable Firefox updatesWhymarrh Whitby2018-08-182-1/+24
| * | ci: Don't cache Firefox installWhymarrh Whitby2018-08-184-61/+28
|/ /
* | Merge pull request #5050 from MetaMask/ledger-supportDan Finlay2018-08-1818-198/+559
|\ \
| * \ Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-183-2/+111
| |\ \ | |/ / |/| |
* | | Merge pull request #4898 from dmvt/multi-account-restoreDan Finlay2018-08-183-2/+111
|\ \ \
| * | | Restores accounts until one with a zero balance is foundDan Matthews2018-08-173-2/+111
|/ / /
| * | update package-lock.jsonbrunobar792018-08-180-0/+0
| |\ \ | |/ / |/| |
* | | info.js Remove width element to fix email layout (#4588)Anatoli Babenia2018-08-161-1/+0
* | | Merge pull request #4279 from MetaMask/network-remove-provider-engineDan Finlay2018-08-1643-2918/+1285
|\ \ \
| * | | Remove commented out code for detect-token-testThomas2018-08-151-10/+0
| * | | Update eth-json-rpc-filtersThomas2018-08-152-1971/+18
| * | | E2E - Dont error on browser errorsThomas2018-08-151-1/+2
| * | | Merge branch 'develop' into network-remove-provider-engineThomas2018-08-1567-428/+1461
| |\ \ \
| * | | | Confirms new contract token in the popupThomas2018-08-141-6/+6
| * | | | DelayThomas2018-08-091-0/+1
| * | | | confirms a deplay contract tx in the popupThomas2018-08-091-0/+9
| * | | | Use develop e2e beta testsThomas2018-08-081-109/+34
| * | | | Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-08-081-32211/+32287
| |\ \ \ \
| | * | | | deps - update package-lockfrankiebee2018-08-071-32211/+32287
| * | | | | lint fixesfrankiebee2018-08-081-2/+2
| |/ / / /
| * | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-08-0718-598/+235
| |\ \ \ \
| * \ \ \ \ 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-0229-695/+1203
| |\ \ \ \ \ \
| * | | | | | | LintThomas Huang2018-07-311-2/+2
| * | | | | | | Set metamask controller network provider to localhostThomas Huang2018-07-313-2/+24
| * | | | | | | Disallow netConnections other than localhostsThomas2018-07-301-0/+4
| * | | | | | | Detect Tokens are weirdThomas2018-07-301-26/+31
| * | | | | | | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-26355-3796/+10262
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | test - unit - remove tests for obsolete methodskumavis2018-07-041-52/+0
| * | | | | | | deps - update lockkumavis2018-07-041-2/+26
| * | | | | | | test - run ganache rpc without vm errorskumavis2018-07-041-1/+1
| * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-041-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-04134-773/+800
| |\ \ \ \ \ \ \ \
| * | | | | | | | | test - e2e - contract test - add logskumavis2018-07-041-7/+9
| * | | | | | | | | test - e2e - fix missing importkumavis2018-07-031-1/+1
| * | | | | | | | | Merge branch 'develop' into network-remove-provider-enginekumavis2018-07-032-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #4711 from alextsg/network-remove-provider-enginekumavis2018-07-031-2/+15
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix notice screen incorrectly disabling Accept button after multiple noticesAlexander Tseung2018-07-031-2/+15
| |/ / / / / / / / / /
| * | | | | | | | | | test - e2e - move timingskumavis2018-07-031-1/+1
| * | | | | | | | | | test - e2e-beta - update some api callskumavis2018-07-031-6/+4
| * | | | | | | | | | dep - automated package-lock fixeskumavis2018-07-031-4/+42
| * | | | | | | | | | deps - update package-lockkumavis2018-07-031-190/+336
| * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-03100-32518/+33751
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | lint - fix lint for networkkumavis2018-06-133-3/+0
| * | | | | | | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache mi...kumavis2018-06-135-41/+8
| * | | | | | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
| * | | | | | | | | | | test - e2e - beta - from import - fix missing startup phasekumavis2018-06-121-0/+3
| * | | | | | | | | | | test - e2e - beta - dont select localhost as it is already setkumavis2018-06-122-20/+1
| * | | | | | | | | | | test - e2e - extensionUri should point to home.htmlkumavis2018-06-121-2/+2
| * | | | | | | | | | | test - e2e - remove usage of extensionId from testskumavis2018-06-124-28/+12
| * | | | | | | | | | | test - e2e - fix incomplete setup phasekumavis2018-06-122-2/+5
| * | | | | | | | | | | test - e2e - properly export setupBrowserAndExtensionkumavis2018-06-121-0/+1
| * | | | | | | | | | | test - e2e - more factoring of test setupkumavis2018-06-125-64/+27
| * | | | | | | | | | | test - e2e - use fs-extra instead of fskumavis2018-06-121-1/+1
| * | | | | | | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST...kumavis2018-06-124-47/+51
| * | | | | | | | | | | test - e2e - inject metamask config to point at localhostkumavis2018-06-125-23/+61
| * | | | | | | | | | | lint - controllers - whitepace fixkumavis2018-06-121-5/+5
| * | | | | | | | | | | test - e2e - reduce browser-specific codekumavis2018-06-121-20/+13
| * | | | | | | | | | | network - provider - infura - use block-reemit middlewarekumavis2018-06-083-28/+29
| * | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-08168-1486/+7741
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-0730-85/+300
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | lint - remove unused requirekumavis2018-06-071-1/+0
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-0788-416/+1325
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | test - unit - tx-controller - fix blockTracker stubkumavis2018-05-291-0/+1
| * | | | | | | | | | | | | | controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
| * | | | | | | | | | | | | | controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
| * | | | | | | | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
| * | | | | | | | | | | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| * | | | | | | | | | | | | | metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-298-15/+1013
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | test - unit - pending-tx-tracker - update method namekumavis2018-05-291-2/+2
| * | | | | | | | | | | | | | | test - unit - nonce-tracker - fix blockTracker stubkumavis2018-05-291-0/+1
| * | | | | | | | | | | | | | | controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
| * | | | | | | | | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-297-153/+78
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | test - unit - metamask-controller - remove logkumavis2018-05-261-1/+0
| * | | | | | | | | | | | | | | test - unit - code style nitpickkumavis2018-05-251-1/+2
| * | | | | | | | | | | | | | | test - unit - metamask-controller - fix many bugs in testskumavis2018-05-252-33/+61
| * | | | | | | | | | | | | | | test - unit - run ganache-server in backgroundkumavis2018-05-251-0/+7
| * | | | | | | | | | | | | | | test - unit - tx-controller-test - add history object to txMeta when using in...kumavis2018-05-251-31/+29
| * | | | | | | | | | | | | | | test - unit - move fetch polyfill to helperkumavis2018-05-253-6/+3
| * | | | | | | | | | | | | | | test - unit - metamask-controller - polyfill global.fetchkumavis2018-05-251-2/+4
| * | | | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for fetch bugfixkumavis2018-05-252-4/+4
| * | | | | | | | | | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet middleware...kumavis2018-05-251-1/+13
| * | | | | | | | | | | | | | | test - remove .only from unit testskumavis2018-05-251-1/+1
| * | | | | | | | | | | | | | | provider - update wallet hooks for new wallet middlewarekumavis2018-05-256-68/+114
| * | | | | | | | | | | | | | | deps - bump json-rpc modules for bugfixeskumavis2018-05-252-187/+403
| * | | | | | | | | | | | | | | 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-243-40/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-243-40/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-23122-17010/+4318
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-232-8/+19
| | | * | | | | | | | | | | | | | | | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
| | | * | | | | | | | | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ...frankiebee2018-05-231-32/+21
| * | | | | | | | | | | | | | | | | | deps - bump eth-block-tracker for bugfixkumavis2018-05-241-1/+1
| * | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | deps - eth-json-rpc-filters@2.0.0kumavis2018-05-231-1/+1
| * | | | | | | | | | | | | | | | | deps - eth-block-tracker@4.0.1kumavis2018-05-231-1/+1
| * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-23121-16993/+4309
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | recent-blocks - fix backfill blockNumber trackingkumavis2018-05-171-3/+2
| * | | | | | | | | | | | | | | | | test - unit - network - get providerProxy via public methodkumavis2018-05-171-4/+5
| * | | | | | | | | | | | | | | | | deps - bump some bugfixeskumavis2018-05-171-2/+2
| * | | | | | | | | | | | | | | | | controllers - recent-blocks - fix pifyd setTimeout argskumavis2018-05-171-1/+1
| * | | | | | | | | | | | | | | | | deps - fix incorrect dep paths and versionskumavis2018-05-175-7/+7
| * | | | | | | | | | | | | | | | | docs - remove references to web3-provider-enginekumavis2018-05-172-4/+1
| * | | | | | | | | | | | | | | | | deps - remove web3-provider-enginekumavis2018-05-171-1/+0
| * | | | | | | | | | | | | | | | | 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-1710-75/+224
* | | | | | | | | | | | | | | | | | Merge pull request #5061 from MetaMask/greenkeeper/@zxing/library-0.8.0Bruno Barbieri2018-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fix(package): update @zxing/library to version 0.8.0greenkeeper[bot]2018-08-141-1/+1
* | | | | | | | | | | | | | | | | | | Merge pull request #5076 from MetaMask/v4.9.3Dan Finlay2018-08-162-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | v4.9.3v4.9.3Thomas2018-08-161-1/+1
| * | | | | | | | | | | | | | | | | | | Bump ChangelogThomas2018-08-161-0/+6
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #5037 from MetaMask/masterDan Finlay2018-08-162-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5025 from MetaMask/v4.9.2v4.9.2.1Dan Finlay2018-08-1036-32551/+32635
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into v4.9.2Thomas Huang2018-08-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4954 from MetaMask/v4.9.0Dan Finlay2018-08-08487-36876/+44757
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Bump ChangelogThomas2018-08-071-1/+3
| | * | | | | | | | | | | | | | | | | | | | v4.9.0 ReleaseThomas2018-08-071-1/+1
| | * | | | | | | | | | | | | | | | | | | | Update ChangelogThomas2018-08-071-5/+10
| | | * | | | | | | | | | | | | | | | | | | Bump ChangelogThomas2018-08-101-0/+4
| | | * | | | | | | | | | | | | | | | | | | v4.9.2Thomas2018-08-101-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #5059 from MetaMask/e2e-tests-more-reliableDan J Miller2018-08-155-20/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Remove unnecessary else in test/e2e/beta/contract-test/contract.jsDan Miller2018-08-151-1/+2
| * | | | | | | | | | | | | | | | | | | | | | Add explicit waits for submitted status for some txs initiated from test dapp.Dan Miller2018-08-151-0/+7
| * | | | | | | | | | | | | | | | | | | | | | Reload e2e beta test browser if initial screen doesn't load.Dan Miller2018-08-152-2/+16
| * | | | | | | | | | | | | | | | | | | | | | Increase timeout on wait for contract status update in metamask-beta-ui-specDan Miller2018-08-151-1/+1
| * | | | | | | | | | | | | | | | | | | | | | Add missing awaits and/or missing wait timeouts in test/e2e/beta/metamask-bet...Dan Miller2018-08-141-9/+9
| * | | | | | | | | | | | | | | | | | | | | | Make deployment states in test/e2e/beta/contract-test/contract.js more explicitDan Miller2018-08-142-5/+6
| * | | | | | | | | | | | | | | | | | | | | | Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.jsDan Miller2018-08-141-5/+7
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * | fix merge conflictsbrunobar792018-08-1849-2934/+1358
| | | | | | | | | | | | | | | | | | | | * | fix ledger affiliate linkbrunobar792018-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | * | fix e2e testsbrunobar792018-08-171-1/+4
| | | | | | | | | | | | | | | | | | | | * | ui readybrunobar792018-08-174-11/+42
| | | | | | | | | | | | | | | | | | | | * | connect screen readybrunobar792018-08-175-32/+131
| | | | | | | | | | | | | | | | | | | | * | change Metamask for MetaMaskbrunobar792018-08-151-7/+1
| | | | | | | | | | | | | | | | | | | | * | update package-lock.jsonbrunobar792018-08-151-2/+3
| | | | | | | | | | | | | | | | | | | | * | Merge branch 'ledger-support' of github.com:MetaMask/metamask-extension into ...brunobar792018-08-1520-33/+66
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-1520-33/+66
| | | | | | | | | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5060 from MetaMask/bignumber-stringDan Finlay2018-08-153-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 07:48:49 +0800