aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Switch existing modals from using Notification to Modal. Remove Notification ↵Alexander Tseung2018-09-2038-323/+518
| | | | component. Add CancelTransaction modal
* Add withModalProps HOCAlexander Tseung2018-09-202-0/+22
|
* Fix Transaction view stylesAlexander Tseung2018-09-203-3/+9
|
* Add Modal componentAlexander Tseung2018-09-207-0/+186
|
* Refactor ConfirmPageContainerError to ErrorMessageAlexander Tseung2018-09-208-18/+14
|
* Merge pull request #5290 from MetaMask/i5289-gettokendataDan Finlay2018-09-192-2/+24
|\ | | | | Fix exception thrown on getTokenData
| * Fix exception thrown on getTokenDataAlexander Tseung2018-09-192-2/+24
|/
* Merge pull request #5268 from lastblocklabs/issue-5231v4.10.0Dan Finlay2018-09-181-3/+5
|\ | | | | Improvement: Allow enter to submit password form
| * Improvement: Allow enter to submit password formSean Rabaut2018-09-151-3/+5
| |
* | Merge pull request #5281 from MetaMask/4.10.0Dan Finlay2018-09-182-2/+11
|\ \ | | | | | | Version 4.10.0
| * | Version 4.10.0tmashuang2018-09-181-1/+1
| | |
| * | Bump Changelogtmashuang2018-09-181-1/+10
|/ /
* | Merge pull request #4803 from MetaMask/eip-712Dan Finlay2018-09-1810-179/+582
|\ \ | | | | | | EIP-712: Sign typed data
| * \ Merge branch 'develop' into eip-712Paul Bouchon2018-09-189-18/+74
| |\ \ | |/ / |/| |
* | | compute and display checksummed hash in selected-account component (#5255)Chad Grimaldi2018-09-162-3/+20
| | |
* | | Improvement: Increase click area for arrows (#5264)Sean2018-09-162-6/+18
| | |
* | | Merge pull request #5270 from MetaMask/fix-retryAlexander Tseung2018-09-162-5/+12
|\ \ \ | | | | | | | | Fix speed up functionality
| * | | Fix speed up functionalityAlexander Tseung2018-09-152-5/+12
|/ / /
* | / EIP-1102: Transitionary API (#5256)Paul Bouchon2018-09-152-0/+20
| |/ |/|
* | Merge pull request #5261 from lastblocklabs/style-fix-5242Whymarrh Whitby2018-09-151-3/+3
|\ \ | | | | | | lower input z-index to prevent overlap - follow up style fix to #5242
| * | follow up style fix to #5242chadmg2018-09-141-3/+3
| | |
* | | Merge pull request #5262 from lastblocklabs/issue-5183-jsonimportAlexander Tseung2018-09-141-1/+1
|\ \ \ | |/ / |/| | Bug Fix: #5183 history not defined
| * | Bug Fix: #5183 history not definedSean Rabaut2018-09-141-1/+1
|/ /
| * Update new method namespace from v2 to v3bitpshr2018-09-144-9/+9
| |
| * Update error message for chainId mis-matchbitpshr2018-09-141-1/+1
| |
| * Implement latest EIP-712 protocolbitpshr2018-09-1410-179/+582
|/
* Merge pull request #5247 from MetaMask/AddDocsDan Finlay2018-09-143-46/+60
|\ | | | | Add jsdoc gh-pages script
| * Add jsdoc gh-pages scriptDan Finlay2018-09-133-46/+60
| |
* | Merge pull request #5182 from MetaMask/tx-activityAlexander Tseung2018-09-1369-328/+1449
|\ \ | | | | | | Add Transaction Details to the Transaction List view
| * | Fix identicon address. Fix styling of New Contract recipient. Fix Activity ↵Alexander Tseung2018-09-139-18/+47
| | | | | | | | | | | | Log initial ETH value. Add timestamps to Activity Log events
| * | Fix tests. Add className to Identicon ethLogos.Alexander Tseung2018-09-135-10/+13
| | |
| * | Add WEI to getEthConversionFromWeiHexAlexander Tseung2018-09-131-1/+1
| | |
| * | Add transaction details to TransactionListItem componentAlexander Tseung2018-09-133-37/+46
| | |
| * | Add TransactionListItemDetails componentAlexander Tseung2018-09-136-0/+203
| | |
| * | Add TransactionBreakdown componentAlexander Tseung2018-09-139-0/+240
| | |
| * | Add tests for TransactionActivityLog. Make changes to rendering eventsAlexander Tseung2018-09-1310-42/+349
| | |
| * | Edit styling of cards variant of SenderToRecipient componentAlexander Tseung2018-09-131-1/+1
| | |
| * | Add HexToDecimal componentAlexander Tseung2018-09-134-161/+48
| | |
| * | Add tests for Card componentAlexander Tseung2018-09-132-1/+26
| | |
| * | Allow denominations in CurrencyDisplay componentAlexander Tseung2018-09-136-16/+85
| | |
| * | Allow more than 2 variable substitutions in the translation functionAlexander Tseung2018-09-131-4/+4
| | |
| * | Add raised type buttons to Button component. Refactor all buttons within app ↵Alexander Tseung2018-09-1318-94/+180
| | | | | | | | | | | | to Button components
| * | Add ActivityLog componentAlexander Tseung2018-09-1310-1/+264
| |/
* / increase z-index of send-to input to allow for right-click (#5242)Chad Grimaldi2018-09-131-0/+4
|/
* 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.
| * Ensure account-tracker currentBlockNumber is set on first block update.Dan Miller2018-09-111-0/+3
| |
* | Merge pull request #5237 from whymarrh/update-fxDan Finlay2018-09-121-1/+1
|\ \ | | | | | | Update Firefox version for e2e tests
| * | Update Firefox version for e2e testsWhymarrh Whitby2018-09-121-1/+1
| |/
* | Merge pull request #5236 from whymarrh/excise-config-managerDan Finlay2018-09-1213-490/+76
|\ \ | |/ |/| Delete ConfigManager class and replace its valid usages
| * Default NoticeController ctor opts to empty objWhymarrh Whitby2018-09-122-2/+2
| |
| * Add html reporter to test coverage outputWhymarrh Whitby2018-09-122-1/+2
| |
| * Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-1210-488/+73
|/
* Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-114-2/+98
|\ | | | | Add createCancelTransaction method
| * Add createCancelTransaction methodAlexander Tseung2018-09-114-2/+98
| |
* | Merge pull request #5223 from whymarrh/tx-error-tooltipsFrankie2018-09-116-31/+78
|\ \ | | | | | | Show transaction error message tooltips for statuses
| * | Show failed tx txMeta.err in tooltipsWhymarrh Whitby2018-09-091-1/+1
| | |
| * | Show failed tx RPC error messages in tooltipsWhymarrh Whitby2018-09-092-2/+15
| | | | | | | | | | | | | | | | | | This changeset displays the error messages attached to txMeta for a failed tx in a tooltip on hover in the tx list view. This will only display for txs with the `txMeta.err.rpc.value` property, not all failed txs.
| * | Don't render tooltips without titlesWhymarrh Whitby2018-09-091-0/+8
| | |
| * | Rewrite Tooltip component as ES6Whymarrh Whitby2018-09-093-30/+55
| | |
| * | Attach the RPC error value to txMetaWhymarrh Whitby2018-09-091-0/+1
| |/
* | Merge pull request #5229 from whymarrh/fix-confirm-seed-wordsDan Finlay2018-09-111-2/+8
|\ \ | | | | | | Clear old seed words when importing new seed words
| * | Clear old seed words when importing new seed wordsWhymarrh Whitby2018-09-111-2/+8
| |/
* | Merge pull request #5228 from ConnorChristie/memory-leaksDan Finlay2018-09-113-8/+12
|\ \ | |/ |/| Upgrade obs-store and fix memory leaks
| * Upgrade obs-store and fix memory leaksConnor Christie2018-09-103-8/+12
|/
* Merge pull request #5212 from whymarrh/yo-deleteWhymarrh Whitby2018-09-071-3/+0
|\ | | | | Remove unused .yo-rc.json file
| * Remove unused .yo-rc.json fileWhymarrh Whitby2018-09-061-3/+0
| |
* | Merge pull request #5213 from whymarrh/regen-lockfileWhymarrh Whitby2018-09-071-48/+125
|\ \ | |/ |/| Regenerate lockfile
| * Regenerate lockfileWhymarrh Whitby2018-09-061-48/+125
|/ | | | Refs #5138
* Use correct loading message when connecting to Kovan (#5189)Eugene Marinelli2018-09-062-1/+2
| | | | | | | | | | * Use correct loading message when connecting to Kovan * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md
* Merge pull request #5206 from whymarrh/fix-send-content-testsWhymarrh Whitby2018-09-061-1/+1
|\ | | | | Fix assertion of missing child component
| * Fix assertion of missing child componentWhymarrh Whitby2018-09-061-1/+1
|/
* Merge pull request #5188 from taobun/developDan J Miller2018-09-053-3/+3
|\ | | | | edit decimal check in old-ui/
| * fix check valid decimals code in new uibunoi2018-09-051-1/+1
| |
| * edit decimal check in old-ui/bunoi2018-09-032-2/+2
| |
* | Merge pull request #5167 from MetaMask/fix-watcAsset-imagesDan Finlay2018-09-0516-11/+54
|\ \ | | | | | | Fix images for watched tokens
| * | add assetImages to development statesEsteban MIno2018-08-313-0/+3
| | |
| * | balance components using selectorsEsteban MIno2018-08-313-5/+5
| | |
| * | 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 #5129 from MetaMask/add-sidebar-componentDan J Miller2018-09-0523-76/+267
|\ \ \ | | | | | | | | Add sidebar component
| * | | Adds sidebar component and refactors slide in wallet view sidebar to use it.Dan Miller2018-08-2924-76/+290
| | | |
* | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-dataDan J Miller2018-09-0411-4/+77
|\ \ \ \ | | | | | | | | | | Adds feature flag toggle for the hex data row on the send screen.
| * | | | Adds feature flag toggle for the hex data row on the send screen.Dan Miller2018-08-2711-4/+77
| | | | |
* | | | | Merge pull request #5115 from jdetychey/patch-1Dan J Miller2018-09-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Typo in "send" translation
| * | | | | Typo in "send" translationJerome de Tychey2018-08-221-1/+1
| | | | | | | | | | | | | | | | | | send should be translated as Envoyer instead of Envoyé (which mean sent, not send)
* | | | | | Merge pull request #5191 from eugeneiiim/patch-2Dan J Miller2018-09-041-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix CHANGELOG.md formatting
| * | | | | | Fix CHANGELOG.md formattingEugene Marinelli2018-09-041-4/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0Dan J Miller2018-09-041-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update enzyme to the latest version 🚀
| * | | | | chore(package): update enzyme-adapter-react-15 to version 1.0.6greenkeeper[bot]2018-08-251-1/+1
| | | | | |
| * | | | | chore(package): update enzyme to version 3.4.4greenkeeper[bot]2018-08-251-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #5176 from MetaMask/BumpTokenAbiDan Finlay2018-08-312-1/+24
|\ \ \ \ \ | |_|_|_|/ |/| | | | Bump human-standard-token-abi version for DAI support
| * | | | Bump human-standard-token-abi version for DAI supportDan Finlay2018-08-312-1/+24
|/ / / /
* | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinnerAlexander Tseung2018-08-294-7/+20
|\ \ \ \ | |_|_|/ |/| | | Fix infinite spinner on failed transactions
| * | | Fix infinite spinner on failed transactionsAlexander Tseung2018-08-294-7/+20
| | | |
* | | | Merge pull request #4606 from MetaMask/WatchTokenFeatureBruno Barbieri2018-08-2924-6184/+6858
|\ \ \ \ | |/ / / |/| | | Add metamask_watchAsset
| * | | fix conflictsEsteban MIno2018-08-29123-2426/+3454
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #5121 from MetaMask/i5099-approveAlexander Tseung2018-08-281-29/+87
|\ \ \ \ | | | | | | | | | | Prevent token symbol from showing as null in the confirm screen
| * | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | Refactor and Redesign Transaction List
| * | | | Revert changes to tx-list-items.json, and to mock getTransactionCount method ↵Dan Miller2018-08-282-2/+2
| | | | | | | | | | | | | | | | | | | | in tx-list-items integration test.
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | Disable .test ENS resolution
| * | | | Do not resolve .test domains using ENSbitpshr2018-08-252-2/+1
|/ / / /
* | | | update Korean translation (#4630)HackyMiner2018-08-241-124/+698
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update Korean translation * update Korean translation, add updated missing strings * update Korean i18n messages
* | | | Merge pull request #5096 from evgeniuz/developDan J Miller2018-08-234-11/+76
|\ \ \ \ | | | | | | | | | | implemented improvements to RPC history
| * | | | 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
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Minimum supported browsers and version standard: add browsers and targets to .babelrc and package.json * Regenerate package.json, fix issue with comma in merge * Resolve merge conflicts * Regenerate package-lock.json * Revert to previous package-lock.json
* | | Merge pull request #5089 from MetaMask/i5085-ethcodeAlexander Tseung2018-08-235-37/+99
|\ \ \ | | | | | | | | Use eth_getCode to sort transaction action type
| * | | 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
|\ \ \ \ | |/ / / |/| | | Add tabs support for PageContainer
| * | | 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
|\ \ \ | | | | | | | | Network IO Optimization: Lazy AccountTracker
| * | | 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
|\ \ \ \ | | | | | | | | | | Fix export privkey modal password bugs
| * | | | 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
|\ \ \ \ | | | | | | | | | | Don't re-render the export modal when the selected identity changes
| * | | | 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 component
| * | | 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 outside
| * | | Move inpage-provider and port-stream outsideDan Finlay2018-08-219-284/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream. To reduce the size of its dependencies, I have moved the [metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream). This allows them to be more easily depended & iterated on by external projects.
* | | | Merge pull request #5118 from MetaMask/provider2-bugfixDan Finlay2018-08-223-13/+20
|\ \ \ \ | | | | | | | | | | bugfix - prevents old blocktracker from getting internal hooks migrated
| * | | | 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
|\ \ \ \ | |_|_|/ |/| | | Fix e2e tests: adapt ganache flags and remove unnecessary checks
| * | | 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
|\ \ \ \ | |_|/ / |/| | | Hardware wallet fixes
| * | | 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 wordmark
| * | Update logo wordmarkAlexander Tseung2018-08-198-56/+143
| | |
* | | Merge pull request #5090 from whymarrh/fix-cikumavis2018-08-185-151/+99
|\ \ \ | |/ / |/| | Update CircleCI configuration to use workspaces instead of caches
| * | ci: Use workspaces instead of caches for passing data downstreamWhymarrh Whitby2018-08-181-89/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CircleCI no longer allows external PR builds to save caches so jobs that depend on cached data from a upstream job will no longer get the files they need. This change replaces our usages of caches for passing data downstream with workspaces, which appear to be the more correct feature to use. References: - https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs - https://circleci.com/blog/deep-diving-into-circleci-workspaces/
| * | 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
|/ / | | | | | | | | | | | | | | | | Two important notes: 1. The time it takes to download is negligble compared to e2e test runs 2. Since we cannot use environment variables in CircleCI cache keys we can't cache the download correctly and have it update when we switch firefox versions—this isn't the end of the world because of point 1
* | Merge pull request #5050 from MetaMask/ledger-supportDan Finlay2018-08-1818-198/+559
|\ \ | | | | | | Add Ledger hardware wallet support
| * \ 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
|\ \ \ | | | | | | | | Restore multiple consecutive accounts with balances.
| * | | 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
| | | | | | | | | Fix for #2855 which is gone from master for some reason
* | | Merge pull request #4279 from MetaMask/network-remove-provider-engineDan Finlay2018-08-1643-2918/+1285
|\ \ \ | | | | | | | | Enhancement: New BlockTracker and Json-Rpc-Engine based Provider
| * | | 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
| |\ \ \ | | | | | | | | | | | | | | | Override package-lock and fix merge conflicts
| * | | | 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 ↵frankiebee2018-08-081-32211/+32287
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into network-remove-provider-engine
| | * | | | deps - update package-lockfrankiebee2018-08-071-32211/+32287
| | | | | |
| * | | | | lint fixesfrankiebee2018-08-081-2/+2
| |/ / / /
| * | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵frankiebee2018-08-0718-598/+235
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into network-remove-provider-engine-tests
| * \ \ \ \ Merge branch 'network-remove-provider-engine' into ↵frankiebee2018-08-071-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine-tests
| | * | | | | network - fix blockTracker reference to return the blockTrackerProxy instead ↵frankiebee2018-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | of the direct blockTracker reference
| * | | | | | 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 ↵kumavis2018-07-041-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-04134-773/+800
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | 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 …
| | * | | | | | | | | | 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 ↵kumavis2018-07-03100-32518/+33751
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | | | lint - fix lint for networkkumavis2018-06-133-3/+0
| | | | | | | | | | | |
| * | | | | | | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache ↵kumavis2018-06-135-41/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware order
| * | | | | | | | | | | 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 ↵kumavis2018-06-124-47/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | METAMASK_TEST_CONFIG
| * | | | | | | | | | | 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 ↵kumavis2018-06-08168-1486/+7741
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-0730-85/+300
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
generated by cgit (git 2.34.1) at 2024-10-18 03:30:56 +0800