| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 28 | -182/+178 |
|\ |
|
| * | Merge pull request #3721 from alextsg/cb-944 | Dan Finlay | 2018-03-27 | 24 | -139/+149 |
| |\ |
|
| | * | Update button styles | Alexander Tseung | 2018-03-26 | 24 | -139/+149 |
| * | | Use ens-input component in send-v2 to allow sending to ens names. | Dan | 2018-03-26 | 5 | -43/+30 |
| |/ |
|
* | | Default current locale in metamask reducer to empty string. | Dan | 2018-03-24 | 1 | -1/+1 |
* | | Memoize t function in metamask-connect | Dan | 2018-03-24 | 1 | -1/+7 |
* | | Correct proptypes for t in new-account/create-form.js | Dan | 2018-03-22 | 1 | -1/+1 |
* | | Correct reprice title and subtitle key names. | Dan | 2018-03-22 | 1 | -2/+2 |
* | | Fix sender-to-recipient export and non-existent translation key. | Dan | 2018-03-22 | 2 | -5/+3 |
* | | Correct connect reference in confirm-send-ether, confirm-deploy-contract, net... | Dan | 2018-03-22 | 3 | -3/+3 |
* | | Lint fixes | Dan | 2018-03-22 | 14 | -18/+18 |
* | | Fix references to undefined 'this.props' | Dan | 2018-03-22 | 2 | -25/+23 |
* | | Remove console.logs | Dan | 2018-03-22 | 1 | -1/+0 |
* | | Missed modifications of t() in merge resolution. | Dan | 2018-03-22 | 3 | -4/+1 |
* | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 13 | -206/+298 |
|\| |
|
| * | ui - tx conf - only show special token tx conf screen for token send | kumavis | 2018-03-22 | 1 | -4/+8 |
| * | Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/m... | kumavis | 2018-03-22 | 3 | -5/+13 |
| |\ |
|
| | * | Identify token transactions by method names token data, and not just whether ... | Dan | 2018-03-20 | 3 | -5/+13 |
| * | | Merge pull request #3624 from alextsg/cb-941 | kumavis | 2018-03-21 | 8 | -195/+271 |
| |\ \ |
|
| | * | | Update confirm transaction screen | Alexander Tseung | 2018-03-21 | 8 | -195/+271 |
| * | | | Gas inputs can be changed by up and down arrows (#3598) | Dan J Miller | 2018-03-21 | 2 | -0/+3 |
* | | | | i18n redux solution doesn't require importing t() and passing state to each t... | Dan | 2018-03-22 | 61 | -437/+397 |
* | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-21 | 30 | -163/+574 |
|\| | | |
|
| * | | | Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplates | kumavis | 2018-03-21 | 11 | -107/+162 |
| |\ \ \ |
|
| | * | | | Add i18n to tx status | Thomas | 2018-03-21 | 1 | -1/+26 |
| | * | | | Merge branch 'master' into i3571-CompleteI18nTemplates | Thomas | 2018-03-21 | 20 | -57/+377 |
| | |\ \ \ |
|
| | * | | | | Add i18n in settings/info | Thomas | 2018-03-21 | 1 | -14/+14 |
| | * | | | | Started on Tx list i18n | Thomas | 2018-03-21 | 1 | -1/+1 |
| | * | | | | i18n Import flow | Thomas | 2018-03-21 | 2 | -5/+5 |
| | * | | | | I18n add-token.js | Thomas | 2018-03-20 | 1 | -21/+22 |
| | * | | | | Add send screen template | Dan Finlay | 2018-03-20 | 1 | -15/+15 |
| | * | | | | Add template for settings and info | Dan Finlay | 2018-03-20 | 1 | -23/+25 |
| | * | | | | Add recover and backup tempaltes | Dan Finlay | 2018-03-20 | 2 | -18/+24 |
| | * | | | | Add login templates | Dan Finlay | 2018-03-20 | 1 | -3/+3 |
| | * | | | | Add connecting indication templates | Dan Finlay | 2018-03-20 | 1 | -6/+27 |
| | | |_|/
| | |/| | |
|
| * | | | | Merge pull request #3632 from MetaMask/retry-tx-refractor | kumavis | 2018-03-21 | 3 | -1/+35 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | Take user home if an unapproved tx is dropped while they are viewing. | Dan | 2018-03-21 | 1 | -0/+18 |
| | * | | | Fix styling regression from master merge. | Dan | 2018-03-20 | 1 | -1/+1 |
| | * | | | Improve responsiveness of gas price row on confirm screen. | Dan | 2018-03-20 | 1 | -0/+16 |
| | | |/
| | |/| |
|
| * | | | Merge pull request #3623 from MetaMask/i#3554 | kumavis | 2018-03-21 | 1 | -0/+2 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | new-ui - dont exclude `txParams.data` when editing and updating txParams | frankiebee | 2018-03-20 | 1 | -0/+2 |
| | |/ |
|
| * | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 10 | -13/+25 |
| |\ \ |
|
| | * | | Fix Account Names being cropped (#3626) | Alexander Tseung | 2018-03-20 | 6 | -11/+6 |
| | * | | Don't block user from setting gas if estimating gas returns errors. (#3627) | Dan J Miller | 2018-03-20 | 4 | -2/+19 |
| | |/ |
|
| * | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 38 | -3037/+688 |
| |\| |
|
| * | | Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-ext... | frankiebee | 2018-03-16 | 3 | -22/+49 |
| |\ \ |
|
| | * | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not... | Dan | 2018-03-15 | 2 | -4/+34 |
| | * | | Force gas min has correct precision and is set when editing gas if max. | Dan | 2018-03-15 | 3 | -7/+8 |
| | * | | Ensure changes from customize gas modal opened from confirm screen are captur... | Dan | 2018-03-15 | 2 | -12/+8 |
| | * | | Revert 'Set txMeta.time to reflect time of tx approval.' | Dan | 2018-03-15 | 1 | -3/+3 |
| * | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-16 | 2 | -14/+6 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 3 | -3/+3 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 69 | -597/+855 |
| |\ \ \ \ |
|
| * | | | | | Fix more lint errors. | Dan | 2018-03-14 | 3 | -11/+2 |
| * | | | | | Remove unnecessary addition of nonce to state. | Dan | 2018-03-14 | 3 | -10/+0 |
| * | | | | | Make token confirmations compatible. | Dan | 2018-03-14 | 2 | -14/+88 |
| * | | | | | Fix tx-list-item submitted check. | Dan | 2018-03-14 | 1 | -1/+1 |
| * | | | | | Use correct name for submittedTime field in tx-list.js | Dan | 2018-03-14 | 1 | -1/+1 |
| * | | | | | Use correct var name in new-ui showRetryButton | Dan | 2018-03-14 | 1 | -1/+1 |
| * | | | | | Undefined check in showRetryButton | Dan | 2018-03-14 | 1 | -3/+4 |
| * | | | | | Styling for dropped. | Dan | 2018-03-14 | 2 | -0/+5 |
| * | | | | | Use new submittedTime field to correctly show retry button in old and new ui. | Dan | 2018-03-14 | 3 | -9/+9 |
| * | | | | | Set txMeta.time to reflect time of tx approval. | Dan | 2018-03-13 | 1 | -3/+3 |
| * | | | | | Improve phrasing of copy. | Dan | 2018-03-13 | 2 | -2/+2 |
| * | | | | | Fix gas calculation and nonce / forceGasMin state setting errors; retry butto... | Dan | 2018-03-13 | 3 | -25/+39 |
| * | | | | | Lint fixes. | Dan | 2018-03-09 | 2 | -3/+1 |
| * | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-09 | 16 | -93/+182 |
| |\ \ \ \ \ |
|
| * | | | | | | Adds inline opening of gas customization to confirm-send-ether screen. | Dan | 2018-03-09 | 3 | -10/+63 |
| * | | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, customize-... | Dan | 2018-03-09 | 9 | -16/+113 |
| * | | | | | | Add html and css for responsive retry button. | Dan | 2018-03-09 | 3 | -0/+57 |
* | | | | | | | Lint fixes. | Dan | 2018-03-20 | 14 | -9/+19 |
* | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 1 | -6/+14 |
|\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | Merge pull request #3594 from danjm/i3344-improve-currency-input | Thomas Huang | 2018-03-20 | 1 | -6/+14 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Currency input defaults to empty string | Dan | 2018-03-17 | 1 | -6/+14 |
| | | |_|_|_|/
| | |/| | | | |
|
* | | | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect re... | Dan | 2018-03-20 | 17 | -23/+28 |
* | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 38 | -3037/+672 |
|\| | | | | | |
|
| * | | | | | | Remove unused files from ui folder. (#3577) | anticlimactic | 2018-03-19 | 26 | -2474/+0 |
| * | | | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600) | Alexander Tseung | 2018-03-17 | 3 | -225/+231 |
| * | | | | | | Update Confirm Contract screen (#3597) | Alexander Tseung | 2018-03-17 | 8 | -322/+432 |
| * | | | | | | Update margins for consistency in first time flow (#3588) | Alexander Tseung | 2018-03-16 | 1 | -6/+8 |
| |/ / / / / |
|
| * | | | / | Update Deposit Eth icon (#3569) | Alexander Tseung | 2018-03-16 | 2 | -14/+6 |
| | |_|_|/
| |/| | | |
|
* | | | | | Delete commented out code from i18n implementation that used globals. | Dan | 2018-03-20 | 1 | -5/+0 |
* | | | | | Handle i18n with redux. | Dan | 2018-03-16 | 82 | -374/+467 |
* | | | | | ui - settings - add option to set current locale | kumavis | 2018-03-15 | 1 | -0/+45 |
* | | | | | i18n - load locales manually | kumavis | 2018-03-15 | 36 | -59/+70 |
|/ / / / |
|
* | | | | Merge pull request #3558 from MetaMask/fix-two-translations | Thomas Huang | 2018-03-15 | 2 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Fix translations whose substitutions params were not in arrays. | Dan | 2018-03-14 | 2 | -2/+2 |
| | |_|/
| |/| | |
|
* / | | | Grammar correction | Dan Finlay | 2018-03-15 | 1 | -1/+1 |
|/ / / |
|
* | | | ui - lint fix | kumavis | 2018-03-14 | 1 | -1/+1 |
* | | | Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters | kumavis | 2018-03-14 | 1 | -0/+13 |
|\ \ \ |
|
| * | | | FIX #3440 improved verification of restore from seed phrase | criw | 2018-03-06 | 1 | -0/+13 |
* | | | | Add closing parens to appName | Thomas | 2018-03-14 | 1 | -1/+1 |
* | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-14 | 11 | -105/+245 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'master' into i3033-responsive-newui-onboarding | kumavis | 2018-03-14 | 19 | -331/+469 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge pull request #3470 from danjm/newui-onboarding-fonts | kumavis | 2018-03-14 | 1 | -1/+1 |
| | |\ \ \ \ |
|
| | | * | | | | Update first time flow button fonts, and first-time-flow default font, to Rob... | Dan | 2018-03-08 | 1 | -1/+1 |
| | * | | | | | Merge pull request #3495 from alextsg/cb-290 | kumavis | 2018-03-14 | 5 | -99/+93 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Increase tap areas for menu buttons on mobile | Alexander Tseung | 2018-03-10 | 5 | -99/+93 |
| * | | | | | | | Left align create password. | Dan | 2018-03-13 | 1 | -0/+12 |
| * | | | | | | | Styling fixes to welcome; hide network component on create password; shown we... | Dan | 2018-03-13 | 3 | -8/+7 |
| * | | | | | | | Add welcome screen to new-ui browser first time flow. | Dan | 2018-03-09 | 6 | -3/+139 |
| * | | | | | | | Make new-ui create password screen responsive. | Dan | 2018-03-08 | 1 | -24/+0 |
| | |_|/ / / /
| |/| | | | | |
|
* | | | | | | | Add missing opening parens to pag-container__subtitle | Thomas | 2018-03-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-14 | 5 | -83/+122 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Update deposit ether styling (#3510) | Alexander Tseung | 2018-03-13 | 5 | -82/+125 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | Add i18n back into JsonImportSubview | Thomas | 2018-03-12 | 1 | -7/+7 |
* | | | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-12 | 10 | -150/+228 |
|\| | | | | |
|
| * | | | | | Remove de-selected token from selectedTokens hash instead of setting to null ... | Alexander Tseung | 2018-03-09 | 1 | -6/+10 |
| * | | | | | Add empty object default value for tokenData (#3493) | Alexander Tseung | 2018-03-09 | 1 | -2/+2 |
| * | | | | | Explicitly define state in import account from json component (#3491) | Alexander Tseung | 2018-03-09 | 2 | -79/+103 |
| | |_|_|/
| |/| | | |
|
| * | | | | Fix flashing to Log in screen after logging in or restoring from seed phrase ... | Alexander Tseung | 2018-03-08 | 4 | -65/+104 |
| * | | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 1 | -0/+7 |
| |\ \ \ \ |
|
| | * | | | | verify seedwords on log in | Csaba Solya | 2018-03-04 | 1 | -0/+7 |
| * | | | | | Update network colours for better accessibility. (#3469) | Dan J Miller | 2018-03-08 | 2 | -4/+8 |
| | |/ / /
| |/| | | |
|
* | | | | | Correct caps of Send button on main screen. | Dan | 2018-03-08 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into i18n | Dan Finlay | 2018-03-07 | 5 | -20/+30 |
|\| | | | |
|
| * | | | | Merge branch 'master' into ImportAccountMessageV2 | kumavis | 2018-03-07 | 8 | -12/+41 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording | kumavis | 2018-03-07 | 1 | -2/+2 |
| | |\ \ \ \ |
|
| | | * \ \ \ | Merge branch 'master' into i2475-UnifyLogInWording | Dan Finlay | 2018-03-07 | 3 | -9/+8 |
| | | |\ \ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | * | | | | Replace Lock wording with Log Out / Log In | Dan Finlay | 2018-03-07 | 1 | -2/+2 |
| | | | |_|/
| | | |/| | |
|
| * | | | | | Merge branch 'master' into ImportAccountMessageV2 | Dan Finlay | 2018-03-07 | 3 | -14/+14 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' into ImportAccountMessageV2 | Thomas Huang | 2018-03-03 | 15 | -35/+463 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Import Account disclaimer | Thomas | 2018-03-03 | 2 | -9/+12 |
| * | | | | | | | Swap color scheme for import account label | Thomas | 2018-03-03 | 1 | -2/+3 |
| * | | | | | | | Remove committed out merge code | Thomas | 2018-02-28 | 1 | -16/+0 |
| * | | | | | | | Change Loose label to Imported | Thomas | 2018-02-28 | 1 | -1/+1 |
| * | | | | | | | Add import account disclaimer | Thomas | 2018-02-28 | 1 | -0/+22 |
* | | | | | | | | Correct merge conflict resolution errors. | Dan | 2018-03-07 | 2 | -9/+0 |
* | | | | | | | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 58 | -297/+1264 |
|\ \ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | | | |
|
| * | | | | | | | Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined | Dan Finlay | 2018-03-07 | 5 | -4/+28 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Shapeshift form handles market info unavailable errors. | Dan | 2018-03-07 | 5 | -4/+28 |
| | | |_|/ / / /
| | |/| | | | | |
|
| * | | | | | | | Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit | Dan Finlay | 2018-03-07 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Gracefully handle null token balance in new ui send. | Dan | 2018-03-06 | 1 | -3/+7 |
| | | |_|_|/ / /
| | |/| | | | | |
|
| * | | | | | | | Merge pull request #3444 from danjm/i3348-minus-not-a-number | Dan Finlay | 2018-03-07 | 1 | -2/+3 |
| |\ \ \ \ \ \ \
| | |_|_|_|_|/ /
| |/| | | | | | |
|
| | * | | | | | | Prevent user from selecting max amount until there is an estimated gas total. | Dan | 2018-03-06 | 1 | -2/+3 |
| | |/ / / / / |
|
| * | / / / / | Default add-token decimal value to string (#3451) | Dan J Miller | 2018-03-07 | 1 | -1/+1 |
| | |/ / / /
| |/| | | | |
|
| * | | | | | Fix seed phrase validation clearing form (#3417) | Alexander Tseung | 2018-03-07 | 2 | -8/+7 |
| |/ / / / |
|
| * | / / | Fixes shapeshift coin selection dropdown. (#3416) | Dan J Miller | 2018-03-06 | 2 | -6/+7 |
| | |/ /
| |/| | |
|
| * | | | Fix NewUI reveal seed flow. (#3410) | Dan J Miller | 2018-03-03 | 4 | -8/+22 |
| * | | | Allow adding 0 balance tokens in old ui and editing custom token info in new ... | Dan J Miller | 2018-03-03 | 1 | -5/+21 |
| | |/
| |/| |
|
| * | | Fix network menu for custom URLs (#3366) | Alexander Tseung | 2018-03-02 | 2 | -14/+31 |
| * | | Fix exception thrown when styleOverride is not present (#3364) | Alexander Tseung | 2018-03-02 | 1 | -1/+1 |
| * | | Merge pull request #3356 from MetaMask/cdn-minimization | Kevin Serrano | 2018-03-02 | 1 | -2/+336 |
| |\ \ |
|
| | * | | Correct ttf format name to 'truetype' | Dan | 2018-03-02 | 1 | -42/+42 |
| | * | | Check in all font files locally. | Kevin Serrano | 2018-03-01 | 1 | -2/+336 |
| | |/ |
|
| * | | Merge pull request #3359 from MetaMask/token-check-url | kumavis | 2018-03-01 | 1 | -1/+1 |
| |\ \ |
|
| | * | | add token - check for logo url before trying to use | kumavis | 2018-03-01 | 1 | -1/+1 |
| * | | | Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvements | kumavis | 2018-03-01 | 3 | -0/+47 |
| |\ \ \ |
|
| | * | | | Adds beta label to Metamask name in full screen app bar. | Dan | 2018-02-28 | 2 | -0/+17 |
| | * | | | Move beta warning to app header. | Dan | 2018-02-28 | 1 | -0/+6 |
| | * | | | Body width container in first time flow is consistent with app bar. | Dan | 2018-02-28 | 1 | -0/+24 |
| | | |/
| | |/| |
|
| * | | | Merge pull request #3340 from danjm/i3338-contract-published-terminology | kumavis | 2018-03-01 | 2 | -2/+2 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Replace 'Contract Published' with 'Contract Deployment' for clearer indicatio... | Dan | 2018-02-28 | 2 | -2/+2 |
| | |/ |
|
| * / | Define event locally in onClickOutside method in account-dropdowns.js | Dan | 2018-03-01 | 2 | -2/+2 |
| |/ |
|
| * | Use same logic for downloading state logs in the old/uat | Thomas Huang | 2018-02-21 | 1 | -1/+7 |
| * | Render loading inside notice screen, and don't set isLoading from unMarkPassw... | Dan | 2018-02-21 | 1 | -1/+0 |
| * | Try fixing notice screen synchronous state call | Dan Finlay | 2018-02-21 | 1 | -2/+1 |
| * | Fix Import Existing DEN in popup New UI first time flow. | Dan | 2018-02-20 | 2 | -2/+24 |
| * | Ensures that mascara initialize screen is not shown in popup. (#3279) | Dan J Miller | 2018-02-17 | 1 | -1/+4 |
| * | Merge pull request #3200 from alextsg/cb-703 | kumavis | 2018-02-17 | 6 | -6/+6 |
| |\ |
|
| | * | Remove accessing PropTypes from main React package | Alexander Tseung | 2018-02-07 | 6 | -6/+6 |
| * | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257) | Dan J Miller | 2018-02-16 | 2 | -4/+8 |
| * | | Merge pull request #3231 from danjm/MM-744-restore-from-seed-fix | Dan J Miller | 2018-02-14 | 2 | -3/+4 |
| |\ \ |
|
| | * | | Remove isInBrowser method and use environment-type.js | Dan | 2018-02-14 | 1 | -6/+4 |
| | * | | Only open a new window on restore from seed if in extension view. | Dan | 2018-02-14 | 2 | -3/+6 |
| * | | | Merge pull request #3209 from danjm/MM-634-newui-reset-account | Dan Finlay | 2018-02-14 | 5 | -35/+157 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Add reset account button to new UI. | Dan | 2018-02-09 | 5 | -35/+157 |
| * | | | Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screens | Dan Finlay | 2018-02-14 | 1 | -0/+17 |
| |\ \ \ |
|
| | * | | | Try beta link on unlock and privacy screens. | Dan | 2018-02-09 | 1 | -0/+17 |
| | |/ / |
|
| * | | | Updates the styling of confirm send ether and token screens. (#3235) | Dan J Miller | 2018-02-13 | 3 | -26/+20 |
| * | | | Send screen style updates. (#3234) | Dan J Miller | 2018-02-13 | 4 | -9/+52 |
| * | | | Remove chrome focus outline for mouse users. (#3230) | Dan J Miller | 2018-02-13 | 4 | -1/+40 |
| * | | | Fix exception thrown in selected token tx list with shapeshift txs (#3215) | Alexander Tseung | 2018-02-09 | 1 | -3/+3 |
| * | | | Fixes shapeshift txs so that they render in tx list. (#3208) | Dan J Miller | 2018-02-09 | 2 | -36/+28 |
| |/ / |
|
| * | | Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019 | Dan J Miller | 2018-02-08 | 2 | -0/+22 |
| |\ \ |
|
| | * \ | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 2 | -0/+22 |
| | |\ \ |
|
| | | * \ | Merge branch 'master' into uat | Dan | 2018-02-08 | 2 | -0/+22 |
| | | |\ \ |
|
| | | | * | | Scrollable Settings screen for Firefox | Thomas | 2018-02-02 | 1 | -1/+6 |
| | | | * | | Merge pull request #3161 from MetaMask/AddResetExplanation | Frankie | 2018-02-01 | 2 | -59/+20 |
| | | | |\ \ |
|
| | | | | * | | Add explanation of account resetting | Dan Finlay | 2018-02-01 | 1 | -0/+20 |
| | | | | * | | Remove unused file | Dan Finlay | 2018-02-01 | 1 | -59/+0 |
| | | | * | | | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs | Frankie | 2018-02-01 | 1 | -2/+2 |
| | | | |\ \ \
| | | | | |/ /
| | | | |/| | |
|
| | | | | * | | Set address to default with empty string, add test validation. | Thomas | 2018-01-31 | 1 | -2/+2 |
| | | | * | | | added reset account feature | Bruno Barbieri | 2018-01-31 | 2 | -0/+35 |
| | | | * | | | Add warning when importing no valid file | Dan Finlay | 2018-01-31 | 1 | -0/+6 |
| | | | |/ / |
|
| * | | / / | Make blockies icon round to match identicons (#3205) | Alexander Tseung | 2018-02-08 | 2 | -5/+5 |
| |/ / / / |
|
| * | | | | [NewUI] Opens to full screen when restoring from seed. (#3201) | Dan J Miller | 2018-02-08 | 5 | -24/+39 |
| * | | | | Update modal header design on send screen (#3196) | Alexander Tseung | 2018-02-07 | 3 | -55/+126 |
| * | | | | Fix alignment of ellipsis and address in wallet view. (#3198) | Dan J Miller | 2018-02-07 | 3 | -2/+3 |
| | |_|/
| |/| | |
|
| * | | | Remove duplicate token balance on uat next. (#3195) | Dan J Miller | 2018-02-07 | 1 | -2/+0 |
| * | | | Add functional integration testing to Add Token flow (#3189) | Alexander Tseung | 2018-02-06 | 1 | -3/+4 |
| * | | | Wallet view supports screen sizes between 576px and 667px (#3193) | Dan J Miller | 2018-02-06 | 5 | -24/+70 |
| * | | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) | Dan J Miller | 2018-02-01 | 5 | -11/+76 |
| * | | | [NewUI] Updates capitalization and alignment for the import account screen. (... | Dan J Miller | 2018-02-01 | 3 | -11/+35 |
| * | | | [NewUI] Set default new account name as placeholder, but not value (#3121) | Dan J Miller | 2018-02-01 | 1 | -5/+8 |
| * | | | Fix bug stemming from erroneously persistant unlock failure error message. (#... | Dan J Miller | 2018-01-30 | 2 | -0/+15 |
| |/ / |
|
| * | | Merge branch 'master' into uat | Thomas Huang | 2018-01-24 | 1 | -1/+0 |
| |\| |
|
| | * | add a `x` close button to gas calc loding screen on conf-tx | frankiebee | 2018-01-18 | 2 | -2/+16 |
| * | | String interpolate version in settings | Thomas | 2018-01-23 | 1 | -1/+1 |
* | | | Implemented feedback to make i18n work on mac | Dan Finlay | 2018-03-07 | 2 | -2/+4 |
* | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 31 | -93/+101 |
* | | | get t imported in all files currently using i18n | Nick Doiron | 2018-01-25 | 29 | -0/+29 |
* | | | separate out cross-browser i18n for extensions | Nick Doiron | 2018-01-25 | 23 | -7/+23 |
* | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 25 | -135/+123 |
* | | | first steps to i18n | Nick Doiron | 2018-01-23 | 31 | -153/+148 |
|/ / |
|
* | | Merge pull request #3049 from chikeichan/newmaster | Chi Kei Chan | 2018-01-20 | 1 | -1/+1 |
|\ \ |
|
| * \ | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 145 | -3271/+17482 |
| |\ \
| | |/
| |/| |
|
| * | | Add network-indicator classname to network loading spinner | Thomas | 2018-01-18 | 1 | -1/+1 |
* | | | Get version from manifest instead of hard coding in New UI info page. | Dan | 2018-01-20 | 1 | -1/+3 |
| |/
|/| |
|
* | | Fix transaction list font sizes, padding | Alexander Tseung | 2018-01-19 | 2 | -17/+7 |
* | | Merge pull request #3024 from alextsg/cb-529 | Kevin Serrano | 2018-01-19 | 3 | -3/+5 |
|\ \ |
|
| * | | Fix lint errors | Alexander Tseung | 2018-01-18 | 1 | -1/+1 |
| * | | Update popout to fullscreen icon | Alexander Tseung | 2018-01-18 | 2 | -2/+4 |
* | | | [NewUI] Send screen gas loading fixes (#3027) | Dan J Miller | 2018-01-18 | 3 | -27/+25 |
|/ / |
|
* | | Show now tokens by default and improve search on add token screen. | Dan | 2018-01-18 | 1 | -5/+10 |
* | | Fix tx-list, confirmation screen styling | Alexander Tseung | 2018-01-18 | 4 | -13/+18 |
* | | Merge pull request #3005 from alextsg/cb-385 | Chi Kei Chan | 2018-01-18 | 1 | -1/+3 |
|\ \ |
|
| * | | Fix rendering QR code in old UI, hide unnecessary back button | Alexander Tseung | 2018-01-17 | 1 | -1/+3 |
* | | | Merge pull request #3007 from alextsg/uat-master-011618 | Chi Kei Chan | 2018-01-18 | 3 | -5/+7 |
|\ \ \ |
|
| * | | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 145 | -3271/+17449 |
| |\| |
| | |/
| |/| |
|
| * | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight | Dan Finlay | 2018-01-17 | 2 | -1/+7 |
| |\ \ |
|
| | * \ | Merge pull request #2984 from MetaMask/RenameLockToLogout | Thomas Huang | 2018-01-17 | 1 | -1/+1 |
| | |\ \ |
|
| | | * | | Rename lock to log out | Dan Finlay | 2018-01-16 | 1 | -1/+1 |
| | * | | | Merge branch 'master' into open-popup | Frankie | 2018-01-16 | 1 | -3/+3 |
| | |\| | |
|
| | * | | | add a loading spinner to conf-tx view | frankiebee | 2018-01-15 | 1 | -0/+6 |
| * | | | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight | Dan Finlay | 2018-01-16 | 1 | -3/+3 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Use https | Dan Finlay | 2018-01-13 | 1 | -1/+1 |
| | * | | | Update support links for helpscout | Dan Finlay | 2018-01-10 | 1 | -3/+3 |
| | |/ / |
|
| * | | | Add max height for Firefox addon overflow and hide horizontal scroll | tmashuang | 2018-01-11 | 1 | -0/+2 |
| * | | | Add one px to address for Firefox clipping | tmashuang | 2018-01-11 | 1 | -0/+1 |
| |/ / |
|
| * | | Merge pull request #2855 from abitrolly/patch-2 | kumavis | 2018-01-09 | 1 | -1/+0 |
| |\ \ |
|
| | * | | info.js Remove width element to fix email layout | Anatoli Babenia | 2018-01-04 | 1 | -1/+0 |
| * | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfix | Kevin Serrano | 2018-01-09 | 1 | -0/+4 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Add fix for infinite spinner for incorrect seed phrase. | Kevin Serrano | 2018-01-04 | 1 | -0/+4 |
* | | | | Readjust gas fees when switching networks on the send screen | Alexander Tseung | 2018-01-17 | 2 | -22/+44 |
* | | | | Vertically centers the text of the new ui modal header. (#2987) | Dan J Miller | 2018-01-17 | 1 | -0/+1 |
* | | | | Adding one or more tokens sets the selected token before returning the user t... | Dan J Miller | 2018-01-17 | 2 | -0/+8 |
| |_|/
|/| | |
|
* | | | Restore display of all unconfirmed transactions. | Dan | 2018-01-16 | 1 | -34/+34 |
* | | | Fix send screen value input | Alexander Tseung | 2018-01-16 | 1 | -3/+11 |
* | | | Fix Hide Token modal styling, popup positioning | Alexander Tseung | 2018-01-16 | 4 | -25/+15 |
* | | | Merge pull request #2964 from alextsg/cb-505c | Dan Finlay | 2018-01-16 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Move blockies option to the bottom of Settings | Alexander Tseung | 2018-01-15 | 1 | -1/+1 |
* | | | | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946) | Dan J Miller | 2018-01-16 | 1 | -23/+30 |
* | | | | Fix confirm Add Token button order | Alexander Tseung | 2018-01-13 | 1 | -4/+4 |
* | | | | Fix Add Token button order, styling | Alexander Tseung | 2018-01-13 | 2 | -14/+16 |
* | | | | Fix input box padding and select highlight in new account create and import p... | Dan | 2018-01-13 | 2 | -1/+11 |
* | | | | New add account page with create and import options. | Dan | 2018-01-13 | 13 | -95/+475 |
* | | | | Merge branch 'uat' into cb-388 | Chi Kei Chan | 2018-01-13 | 15 | -309/+732 |
|\ \ \ \ |
|
| * | | | | Fix styling in initialization | Alexander Tseung | 2018-01-13 | 2 | -5/+14 |
| |/ / / |
|
| * | | | [NewUI-flat] New deposit ether modal UI. (#2642) | Dan J Miller | 2018-01-13 | 11 | -301/+711 |