aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* Fix text field labels of first time flow. Add text fields to storybook (#4389)Alexander Tseung2018-05-292-44/+80
* newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
* Fix scrolling in Deposit Ether modal (#4336)Alexander Tseung2018-05-241-2/+4
* Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-2345-971/+1280
|\
| * Update input field border on focusAlexander Tseung2018-05-221-1/+3
| * Fix testsAlexander Tseung2018-05-211-11/+6
| * Update designs for Add Token screenAlexander Tseung2018-05-2045-971/+1283
* | Merge pull request #4295 from MetaMask/kumavis-patch-3Frankie2018-05-221-1/+2
|\ \
| * | token-util - warn via loglevel on token lookup failurekumavis2018-05-191-1/+2
| |/
* | Merge pull request #4316 from MetaMask/fix-signature-requestkumavis2018-05-221-2/+0
|\ \
| * | Fix signature request header textAlexander Tseung2018-05-211-2/+0
| |/
* | Merge pull request #4273 from brunobar79/fix-new-ui-popup-headerkumavis2018-05-221-2/+0
|\ \
| * | remove fix header heightBruno2018-05-171-2/+0
| |/
* / Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-178-18/+18
|/
* Merge pull request #4255 from MetaMask/i4233-dropdownskumavis2018-05-175-21/+58
|\
| * Fix account and network dropdowns in confirm screenAlexander Tseung2018-05-155-21/+58
* | ui - unlock - remove setNetworkEndpoints calls from new unlock screenkumavis2018-05-172-3/+0
* | ui - remove files accidently added by bad mergekumavis2018-05-172-328/+0
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-1745-317/+850
|\ \
| * | Add error message when passwords don't match in first time flow. Change input...Alexander Tseung2018-05-142-48/+54
| |/
| * Add TextField component to storybookAlexander Tseung2018-05-123-2/+25
| * Add new unlock screen designAlexander Tseung2018-05-1222-569/+559
| * Merge pull request #4196 from MetaMask/i3457-fontweightThomas Huang2018-05-0911-22/+2
| |\
| | * Change font weight from 300 to 400Alexander Tseung2018-05-0611-22/+2
| * | Add storybook integrationAlexander Tseung2018-05-045-2/+96
| |/
| * Merge pull request #4156 from MetaMask/i4010-spinnerkumavis2018-05-039-10/+115
| |\
| | * Fix styling of the app spinnerAlexander Tseung2018-05-019-10/+115
| * | Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccountkumavis2018-05-021-1/+1
| |\ \
| | * | ui - actions - importNewAccount - rethrow err on failurekumavis2018-05-021-1/+1
* | | | lint - cleanup some unused variableskumavis2018-05-036-13/+0
* | | | network - remove setNetworkEndpointskumavis2018-05-017-29/+1
|/ / /
* / / Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-012-0/+4
|/ /
* | ui - actions - importNewAccount - use async and pify for cleaner syntaxkumavis2018-05-011-24/+20
* | Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-0113-329/+354
|\ \
| * | Redirect to correct seed phrase screenAlexander Tseung2018-04-271-2/+2
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-231-1/+9
| |\ \
| * | | Use new design for reveal seed screen. Persist seed words only in first time ...Alexander Tseung2018-04-2312-285/+346
| * | | Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-222-27/+3
* | | | Fix ShapeShift purchases on new UIbitpshr2018-04-291-6/+7
* | | | Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-deci...kumavis2018-04-284-45/+43
|\ \ \ \
| * | | | Simplify return of existing token in getSymbolAndDecimalsDan2018-04-281-4/+1
| * | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol or...Dan2018-04-283-20/+10
| * | | | Wraps calls to symbol() and decimals() in try catchDan2018-04-283-30/+41
| | |_|/ | |/| |
* / | | Allow transactions with 0-gwei gas price (#4073)Paul Bouchon2018-04-273-12/+11
|/ / /
* | | i18n-helper - wrap fallback in brackets to help indicate something is wrongkumavis2018-04-261-1/+1
* | | Return key instead of empty string on i18n failDan Finlay2018-04-261-1/+1
* | | i18n-helper - abort on i18n failurekumavis2018-04-251-1/+2
* | | Merge pull request #3940 from nyatla/masterDan Finlay2018-04-243-1/+3
|\ \ \
| * | | Reduced button padding.nyatla2018-04-101-0/+1
| * | | Expanded dropdown menu width of title.nyatla2018-04-101-1/+1
| * | | Changed mouse cursor to "pointer" on the cancel text at the top left of the p...nyatla2018-04-101-0/+1
* | | | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-2410-13/+17
|\ \ \ \
| * | | | Clean up network configAlexander Tseung2018-04-2410-13/+17
| | |_|/ | |/| |
* | | | Merge pull request #4028 from MetaMask/i4016-customrpcDan Finlay2018-04-241-6/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix custom RPC not redirecting to Settings pageAlexander Tseung2018-04-191-6/+8
| | |/ | |/|
* | | Merge pull request #4030 from MetaMask/i4014-metamask-versionThomas Huang2018-04-201-1/+9
|\ \ \
| * | | Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
| |/ /
* / / Fix exception thrown when revealing seed wordsAlexander Tseung2018-04-191-6/+18
|/ /
* | Merge pull request #3977 from MetaMask/i-3913-big-numberDan Finlay2018-04-194-25/+49
|\ \
| * | Fix spinner layoutAlexander Tseung2018-04-184-24/+26
| * | Fix BigNumber exception in confirm-send-etherAlexander Tseung2018-04-181-3/+25
* | | Merge pull request #4004 from MetaMask/i3955-reveal-seedDan Finlay2018-04-192-3/+27
|\ \ \
| * | | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-192-3/+27
* | | | Merge pull request #3998 from MetaMask/i3988-checksummed-addressDan Finlay2018-04-1910-26/+44
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\| |
| * | 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
| |\|
| | * 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
| * | | | 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
| |\| | |
| | * | | 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
| | |/ /
| * | | commitAlexander Tseung2018-04-061-2/+1
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-052-3/+4
| |\| |
| | * | 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
| | |/
| * | 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
| |\|
| | * 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
| * | | 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
* | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 08:31:49 +0800