aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Show checksummed addresses throughout the UIbitpshr2018-04-1810-26/+44
| | |/ / /
| * | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-1824-107/+52
| |\| | |
| | * | | Fix confirmation popup not always openingAlexander Tseung2018-04-175-13/+18
| | * | | Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-1714-3/+14
| | |\ \ \
| | | * \ \ Merge pull request #3970 from MetaMask/i3651-removeGlobalLogDan Finlay2018-04-1713-2/+13
| | | |\ \ \
| | | | * | | Require loglevel singleton in each module that uses itbitpshr2018-04-1413-2/+13
| | | * | | | Fix action for setting localeDan Finlay2018-04-141-1/+1
| | | |/ / /
| | * | | | Maintain token prices using a background servicebitpshr2018-04-164-81/+6
| | * | | | Fetch token prices based on contract addressbitpshr2018-04-168-81/+85
| | |/ / /
| * | | | Lint fix.Dan2018-04-102-2/+2
| * | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-1049-1081/+2630
| |\| | |
| * | | | Internationalize converted value in confirm screensDan2018-04-102-4/+36
| * | | | Internationalize converted value in currency-input.jsDan2018-04-101-10/+25
| * | | | Improve display of crypto currencies when selected as the 'Current Conversion'Dan2018-04-101-4/+13
| * | | | LintedDan Finlay2018-04-041-1/+1
| * | | | Internationalize currencyDan Finlay2018-04-041-1/+6
* | | | | second commitDan2018-04-1118-50/+461
* | | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-1045-1044/+2589
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Fix integration testsAlexander Tseung2018-04-073-4/+6
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-062-2/+8
| |\ \ \ | | | |/ | | |/|
| * | | Fix editing transactionAlexander Tseung2018-04-061-2/+1
| * | | Revert "commit"Alexander Tseung2018-04-061-1/+2
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-063-3/+2
| |\ \ \
| * | | | commitAlexander Tseung2018-04-061-2/+1
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-052-3/+4
| |\ \ \ \
| * | | | | Use new design for showing seed wordsAlexander Tseung2018-04-041-1/+13
| * | | | | commitAlexander Tseung2018-04-041-8/+2
| * | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-044-28/+45
| |\ \ \ \ \
| * | | | | | Fix transaction confirmationsAlexander Tseung2018-04-042-17/+32
| * | | | | | Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-0315-67/+331
| |\ \ \ \ \ \
| * | | | | | | Fix lint errorsAlexander Tseung2018-04-037-229/+2
| * | | | | | | Add withRouter to I18nProvider componentAlexander Tseung2018-04-031-1/+6
| * | | | | | | Refactor onboarding flowAlexander Tseung2018-04-029-47/+60
| * | | | | | | Fix conf-tx renderAlexander Tseung2018-03-312-2/+8
| * | | | | | | Fix merge conflictsAlexander Tseung2018-03-3175-471/+829
| |\ \ \ \ \ \ \
| * | | | | | | | Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-319-606/+693
| * | | | | | | | Fix i18n merge conflictsAlexander Tseung2018-03-3082-567/+815
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-2913-33/+65
| * | | | | | | | | Fix merge conflictsAlexander Tseung2018-03-27129-4073/+3914
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix react-router related exceptionsAlexander Tseung2018-02-102-2/+2
| * | | | | | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-091-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-092-36/+28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-0917-102/+432
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix lint errorsAlexander Tseung2018-02-024-10/+3
| * | | | | | | | | | | | | Checks if there is currently a send in progress before redirecting to default...Dan2018-02-011-3/+7
| * | | | | | | | | | | | | Fix merge conflicts from uat-nextAlexander Tseung2018-02-0116-153/+214
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-0118-225/+156
| * | | | | | | | | | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-3061-956/+2059
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add route for signature requestAlexander Tseung2017-12-156-305/+454
| * | | | | | | | | | | | | | | Add initialized checks for first time flow routesAlexander Tseung2017-12-155-79/+56
| * | | | | | | | | | | | | | | Add route for Mascara confirm seedAlexander Tseung2017-12-152-3/+12
| * | | | | | | | | | | | | | | Fix lint errorsAlexander Tseung2017-12-154-14/+44
| * | | | | | | | | | | | | | | Add routes for mascaraAlexander Tseung2017-12-159-56/+123
| * | | | | | | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-1540-1464/+1976
* | | | | | | | | | | | | | | | first commitDan2018-04-0794-37/+845
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3883 from danjm/i3685-define-event-privatekey-importkumavis2018-04-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | event object actually passed to this.createKeyringOnEnter in private-key.jsDan2018-04-051-1/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891kumavis2018-04-061-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix populating txParams with undefined dataAlexander Tseung2018-04-061-1/+6
* | | | | | | | | | | | | | | Merge pull request #3865 from MetaMask/openlinkinnewwindowThomas Huang2018-04-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into openlink...Kevin Serrano2018-04-052-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make token helpscout link open in new tab.Kevin Serrano2018-04-041-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3882 from MetaMask/i#3791Kevin Serrano2018-04-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change double-quotes to single-quotesThomas2018-04-051-1/+1
| * | | | | | | | | | | | | | Add target=_blank exportAsFileThomas2018-04-051-0/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* / | | | | | | | | | | | | Allow from and to address to be the same in new-ui.Dan2018-04-051-3/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | hot-fix new-ui - default to an object if identities is undefinedfrankiebee2018-04-051-1/+2
* | | | | | | | | | | | | Don't prevent user from setting an eth address in to field if there is no ens...Dan2018-04-051-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3834 from MetaMask/3734kumavis2018-04-042-15/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Address feedbackDavid Yoo2018-04-042-8/+24
| * | | | | | | | | | | | Address Add Token design feedbackDavid Yoo2018-04-032-7/+11
* | | | | | | | | | | | | app - warn on fetch errors instead of spamming sentrykumavis2018-04-041-12/+9
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | build - correctly set METAMASK_ENV via envifykumavis2018-04-041-1/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-033-16/+100
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #3825 from danjm/i3668-warnusertxsimulationfailsThomas Huang2018-04-033-16/+100
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Adds simulation failure error messages to confirm screen.Dan2018-04-033-0/+41
| | * | | | | | | | | | UpdateSendErrors only called when balance defined, recalled if balance updates.Dan2018-04-032-16/+59
* | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-039-33/+198
|\| | | | | | | | | | |
| * | | | | | | | | | | Ensure txParams are prefixed with 0x when sending.Dan2018-04-031-0/+4
| |/ / / / / / / / / /
| * | | | | | | | | | identicon - set blockies height and width to identicon diameterkumavis2018-03-311-3/+2
| * | | | | | | | | | Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlistkumavis2018-03-312-9/+17
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlistDan2018-03-3072-452/+818
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Ensure correct address used when rendering transfer transactions.Dan2018-03-291-1/+2
| | * | | | | | | | | | | Fix display of unapprovedMessages in txList (old and new ui); includes fix of...Dan2018-03-282-9/+16
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreenkumavis2018-03-316-21/+175
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Fix lint and testsDan2018-03-302-4/+4
| | * | | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenDan2018-03-3072-451/+817
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Show insufficient funds on confirm screen on first render.Dan2018-03-302-1/+21
| | * | | | | | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-281-0/+3
| | * | | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenkumavis2018-03-2881-572/+722
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-282-7/+56
| | * | | | | | | | | | Checking for sufficient balance in confirm ether screen; includes error messa...Dan2018-03-284-15/+97
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-03-317-22/+23
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-3072-451/+817
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | ui - fix typo in settingskumavis2018-03-291-1/+1
| * | | | | | | | | | ui - add guard against unset localekumavis2018-03-291-1/+2
| * | | | | | | | | | ui - identicon - use relative link for ether logokumavis2018-03-291-1/+1
| * | | | | | | | | | ui - use relative location for imageskumavis2018-03-293-4/+4
| * | | | | | | | | | ui - fix relative url for deposit-ether-modalkumavis2018-03-291-1/+1
| * | | | | | | | | | ui - use relative url for i18n-helper fetching localeskumavis2018-03-291-1/+1
| * | | | | | | | | | ui - css - use relative path for fontskumavis2018-03-291-14/+14
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | development - screens - use localhost for networkkumavis2018-03-311-3/+8
* | | | | | | | | | network - use providerType for localhostkumavis2018-03-312-6/+7
* | | | | | | | | | development - screenshotter - capture screens across all localeskumavis2018-03-301-0/+5
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Stopping wrapping provider children in div; stop wrapping old-ui in provider.Dan2018-03-303-6/+5
* | | | | | | | | Removes t from props via metamask-connect and instead places it on context vi...Dan2018-03-2973-450/+817
|/ / / / / / / /
* | | | | | | | Merge pull request #3745 from danjm/i3723-fix-long-token-ammountskumavis2018-03-281-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Long token amounts in wallet are truncated with ellipsis.Dan2018-03-271-1/+8
* | | | | | | | | Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0xkumavis2018-03-281-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prefixes to addresses with 0x before sending.Dan2018-03-271-1/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefinedkumavis2018-03-281-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent users from adding custom token if decimals is an empty string.Dan2018-03-271-1/+4
| |/ / / / / / / /
* | | | | | | | | ui - actions - fix log for background callkumavis2018-03-281-1/+1
* | | | | | | | | ui - settings - fix for currentLocalekumavis2018-03-281-2/+3
* | | | | | | | | ui - settings - derrive locales from indexkumavis2018-03-281-8/+1
* | | | | | | | | Don't query for undefined.Dan2018-03-281-1/+3
* | | | | | | | | Remove comments and console.logsDan2018-03-272-2/+2
* | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-275-116/+258
|\| | | | | | | |
| * | | | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboardingThomas Huang2018-03-271-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Pop uses new ui onboarding when in beta.Dan2018-03-231-3/+3
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdateThomas Huang2018-03-273-113/+254
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into i3326-addtokenscreendesignupdateDan2018-03-2728-189/+182
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Use new header on add token confirmation screen.Dan2018-03-261-65/+68
| | * | | | | | | | | Updates Add token screen to latest design.Dan2018-03-243-99/+241
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3695 from danjm/i3379-signtypedata-overflowThomas Huang2018-03-271-0/+1
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Signed type data notification handles long messages.Dan2018-03-231-0/+1
| | |/ / / / / / /
* | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2728-182/+178
|\| | | | | | | |
| * | | | | | | | Merge pull request #3721 from alextsg/cb-944Dan Finlay2018-03-2724-139/+149
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update button stylesAlexander Tseung2018-03-2624-139/+149
| | |/ / / / / / /
| * / / / / / / / Use ens-input component in send-v2 to allow sending to ens names.Dan2018-03-265-43/+30
| |/ / / / / / /
* | | | | | | | i18n helper fetchLocale handles 404 gracefullyDan2018-03-241-4/+12
* | | | | | | | Default current locale in metamask reducer to empty string.Dan2018-03-241-1/+1
* | | | | | | | Memoize t function in metamask-connectDan2018-03-241-1/+7
* | | | | | | | Correct proptypes for t in new-account/create-form.jsDan2018-03-221-1/+1
* | | | | | | | Correct reprice title and subtitle key names.Dan2018-03-221-2/+2
* | | | | | | | Fix sender-to-recipient export and non-existent translation key.Dan2018-03-222-5/+3
* | | | | | | | Correct connect reference in confirm-send-ether, confirm-deploy-contract, net...Dan2018-03-223-3/+3
* | | | | | | | Lint fixesDan2018-03-2214-18/+18
* | | | | | | | Fix references to undefined 'this.props'Dan2018-03-222-25/+23
* | | | | | | | Remove console.logsDan2018-03-222-2/+0
* | | | | | | | Missed modifications of t() in merge resolution.Dan2018-03-223-4/+1
* | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2213-206/+298
|\| | | | | | |
| * | | | | | | ui - tx conf - only show special token tx conf screen for token sendkumavis2018-03-221-4/+8
| * | | | | | | Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/m...kumavis2018-03-223-5/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Identify token transactions by method names token data, and not just whether ...Dan2018-03-203-5/+13
| * | | | | | | | Merge pull request #3624 from alextsg/cb-941kumavis2018-03-218-195/+271
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update confirm transaction screenAlexander Tseung2018-03-218-195/+271
| * | | | | | | | | Gas inputs can be changed by up and down arrows (#3598)Dan J Miller2018-03-212-0/+3
* | | | | | | | | | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-2263-439/+405
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-2130-163/+574
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplateskumavis2018-03-2111-107/+162
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add i18n to tx statusThomas2018-03-211-1/+26
| | * | | | | | | | | Merge branch 'master' into i3571-CompleteI18nTemplatesThomas2018-03-2120-57/+377
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add i18n in settings/infoThomas2018-03-211-14/+14
| | * | | | | | | | | | Started on Tx list i18nThomas2018-03-211-1/+1
| | * | | | | | | | | | i18n Import flowThomas2018-03-212-5/+5
| | * | | | | | | | | | I18n add-token.jsThomas2018-03-201-21/+22
| | * | | | | | | | | | Add send screen templateDan Finlay2018-03-201-15/+15
| | * | | | | | | | | | Add template for settings and infoDan Finlay2018-03-201-23/+25
| | * | | | | | | | | | Add recover and backup tempaltesDan Finlay2018-03-202-18/+24
| | * | | | | | | | | | Add login templatesDan Finlay2018-03-201-3/+3
| | * | | | | | | | | | Add connecting indication templatesDan Finlay2018-03-201-6/+27
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #3632 from MetaMask/retry-tx-refractorkumavis2018-03-213-1/+35
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Take user home if an unapproved tx is dropped while they are viewing.Dan2018-03-211-0/+18
| | * | | | | | | | | Fix styling regression from master merge.Dan2018-03-201-1/+1
| | * | | | | | | | | Improve responsiveness of gas price row on confirm screen.Dan2018-03-201-0/+16
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3623 from MetaMask/i#3554kumavis2018-03-211-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | new-ui - dont exclude `txParams.data` when editing and updating txParamsfrankiebee2018-03-201-0/+2
| | |/ / / / / / /
| * | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-2010-13/+25
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix Account Names being cropped (#3626)Alexander Tseung2018-03-206-11/+6
| | * | | | | | | | Don't block user from setting gas if estimating gas returns errors. (#3627)Dan J Miller2018-03-204-2/+19
| | |/ / / / / / /
| * | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-2039-3070/+688
| |\| | | | | | |
| * | | | | | | | Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-ext...frankiebee2018-03-163-22/+49
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not...Dan2018-03-152-4/+34
| | * | | | | | | | Force gas min has correct precision and is set when editing gas if max.Dan2018-03-153-7/+8
| | * | | | | | | | Ensure changes from customize gas modal opened from confirm screen are captur...Dan2018-03-152-12/+8
| | * | | | | | | | Revert 'Set txMeta.time to reflect time of tx approval.'Dan2018-03-151-3/+3
| * | | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-162-14/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-153-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-1470-597/+888
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix more lint errors.Dan2018-03-143-11/+2
| * | | | | | | | | | | Remove unnecessary addition of nonce to state.Dan2018-03-143-10/+0
| * | | | | | | | | | | Make token confirmations compatible.Dan2018-03-142-14/+88
| * | | | | | | | | | | Fix tx-list-item submitted check.Dan2018-03-141-1/+1
| * | | | | | | | | | | Use correct name for submittedTime field in tx-list.jsDan2018-03-141-1/+1
| * | | | | | | | | | | Use correct var name in new-ui showRetryButtonDan2018-03-141-1/+1
| * | | | | | | | | | | Undefined check in showRetryButtonDan2018-03-141-3/+4
| * | | | | | | | | | | Styling for dropped.Dan2018-03-142-0/+5
| * | | | | | | | | | | Use new submittedTime field to correctly show retry button in old and new ui.Dan2018-03-143-9/+9
| * | | | | | | | | | | Set txMeta.time to reflect time of tx approval.Dan2018-03-131-3/+3
| * | | | | | | | | | | Improve phrasing of copy.Dan2018-03-132-2/+2
| * | | | | | | | | | | Fix gas calculation and nonce / forceGasMin state setting errors; retry butto...Dan2018-03-133-25/+39
| * | | | | | | | | | | Lint fixes.Dan2018-03-092-3/+1
| * | | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-0916-93/+182
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Adds inline opening of gas customization to confirm-send-ether screen.Dan2018-03-093-10/+63
| * | | | | | | | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, customize-...Dan2018-03-099-16/+113
| * | | | | | | | | | | | Add html and css for responsive retry button.Dan2018-03-093-0/+57
* | | | | | | | | | | | | Lint fixes.Dan2018-03-2015-10/+19
* | | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-201-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3594 from danjm/i3344-improve-currency-inputThomas Huang2018-03-201-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Currency input defaults to empty stringDan2018-03-171-6/+14
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect re...Dan2018-03-2018-24/+29
* | | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2039-3070/+672
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Remove unused files from ui folder. (#3577)anticlimactic2018-03-1927-2507/+0
| * | | | | | | | | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600)Alexander Tseung2018-03-173-225/+231
| * | | | | | | | | | | | Update Confirm Contract screen (#3597)Alexander Tseung2018-03-178-322/+432
| * | | | | | | | | | | | Update margins for consistency in first time flow (#3588)Alexander Tseung2018-03-161-6/+8
| |/ / / / / / / / / / /
| * | | | / / / / / / / Update Deposit Eth icon (#3569)Alexander Tseung2018-03-162-14/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Delete commented out code from i18n implementation that used globals.Dan2018-03-201-5/+0
* | | | | | | | | | | Delete old i18n helper files.Dan2018-03-202-76/+0
* | | | | | | | | | | Fetch localeMessages in front end only.Dan2018-03-201-3/+5
* | | | | | | | | | | Handle i18n with redux.Dan2018-03-1684-377/+513
* | | | | | | | | | | ui - settings - add option to set current localekumavis2018-03-151-0/+45
* | | | | | | | | | | i18n - load locales manuallykumavis2018-03-1537-59/+113
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3558 from MetaMask/fix-two-translationsThomas Huang2018-03-152-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix translations whose substitutions params were not in arrays.Dan2018-03-142-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* / | | | | | | | | Grammar correctionDan Finlay2018-03-151-1/+1
|/ / / / / / / / /
* | | | | | | | | ui - lint fixkumavis2018-03-141-1/+1
* | | | | | | | | Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characterskumavis2018-03-141-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FIX #3440 improved verification of restore from seed phrasecriw2018-03-061-0/+13
* | | | | | | | | | Remove windows.h from i18n.jsThomas2018-03-141-1/+0
* | | | | | | | | | Add closing parens to appNameThomas2018-03-141-1/+1
* | | | | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-1411-105/+245
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into i3033-responsive-newui-onboardingkumavis2018-03-1419-331/+469
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #3470 from danjm/newui-onboarding-fontskumavis2018-03-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Update first time flow button fonts, and first-time-flow default font, to Rob...Dan2018-03-081-1/+1
| | * | | | | | | | | | | Merge pull request #3495 from alextsg/cb-290kumavis2018-03-145-99/+93
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Increase tap areas for menu buttons on mobileAlexander Tseung2018-03-105-99/+93
| * | | | | | | | | | | | | Left align create password.Dan2018-03-131-0/+12
| * | | | | | | | | | | | | Styling fixes to welcome; hide network component on create password; shown we...Dan2018-03-133-8/+7
| * | | | | | | | | | | | | Add welcome screen to new-ui browser first time flow.Dan2018-03-096-3/+139
| * | | | | | | | | | | | | Make new-ui create password screen responsive.Dan2018-03-081-24/+0
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Add missing opening parens to pag-container__subtitleThomas2018-03-141-1/+1
* | | | | | | | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-145-83/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Update deposit ether styling (#3510)Alexander Tseung2018-03-135-82/+125
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Add loglevel and window.log to i18n.jsThomas2018-03-131-0/+2
* | | | | | | | | | | | Add i18n back into JsonImportSubviewThomas2018-03-121-7/+7
* | | | | | | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-1210-150/+228
|\| | | | | | | | | | |
| * | | | | | | | | | | Remove de-selected token from selectedTokens hash instead of setting to null ...Alexander Tseung2018-03-091-6/+10
| * | | | | | | | | | | Add empty object default value for tokenData (#3493)Alexander Tseung2018-03-091-2/+2
| * | | | | | | | | | | Explicitly define state in import account from json component (#3491)Alexander Tseung2018-03-092-79/+103
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fix flashing to Log in screen after logging in or restoring from seed phrase ...Alexander Tseung2018-03-084-65/+104
| * | | | | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-081-0/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | verify seedwords on log inCsaba Solya2018-03-041-0/+7
| * | | | | | | | | | | Update network colours for better accessibility. (#3469)Dan J Miller2018-03-082-4/+8
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Correct caps of Send button on main screen.Dan2018-03-081-1/+1
* | | | | | | | | | | Merge branch 'master' into i18nDan Finlay2018-03-075-20/+30
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into ImportAccountMessageV2kumavis2018-03-078-12/+41
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #3455 from MetaMask/i2475-UnifyLogInWordingkumavis2018-03-071-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2475-UnifyLogInWordingDan Finlay2018-03-073-9/+8
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 16:08:54 +0800