aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsbrunobar792018-09-111-1/+1
|\
| * Use correct loading message when connecting to Kovan (#5189)Eugene Marinelli2018-09-061-1/+1
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-06131-2288/+3055
|\|
| * Fix assertion of missing child componentWhymarrh Whitby2018-09-061-1/+1
| * Merge pull request #5188 from taobun/developDan J Miller2018-09-051-1/+1
| |\
| | * fix check valid decimals code in new uibunoi2018-09-051-1/+1
| * | Merge pull request #5167 from MetaMask/fix-watcAsset-imagesDan Finlay2018-09-0513-11/+51
| |\ \
| | * | balance components using selectorsEsteban MIno2018-08-312-5/+5
| | * | fix integration test for asset images selectorsEsteban MIno2018-08-311-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-0514-76/+258
| |\ \
| | * | Adds sidebar component and refactors slide in wallet view sidebar to use it.Dan Miller2018-08-2914-76/+258
| * | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-dataDan J Miller2018-09-0410-4/+71
| |\ \ \ | | |_|/ | |/| |
| | * | Adds feature flag toggle for the hex data row on the send screen.Dan Miller2018-08-2710-4/+71
| * | | 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
| * | | fix conflictsEsteban MIno2018-08-2999-2166/+2404
| |\| |
| | * | 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
| | * | | Fix testsAlexander Tseung2018-08-241-2/+12
| | * | | Fix naming, add eth.getCode check for actions, fix translations for statusesAlexander Tseung2018-08-2422-96/+81
| | * | | Change "Outgoing" to "Sent Ether" or "Sent Token"Alexander Tseung2018-08-242-4/+4
| | * | | Add CurrencyDisplay and TokenCurrencyDisplay componentsAlexander Tseung2018-08-2414-74/+425
| | * | | Update retry transaction logic to use network nonceAlexander Tseung2018-08-243-12/+46
| | * | | Fix e2e testsAlexander Tseung2018-08-246-33/+30
| | * | | Fix integration testsAlexander Tseung2018-08-247-5/+24
| | * | | Fix e2e testsAlexander Tseung2018-08-241-1/+1
| | * | | Fix shapeshift transactions. Delete unused filesAlexander Tseung2018-08-249-689/+34
| | * | | Show token amounts in TransactionListItem for token transfersAlexander Tseung2018-08-2410-79/+75
| | * | | 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-248-66/+88
| | * | | Add tOrKey function to I18nProviderAlexander Tseung2018-08-241-2/+9
| | * | | Refactor transactions list views. Add redesign componentsAlexander Tseung2018-08-2439-380/+926
| | * | | 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-241-1/+5
| | * | | Refactor home screen and remove unused filesAlexander Tseung2018-08-2410-620/+116
| | | |/ | | |/|
| | * | updated docs, small improvement of recent RPC renderingEvgeniy Filatov2018-08-231-2/+3
| | * | backported RPC improvements to olduiEvgeniy Filatov2018-08-231-2/+1
| | * | implemented improvements to RPC historyEvgeniy Filatov2018-08-231-4/+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
| | * | Fix code readability, use PureComponent over ComponentAlexander Tseung2018-08-233-33/+23
| | * | Add tabs support for PageContainerAlexander Tseung2018-08-235-83/+132
| | |/
| | * 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-232-10/+19
| | |\ \
| | | * | 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
| | | |/
| | * / Add new variant for SenderToRecipient componentAlexander Tseung2018-08-235-96/+199
| | |/
| * | typo watchAsset imageUrl to imageEsteban MIno2018-08-248-15/+15
| * | fix integration tests on balance component with new watchAssetEsteban MIno2018-08-221-3/+3
| * | unit tests for watchAssetEsteban MIno2018-08-221-2/+0
| * | refactor watchToken related functionsEsteban MIno2018-08-213-9/+9
| * | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-2140-155/+920
| |\|
| * | delete according image when token added with watchToken deletedEsteban MIno2018-08-173-9/+9
| * | correct behavior when notification is closed when popupEsteban MIno2018-08-174-16/+23
| * | WIPEsteban MIno2018-08-173-3/+10
| * | show watch asset image from hide token modalEsteban MIno2018-08-162-12/+14
| * | add suggested tokens objects in metamask stateEsteban MIno2018-08-162-5/+4
| * | add support for images base64 and urls on new uiEsteban MIno2018-08-157-42/+63
| * | refactor unused codeEsteban MIno2018-08-084-15/+8
| * | Merge branch 'develop' into WatchTokenFeatureEsteban Miño2018-08-087-16/+27
| |\ \
| * | | watch token on old uiEsteban MIno2018-08-082-0/+18
| * | | clean confirm add token componentEsteban MIno2018-08-072-6/+2
| * | | new confirm add suggested token componentEsteban MIno2018-08-077-12/+161
| * | | fix duplicated actionEsteban MIno2018-08-071-6/+0
| * | | eth_watchToken workingEsteban MIno2018-08-044-3/+34
| * | | popup initializing with suggested tokensEsteban MIno2018-08-041-6/+2
| * | | rpc-engine not crashing when eth_watchTokenEsteban MIno2018-08-041-4/+0
| * | | merge developEsteban MIno2018-08-04296-3213/+7863
| |\ \ \
| * | | | LintedDan Finlay2018-06-191-0/+1
| * | | | Begin letting UI show suggested tokensDan Finlay2018-06-192-2/+13
* | | | | fix commentbrunobar792018-08-211-2/+0
* | | | | fix merge conflictsbrunobar792018-08-2135-144/+850
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update logo wordmarkAlexander Tseung2018-08-196-56/+28
| * | | | fix ledger affiliate linkbrunobar792018-08-171-1/+1
| * | | | ui readybrunobar792018-08-173-9/+37
| * | | | connect screen readybrunobar792018-08-172-27/+124
| * | | | Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-154-6/+6
| |\ \ \ \
| | * \ \ \ Merge pull request #5060 from MetaMask/bignumber-stringDan Finlay2018-08-153-4/+4
| | |\ \ \ \
| | | * | | | Cast arguments for new Bignumbers() to string.Dan Miller2018-08-153-4/+4
| | * | | | | Add exportAsFile optional type argumentWhymarrh Whitby2018-08-141-2/+2
| | |/ / / /
| * | | | | remove console logsbrunobar792018-08-151-1/+1
| * | | | | more uibrunobar792018-08-151-1/+2
| * | | | | fixbrunobar792018-08-151-1/+1
| * | | | | ui fixesbrunobar792018-08-154-23/+38
| * | | | | fix tx testsbrunobar792018-08-141-1/+2
| * | | | | legacy and new hd path workingbrunobar792018-08-143-24/+45
| * | | | | good progress adding pathsbrunobar792018-08-145-22/+121
| * | | | | message signing worksbrunobar792018-08-121-0/+1
| * | | | | rename keyringbrunobar792018-08-111-0/+1
| * | | | | able to add accountsbrunobar792018-08-112-3/+3
| * | | | | iframe communication workingbrunobar792018-08-111-1/+0
| * | | | | refactor to support multiple hw walletsbrunobar792018-08-114-27/+43
| |/ / / /
| * | | | Merge pull request #4897 from MetaMask/qr-code-scanBruno Barbieri2018-08-1117-6/+474
| |\ \ \ \
| | * | | | add commentbrunobar792018-08-091-0/+5
| | * | | | fix merge conflictsbrunobar792018-08-091-2/+8
| | |\ \ \ \
| | * | | | | add submit button typebrunobar792018-08-091-0/+1
| | * | | | | lintbrunobar792018-08-081-1/+1
| | * | | | | code review changesbrunobar792018-08-081-8/+17
| | * | | | | fix merge conflictsbrunobar792018-08-088-17/+28
| | |\ \ \ \ \
| | * | | | | | restore qrbrunobar792018-08-041-0/+2
| | * | | | | | lintbrunobar792018-08-041-1/+1
| | * | | | | | fixed issue with inputbrunobar792018-08-043-2/+6
| | * | | | | | clear qr code data before scanningbrunobar792018-08-041-0/+3
| | * | | | | | design completebrunobar792018-08-045-21/+117
| | * | | | | | fixbrunobar792018-08-011-1/+6
| | * | | | | | lintbrunobar792018-08-011-2/+0
| | * | | | | | added crossbrowser support and error handlingbrunobar792018-08-016-49/+112
| | * | | | | | send to fullscreen if no permission from popupbrunobar792018-07-312-11/+32
| | * | | | | | kill camera stream when unmoutingbrunobar792018-07-311-1/+4
| | * | | | | | copybrunobar792018-07-311-1/+1
| | * | | | | | clean up cssbrunobar792018-07-313-30/+58
| | * | | | | | use existing modalsbrunobar792018-07-3110-234/+164
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code...brunobar792018-07-314-6/+30
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | fix unit testsbrunobar792018-07-271-0/+2
| | * | | | | | fix dependenciesbrunobar792018-07-271-1/+1
| | * | | | | | fix linting errorsbrunobar792018-07-272-2/+2
| | * | | | | | clean upbrunobar792018-07-271-1/+0
| | * | | | | | fix merge conflictsbrunobar792018-07-2712-17/+426
| | |\ \ \ \ \ \
| | * | | | | | | added webrtc-adapter for browser compatbrunobar792018-07-271-0/+1
| | * | | | | | | fully working without tweaking ext. permissionbrunobar792018-07-274-3/+4
| | * | | | | | | working without permission issuesbrunobar792018-07-271-36/+44
| | * | | | | | | fix spinner and qr iconbrunobar792018-07-252-2/+6
| | * | | | | | | decent UIbrunobar792018-07-251-21/+43
| | * | | | | | | working without injectionbrunobar792018-07-259-21/+229
| | * | | | | | | added qr code scanner icon in send transactionbrunobar792018-07-247-5/+25
| | * | | | | | | camera working back and forthbrunobar792018-07-244-1/+36
* | | | | | | | | add error messagesbrunobar792018-08-111-2/+4
* | | | | | | | | hide export private key for trezor accountsbrunobar792018-08-101-2/+16
|/ / / / / / / /
* | | | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failureDan J Miller2018-08-092-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Show error while allowing confirmation of transaction where simulation failsDan Miller2018-08-092-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Fix lint error in tx-listWhymarrh Whitby2018-08-091-1/+1
* | | | | | | | Get nonce for showing retry button using ethQuery transaction count.Dan Miller2018-08-094-6/+46
|/ / / / / / /
* | | | / / / Use token decimals when calculating confirm screen amount for token approvals.Dan Miller2018-08-081-2/+8
| |_|_|/ / / |/| | | | |
* | | | | | Fixing translations in first-time init menu (#4969)Justin Kat2018-08-081-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MIno2018-08-0810-21/+55
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4948 from MetaMask/i4638-update-fontAlexander Tseung2018-08-043-5/+0
| |\ \ \ \ \
| | * | | | | Update Font in Account SelectorAlexander Tseung2018-08-043-5/+0
| * | | | | | Disable Confirm button on subsequent clicks to prevent confirming multiple timesAlexander Tseung2018-08-042-6/+21
| |/ / / / /
| * | | / / Show the retry button on latest tx of earliest nonce.Dan Miller2018-08-011-4/+4
| | |_|/ / | |/| | |
| * | | | Round large exponential numbersAlexander Tseung2018-07-283-6/+23
| * | | | Fix overflow for long total strings in confirm stringAlexander Tseung2018-07-261-0/+7
| | |/ / | |/| |
* | | | Merge branch 'develop' into TokensPerAccountBasisEsteban Miño2018-07-288-1/+322
|\| | |
| * | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTxDan J Miller2018-07-261-1/+10
| |\ \ \
| | * | | earliest tx by submittedTimeEsteban MIno2018-07-261-5/+8
| | * | | only show retry button on earliest pending txEsteban MIno2018-07-261-1/+7
| * | | | lint fixSara Reynolds2018-07-261-2/+2
| * | | | Update prop namesSara Reynolds2018-07-261-7/+7
| * | | | Add tests for Confirm Detail RowSara Reynolds2018-07-261-0/+64
| * | | | Merge pull request #4845 from MetaMask/button-groupDan J Miller2018-07-256-0/+248
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Adds tests for button group component.Dan Miller2018-07-241-0/+97
| | * | | Add ButtonGroup componentAlexander Tseung2018-07-245-0/+151
* | | | | add & delete tokens per networkEsteban MIno2018-07-271-1/+2
|/ / / /
* | | | Add close window support to signature requests. Move logic to actionsAlexander Tseung2018-07-245-31/+108
* | | | UI confirm screen closes confirmation window on submit or cancel of a txDan Miller2018-07-241-4/+15
| |/ / |/| |
* | | Merge pull request #4851 from MetaMask/fix-trezor-alertDan Finlay2018-07-241-4/+11
|\ \ \
| * | | show alert ONLY when device is connectedbrunobar792018-07-231-4/+11
* | | | Merge pull request #4848 from MetaMask/fix-alert-flashDan Finlay2018-07-241-6/+46
|\ \ \ \
| * | | | refactor Alert component to work properlybrunobar792018-07-221-6/+46
| |/ / /
* | | | fix type板橋 清信2018-07-231-1/+1
* | | | fix token amount板橋 清信2018-07-231-3/+2
|/ / /
* | | Add fallback options for displaying recipient name in the Confirm screenAlexander Tseung2018-07-213-10/+24
* | | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-2020-23/+1338
|\ \ \ | |/ / |/| |
| * | last css fixesbrunobar792018-07-193-10/+42
| * | added new global alertbrunobar792018-07-196-8/+126
| * | fix support linkbrunobar792018-07-191-1/+1
| * | fix unsupported browser viewbrunobar792018-07-192-2/+6
| * | lintbrunobar792018-07-191-1/+1
| * | scroll smoothbrunobar792018-07-192-3/+12
| * | design donebrunobar792018-07-193-44/+178
| * | fix browser not supported screenbrunobar792018-07-181-1/+1
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-183-31/+42
| |\ \
| * | | updated account list based on new designsbrunobar792018-07-184-25/+85
| * | | Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-17129-115/+251
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-144-42/+29
| |\ \ \ \
| * | | | | fix account selectionbrunobar792018-07-142-3/+11
| * | | | | added affiliate link to trezorbrunobar792018-07-142-0/+22
| * | | | | detect ability to open popup instead of browserbrunobar792018-07-132-6/+13
| * | | | | fix account balance bugbrunobar792018-07-132-10/+16
| * | | | | remove account modal updatedbrunobar792018-07-132-15/+55
| * | | | | catching up with developbrunobar792018-07-133-13/+48
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-13104-591/+4351
| |\ \ \ \ \
| * | | | | | added tooltipbrunobar792018-07-123-5/+16
| * | | | | | forget device and autiload account features addedbrunobar792018-07-124-1/+95
| * | | | | | clean upbrunobar792018-07-113-6/+6
| * | | | | | account removal is workingbrunobar792018-07-114-14/+40
| * | | | | | finish warning modal UIbrunobar792018-07-118-3/+111
| * | | | | | added ui to remove accountsbrunobar792018-07-102-4/+47
| * | | | | | fix account duplicationbrunobar792018-07-101-6/+0
| * | | | | | fix all the account related bugsbrunobar792018-07-102-13/+27
| * | | | | | copy updatedbrunobar792018-07-072-2/+5
| * | | | | | update connect harwdware screenbrunobar792018-07-072-9/+25
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-0730-195/+542
| |\ \ \ \ \ \
| * | | | | | | UI refactorbrunobar792018-07-063-97/+106
| * | | | | | | Refactor UIbrunobar792018-07-064-266/+328
| * | | | | | | move strings to localization filebrunobar792018-07-061-11/+12
| * | | | | | | added message for non-chrome browsersbrunobar792018-07-062-1/+39
| * | | | | | | lint fixbrunobar792018-07-041-1/+1
| * | | | | | | fix merge conflictsbrunobar792018-07-047-7/+63
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-07-0420-22/+22
| |\ \ \ \ \ \ \ \
| * | | | | | | | | move hardcoded strings to localization filebrunobar792018-07-031-17/+7
| * | | | | | | | | always open connect hardware in full screen modebrunobar792018-07-031-1/+9
| * | | | | | | | | fix merge conflictsbrunobar792018-07-0254-203/+569
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ fix merge conflictsBruno2018-06-132-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | move TrezorKeyring to its own packageBruno2018-06-131-3/+3
| * | | | | | | | | | | balances workingBruno2018-06-111-2/+18
| * | | | | | | | | | | initial trezor supportBruno2018-06-107-6/+413
* | | | | | | | | | | | Merge pull request #4822 from whymarrh/show-more-addressWhymarrh Whitby2018-07-192-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Show first four characters of account after 0x in walletWhymarrh Whitby2018-07-181-1/+1
| * | | | | | | | | | | | Show first four characters of account after 0x in tx listWhymarrh Whitby2018-07-181-2/+2
* | | | | | | | | | | | | Don't set txData to an empty stringWhymarrh Whitby2018-07-181-1/+1
* | | | | | | | | | | | | Inline single-use vars in send-footer.utilsWhymarrh Whitby2018-07-181-3/+1
* | | | | | | | | | | | | Send data along with other tx paramsWhymarrh Whitby2018-07-187-16/+66
* | | | | | | | | | | | | Hook up send component w/ UPDATE_SEND_HEX_DATA actionWhymarrh Whitby2018-07-183-5/+28
* | | | | | | | | | | | | Add updateSendHexData actionWhymarrh Whitby2018-07-182-0/+17
* | | | | | | | | | | | | Add hex data row to send screenWhymarrh Whitby2018-07-185-2/+43
|/ / / / / / / / / / / /
* | | | | | | | | | | | Use Number constructor for number conversion. Use existing noConversionRateAv...Alexander Tseung2018-07-182-4/+4
* | | | | | | | | | | | Merge developAlexander Tseung2018-07-183-1746/+0
* | | | | | | | | | | | Fix testsAlexander Tseung2018-07-182-1/+5
* | | | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ...Alexander Tseung2018-07-1816-104/+313
* | | | | | | | | | | | Remove unused confirm transaction filesAlexander Tseung2018-07-184-299/+23
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #4815 from MetaMask/i4783-retryAlexander Tseung2018-07-182-20/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Increase clickable area and padding of Retry Transaction barAlexander Tseung2018-07-172-20/+14
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | lint fixSara Reynolds2018-07-171-6/+4
* | | | | | | | | | | Fix edge cases and add translation compatibilitySara Reynolds2018-07-171-6/+12
* | | | | | | | | | | Update onlyRenderConversions function to method and account for edge casesSara Reynolds2018-07-171-26/+24
* | | | | | | | | | | Fixes conversion status for tokens without conversion ratesSara Reynolds2018-07-171-14/+29
|/ / / / / / / / / /
* | | | | | | | | | Fix send import paths in confirm tx componentsWhymarrh Whitby2018-07-162-3/+3
* | | | | | | | | | Fix send import path in customize gas modalWhymarrh Whitby2018-07-161-1/+1
* | | | | | | | | | Fix send import path in ToAutoCompleteWhymarrh Whitby2018-07-161-1/+1
* | | | | | | | | | Fix lint warnings in the send/ directory.Dan2018-07-164-32/+28
* | | | | | | | | | Remove send_ directory, revert to just having sendDan2018-07-16124-20/+142
* | | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocompleteDan J Miller2018-07-143-121/+142
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix classnameTrejGun2018-07-051-1/+4
| * | | | | | | | | | Merge branch 'develop' into to-autocompleteАнна2018-07-0529-41/+90
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixes #4664trejgun2018-07-033-121/+139
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4702 from BitGuildPlatform/contextTypesDan J Miller2018-07-1414-60/+57
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' into contextTypesTrejGun2018-07-0529-41/+90
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | convert contextType to static prop for refactored componentstrejgun2018-07-0514-60/+57
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4766 from whymarrh/null-translationsWhymarrh Whitby2018-07-133-29/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unneeded MetaMaskConnect connect wrapperWhymarrh Whitby2018-07-122-28/+1
| * | | | | | | | | | Fallback to English and then the key for I18nProvider#tWhymarrh Whitby2018-07-121-1/+4
generated by cgit (git 2.34.1) at 2024-10-16 00:18:43 +0800