aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Collapse)AuthorAgeFilesLines
* Fix i18n merge conflictsAlexander Tseung2018-03-3082-567/+815
|\
| * Merge pull request #3745 from danjm/i3723-fix-long-token-ammountskumavis2018-03-281-1/+8
| |\ | | | | | | Long token amounts in wallet are truncated with ellipsis.
| | * 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.
| | * | 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.
| | * | | 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 branch 'master' into i18n-translator-reduxDan2018-03-2728-182/+178
| |\ \ \
| * | | | 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, ↵Dan2018-03-223-3/+3
| | | | | | | | | | | | | | | | | | | | network-display.
| * | | | 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
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | i18n redux solution doesn't require importing t() and passing state to each ↵Dan2018-03-2263-439/+405
| | | | | | | | | | | | | | | | | | | | t() call; t is just available on props.
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-2130-163/+574
| |\ \ \ \ | | | | | | | | | | | | | | | | | | i18n-translator-redux
| * | | | | Lint fixes.Dan2018-03-2015-10/+19
| | | | | |
| * | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-201-6/+14
| |\ \ \ \ \
| * | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect ↵Dan2018-03-2018-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reference.
| * | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2039-3070/+672
| |\ \ \ \ \ \
| * | | | | | | 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
| | | | | | | |
* | | | | | | | Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-2913-33/+65
| | | | | | | |
* | | | | | | | Fix merge conflictsAlexander Tseung2018-03-27129-4073/+3914
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboardingThomas Huang2018-03-271-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Popup uses new ui onboarding when in beta.
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updates Add token screen to latest design.
| | * \ \ \ \ \ \ 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.
| | * | | | | | Signed type data notification handles long messages.Dan2018-03-231-0/+1
| | |/ / / / /
| * | | | | | Merge pull request #3721 from alextsg/cb-944Dan Finlay2018-03-2724-139/+149
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update button styles
| | * | | | | | 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
| |/ / / / /
| * | | | | 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 ↵kumavis2018-03-223-5/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs
| | * | | | | Identify token transactions by method names token data, and not just whether ↵Dan2018-03-203-5/+13
| | | |_|/ / | | |/| | | | | | | | | | | | | | | they've been add via metamask.
| * | | | | Merge pull request #3624 from alextsg/cb-941kumavis2018-03-218-195/+271
| |\ \ \ \ \ | | | | | | | | | | | | | | Update confirm transaction screen
| | * | | | | 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
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Up and down arrows can control gas inputs. * input-number.js just uses number type.
| * | | | | Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplateskumavis2018-03-2111-107/+162
| |\ \ \ \ \ | | | | | | | | | | | | | | I3571 complete i18n templates
| | * | | | | 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
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Retry tx refractor
| | * | | | | 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 txParams
| | * | | | 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 pull request #3594 from danjm/i3344-improve-currency-inputThomas Huang2018-03-201-6/+14
| | |\ \ \ | | | |_|/ | | |/| | Currency input defaults to empty string
| | | * | Currency input defaults to empty stringDan2018-03-171-6/+14
| | | | |
| | * | | Remove unused files from ui folder. (#3577)anticlimactic2018-03-1927-2507/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed unused UI files. Fixes #3434. * Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
| | * | | 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
| | |/ /
| * | | Merge branch 'retry-tx-refractor' of ↵frankiebee2018-03-163-22/+49
| |\ \ \ | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into retry-tx-refractor
| | * | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is ↵Dan2018-03-152-4/+34
| | | | | | | | | | | | | | | | | | | | not edited.
| | * | | 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 ↵Dan2018-03-152-12/+8
| | | | | | | | | | | | | | | | | | | | captured for non-tx transactions.
| | * | | 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
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Update Deposit Eth icon (#3569)Alexander Tseung2018-03-162-14/+6
| | | |/ | | |/|
| * | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-153-3/+3
| |\| | | | |/ | |/|
| | * Merge pull request #3558 from MetaMask/fix-two-translationsThomas Huang2018-03-152-2/+2
| | |\ | | | | | | | | Fix translations whose substitutions params were not in arrays.
| | | * Fix translations whose substitutions params were not in arrays.Dan2018-03-142-2/+2
| | | |
| | * | Grammar correctionDan Finlay2018-03-151-1/+1
| | |/
| * | Merge branch 'master' into retry-tx-refractorDan2018-03-1470-597/+888
| |\|
| | * ui - lint fixkumavis2018-03-141-1/+1
| | |
| | * Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characterskumavis2018-03-141-0/+13
| | |\ | | | | | | | | improved verification of restore from seed phrase
| | | * 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
| | | | |\ \ | | | | | | | | | | | | | | Change fonts in new-ui onboarding to Roboto, with weight 400.
| | | | | * | Update first time flow button fonts, and first-time-flow default font, to ↵Dan2018-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Roboto.
| | | | * | | Merge pull request #3495 from alextsg/cb-290kumavis2018-03-145-99/+93
| | | | |\ \ \ | | | | | | | | | | | | | | | | Increase tap areas for menu buttons on mobile
| | | | | * | | 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 ↵Dan2018-03-133-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | welcoem in popup.
| | | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | (#3494)
| | | * | | 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
| | | | | |
| | * | | | Correct caps of Send button on main screen.Dan2018-03-081-1/+1
| | | | | |
| | * | | | Merge branch 'master' into i18nDan Finlay2018-03-075-20/+30
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Correct merge conflict resolution errors.Dan2018-03-072-9/+0
| | | | | |
| | * | | | Merge branch 'master' into i18nDan2018-03-0759-297/+1265
| | |\ \ \ \
| | * | | | | Implemented feedback to make i18n work on macDan Finlay2018-03-073-8/+11
| | | | | | |
| | * | | | | complete i18n across new UINick Doiron2018-01-3032-96/+115
| | | | | | |
| | * | | | | pass linter, update ui testNick Doiron2018-01-281-8/+10
| | | | | | |
| | * | | | | get t imported in all files currently using i18nNick Doiron2018-01-2530-1/+30
| | | | | | |
| | * | | | | separate out cross-browser i18n for extensionsNick Doiron2018-01-2524-7/+41
| | | | | | |
| | * | | | | better organization of locale file; i18n in more view filesNick Doiron2018-01-2425-135/+123
| | | | | | |
| | * | | | | first steps to i18nNick Doiron2018-01-2331-153/+148
| | | | | | |
| * | | | | | 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 ↵Dan2018-03-133-25/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | button shows on correct tx.
| * | | | | | Lint fixes.Dan2018-03-092-3/+1
| | | | | | |
| * | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-0916-93/+182
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix flashing to Log in screen after logging in or restoring from seed phrase ↵Alexander Tseung2018-03-084-65/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3466)
| | * | | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-081-0/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Add seed phrase verification script into background process
| | | * | | | | verify seedwords on log inCsaba Solya2018-03-041-0/+7
| | | | | | | |
| | * | | | | | Update network colours for better accessibility. (#3469)Dan J Miller2018-03-082-4/+8
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'master' into ImportAccountMessageV2kumavis2018-03-078-12/+41
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #3455 from MetaMask/i2475-UnifyLogInWordingkumavis2018-03-071-2/+2
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | Replace Lock wording with Log Out / Log In
| | | | * | | | Merge branch 'master' into i2475-UnifyLogInWordingDan Finlay2018-03-073-9/+8
| | | | |\ \ \ \
| | | | * | | | | Replace Lock wording with Log Out / Log InDan Finlay2018-03-071-2/+2
| | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | Fixes #2475
| | | * | | | | Merge pull request #3433 from danjm/i3087-shapeshift-split-undefinedDan Finlay2018-03-075-4/+28
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Shapeshift form handles 'market info unavailable' errors.
| | | | * | | | | Shapeshift form handles market info unavailable errors.Dan2018-03-075-4/+28
| | | | | | | | |
| | | * | | | | | Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-editDan Finlay2018-03-071-3/+7
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Gracefully handle null token balance in new ui send.
| | | | * | | | | | Gracefully handle null token balance in new ui send.Dan2018-03-061-3/+7
| | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | Merge pull request #3444 from danjm/i3348-minus-not-a-numberDan Finlay2018-03-071-2/+3
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | Prevent user from selecting max amount until gas is estimated.
| | | | * | | | | Prevent user from selecting max amount until there is an estimated gas total.Dan2018-03-061-2/+3
| | | | |/ / / /
| | * | | | | | Merge branch 'master' into ImportAccountMessageV2Dan Finlay2018-03-073-14/+14
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'master' into ImportAccountMessageV2Thomas Huang2018-03-0315-35/+463
| | |\ \ \ \ \ \
| | * | | | | | | Import Account disclaimerThomas2018-03-032-9/+12
| | | | | | | | |
| | * | | | | | | Swap color scheme for import account labelThomas2018-03-031-2/+3
| | | | | | | | |
| | * | | | | | | Remove committed out merge codeThomas2018-02-281-16/+0
| | | | | | | | |
| | * | | | | | | Change Loose label to ImportedThomas2018-02-281-1/+1
| | | | | | | | |
| | * | | | | | | Add import account disclaimerThomas2018-02-281-0/+22
| | | | | | | | |
| * | | | | | | | 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, ↵Dan2018-03-099-16/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | customize-gas-modal, and dependents.
| * | | | | | | | Add html and css for responsive retry button.Dan2018-03-093-0/+57
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Default add-token decimal value to string (#3451)Dan J Miller2018-03-071-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Fix seed phrase validation clearing form (#3417)Alexander Tseung2018-03-072-8/+7
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix seed phrase validation clearing form * Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
| * | | | | Fixes shapeshift coin selection dropdown. (#3416)Dan J Miller2018-03-062-6/+7
| | |/ / / | |/| | |
| * | | | Fix NewUI reveal seed flow. (#3410)Dan J Miller2018-03-034-8/+22
| | | | |
| * | | | Allow adding 0 balance tokens in old ui and editing custom token info in new ↵Dan J Miller2018-03-031-5/+21
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | (#3395) * Shows tokens with 0 balance in old ui; goHome after adding tokens. * Allow users to edit custom token info when not autofilled. (New UI add token screen).
| * | | Fix network menu for custom URLs (#3366)Alexander Tseung2018-03-022-14/+31
| | | |
| * | | Fix exception thrown when styleOverride is not present (#3364)Alexander Tseung2018-03-021-1/+1
| | | |
| * | | Merge pull request #3356 from MetaMask/cdn-minimizationKevin Serrano2018-03-021-2/+336
| |\ \ \ | | | | | | | | | | Check in all font files locally.
| | * | | Correct ttf format name to 'truetype'Dan2018-03-021-42/+42
| | | | |
| | * | | Check in all font files locally.Kevin Serrano2018-03-011-2/+336
| | |/ /
| * | | Merge pull request #3359 from MetaMask/token-check-urlkumavis2018-03-011-1/+1
| |\ \ \ | | | | | | | | | | [new-ui] add token - check for logo url before trying to use
| | * | | add token - check for logo url before trying to usekumavis2018-03-011-1/+1
| | | | |
| * | | | Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvementskumavis2018-03-013-0/+47
| |\ \ \ \ | | | | | | | | | | | | [NewUI] Onboarding flow style improvements
| | * | | | Adds beta label to Metamask name in full screen app bar.Dan2018-02-282-0/+17
| | | | | |
| | * | | | Move beta warning to app header.Dan2018-02-281-0/+6
| | | | | |
| | * | | | Body width container in first time flow is consistent with app bar.Dan2018-02-281-0/+24
| | | |/ / | | |/| |
| * | | | Merge pull request #3340 from danjm/i3338-contract-published-terminologykumavis2018-03-012-2/+2
| |\ \ \ \ | | |_|/ / | |/| | | [NewUI] Replace 'Contract Published' label with 'Contract Deployment'
| | * | | Replace 'Contract Published' with 'Contract Deployment' for clearer ↵Dan2018-02-282-2/+2
| | |/ / | | | | | | | | | | | | indication of contract tx state.
| * / / Define event locally in onClickOutside method in account-dropdowns.jsDan2018-03-012-2/+2
| |/ /
| * | fix feature flags being undefinedfrankiebee2018-02-271-0/+1
| | |
| * | Use same logic for downloading state logs in the old/uatThomas Huang2018-02-211-1/+7
| | |
| * | Render loading inside notice screen, and don't set isLoading from ↵Dan2018-02-211-1/+0
| | | | | | | | | | | | unMarkPasswordForgotten.
| * | Try fixing notice screen synchronous state callDan Finlay2018-02-211-2/+1
| | |
| * | Fix Import Existing DEN in popup New UI first time flow.Dan2018-02-202-2/+24
| | |
| * | Ensures that mascara initialize screen is not shown in popup. (#3279)Dan J Miller2018-02-171-1/+4
| | |
| * | Merge pull request #3200 from alextsg/cb-703kumavis2018-02-176-6/+6
| |\ \ | | | | | | | | [NewUI] Remove accessing PropTypes from main React package
| | * | Remove accessing PropTypes from main React packageAlexander Tseung2018-02-076-6/+6
| | | |
| * | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257)Dan J Miller2018-02-162-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | * Adds the mascara first time flow to the extension when opened in browser. * Fix tests after addition of mascara first time flow to new ui.
| * | | Merge pull request #3231 from danjm/MM-744-restore-from-seed-fixDan J Miller2018-02-142-3/+4
| |\ \ \ | | | | | | | | | | [NewUI] Only open a new window on restore from seed if in extension view.
| | * | | Remove isInBrowser method and use environment-type.jsDan2018-02-141-6/+4
| | | | |
| | * | | Only open a new window on restore from seed if in extension view.Dan2018-02-142-3/+6
| | | | |
| * | | | Merge pull request #3209 from danjm/MM-634-newui-reset-accountDan Finlay2018-02-145-35/+157
| |\ \ \ \ | | |/ / / | |/| | | [NewUI] Add reset account button to new UI.
| | * | | Add reset account button to new UI.Dan2018-02-095-35/+157
| | | | |
| * | | | Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screensDan Finlay2018-02-141-0/+17
| |\ \ \ \ | | | | | | | | | | | | [NewUI] Try beta link on unlock and privacy screens.
| | * | | | Try beta link on unlock and privacy screens.Dan2018-02-091-0/+17
| | |/ / /
| * | | | Updates the styling of confirm send ether and token screens. (#3235)Dan J Miller2018-02-133-26/+20
| | | | |
| * | | | Send screen style updates. (#3234)Dan J Miller2018-02-134-9/+52
| | | | |
| * | | | Remove chrome focus outline for mouse users. (#3230)Dan J Miller2018-02-134-1/+40
| | | | |
* | | | | Fix react-router related exceptionsAlexander Tseung2018-02-102-2/+2
| | | | |
* | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵Alexander Tseung2018-02-091-3/+3
|\| | | | | | | | | | | | | | | | | | | into cb-254
| * | | | Fix exception thrown in selected token tx list with shapeshift txs (#3215)Alexander Tseung2018-02-091-3/+3
| | | | |
* | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵Alexander Tseung2018-02-092-36/+28
|\| | | | | | | | | | | | | | | | | | | into cb-254
| * | | | Fixes shapeshift txs so that they render in tx list. (#3208)Dan J Miller2018-02-092-36/+28
| |/ / /
* | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵Alexander Tseung2018-02-0917-102/+432
|\| | | | | | | | | | | | | | | into cb-254
| * | | Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019Dan J Miller2018-02-082-0/+22
| |\ \ \ | | | | | | | | | | [NewUI] Merge uat to uatnext feb072019
| | * \ \ Merge branch 'uat' into uat-nextDan2018-02-082-0/+22
| | |\ \ \
| | | * \ \ Merge branch 'master' into uatDan2018-02-082-0/+22
| | | |\ \ \
| | | | * | | Scrollable Settings screen for FirefoxThomas2018-02-021-1/+6
| | | | | | |
| | | | * | | Merge pull request #3161 from MetaMask/AddResetExplanationFrankie2018-02-012-59/+20
| | | | |\ \ \ | | | | | | | | | | | | | | | | Add reset explanation
| | | | | * | | Add explanation of account resettingDan Finlay2018-02-011-0/+20
| | | | | | | |
| | | | | * | | Remove unused fileDan Finlay2018-02-011-59/+0
| | | | | | | |
| | | | * | | | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputsFrankie2018-02-011-2/+2
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | Set address to default with empty string, add test validation.
| | | | | * | | Set address to default with empty string, add test validation.Thomas2018-01-311-2/+2
| | | | | | | |
| | | | * | | | added reset account featureBruno Barbieri2018-01-312-0/+35
| | | | | | | |
| | | | * | | | Add warning when importing no valid fileDan Finlay2018-01-311-0/+6
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | Fixes #3089
| * | | / / / Make blockies icon round to match identicons (#3205)Alexander Tseung2018-02-082-5/+5
| |/ / / / /
| * | | | | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-085-24/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.
| * | | | | Update modal header design on send screen (#3196)Alexander Tseung2018-02-073-55/+126
| | | | | |
| * | | | | Fix alignment of ellipsis and address in wallet view. (#3198)Dan J Miller2018-02-073-2/+3
| | |_|/ / | |/| | |
| * | | | Remove duplicate token balance on uat next. (#3195)Dan J Miller2018-02-071-2/+0
| | | | |
| * | | | Add functional integration testing to Add Token flow (#3189)Alexander Tseung2018-02-061-3/+4
| | | | |
| * | | | Wallet view supports screen sizes between 576px and 667px (#3193)Dan J Miller2018-02-065-24/+70
| | | | |
* | | | | Fix lint errorsAlexander Tseung2018-02-024-10/+3
| | | | |
* | | | | Checks if there is currently a send in progress before redirecting to ↵Dan2018-02-011-3/+7
| | | | | | | | | | | | | | | | | | | | default in conf-tx
* | | | | Fix merge conflicts from uat-nextAlexander Tseung2018-02-0116-153/+214
|\| | | |
| * | | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-015-11/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use tooltip for display of helper text in wallet views copy to clipboard feature. * Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change. * Remove unnecessary tabIndex attribute from wallet view address element.
| * | | | [NewUI] Updates capitalization and alignment for the import account screen. ↵Dan J Miller2018-02-013-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3122) * Updates capitalization and alignment for the import account screen. * Align elements in import form.
| * | | | [NewUI] Set default new account name as placeholder, but not value (#3121)Dan J Miller2018-02-011-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Set default new account name as placehold, and not value, in new account create screen. * Set new account number in create-form.js in constructor.
| * | | | Fix bug stemming from erroneously persistant unlock failure error message. ↵Dan J Miller2018-01-302-0/+15
| |/ / / | | | | | | | | | | | | (#3123)
| * | | Merge branch 'master' into uatThomas Huang2018-01-241-1/+0
| |\| |
| | * | add a `x` close button to gas calc loding screen on conf-txfrankiebee2018-01-182-2/+16
| | | |
| * | | String interpolate version in settingsThomas2018-01-231-1/+1
| | |/ | |/|
| * | Merge pull request #3049 from chikeichan/newmasterChi Kei Chan2018-01-201-1/+1
| |\ \ | | | | | | | | Merge master to uat
| | * \ Merge branch 'uat' into newmasterChi Kei Chan2018-01-20152-3280/+17901
| | |\ \ | | | |/ | | |/|
| | * | Add network-indicator classname to network loading spinnerThomas2018-01-181-1/+1
| | | |
| * | | Get version from manifest instead of hard coding in New UI info page.Dan2018-01-201-1/+3
| | |/ | |/|
* | | 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
|\| |
| * | Fix transaction list font sizes, paddingAlexander Tseung2018-01-192-17/+7
| | |
| * | Merge pull request #3024 from alextsg/cb-529Kevin Serrano2018-01-193-3/+5
| |\ \ | | | | | | | | [NewUI] Update popout to fullscreen icon
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 06:50:04 +0800