Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove selectedIdentity prop from wallet view | Whymarrh Whitby | 2018-06-06 | 1 | -5/+3 |
* | Ensure selectedAddress exists when render wallet | Whymarrh Whitby | 2018-06-06 | 1 | -0/+4 |
* | Update hide-token-confirmation-modal.js to use new modalState schema (#4482) | Dan J Miller | 2018-06-05 | 3 | -3/+3 |
* | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-05 | 2 | -4/+13 |
|\ | |||||
| * | Fix ellipses | Alexander Tseung | 2018-06-01 | 1 | -5/+6 |
| * | Token name is not hidden in wallet if balance is exceptionally long. | Dan | 2018-06-01 | 2 | -3/+11 |
* | | Indicate the current selected account on the popup account view (#4445) | Alexander Tseung | 2018-06-05 | 8 | -21/+127 |
* | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 2 | -2/+2 |
* | | Add new alert modals | Alexander Tseung | 2018-06-01 | 16 | -165/+287 |
* | | Change btn-secondary styles to btn-default. Make btn-secondary red warning st... | Alexander Tseung | 2018-06-01 | 16 | -62/+79 |
|/ | |||||
* | Prevent loading screen from overlaying the app bar (#4417) | Alexander Tseung | 2018-05-31 | 4 | -12/+4 |
* | Fix error handling on incorrect password (#4401) | Alexander Tseung | 2018-05-31 | 1 | -11/+9 |
* | Add notification for dropped retry transactions (#4363) | Alexander Tseung | 2018-05-30 | 14 | -68/+294 |
* | Fix add-token token list placeholder width (#4365) | Alexander Tseung | 2018-05-30 | 1 | -0/+4 |
* | Fix text field labels of first time flow. Add text fields to storybook (#4389) | Alexander Tseung | 2018-05-29 | 2 | -44/+80 |
* | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
* | Fix scrolling in Deposit Ether modal (#4336) | Alexander Tseung | 2018-05-24 | 1 | -2/+4 |
* | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 45 | -971/+1280 |
|\ | |||||
| * | Update input field border on focus | Alexander Tseung | 2018-05-22 | 1 | -1/+3 |
| * | Fix tests | Alexander Tseung | 2018-05-21 | 1 | -11/+6 |
| * | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 45 | -971/+1283 |
* | | Merge pull request #4295 from MetaMask/kumavis-patch-3 | Frankie | 2018-05-22 | 1 | -1/+2 |
|\ \ | |||||
| * | | token-util - warn via loglevel on token lookup failure | kumavis | 2018-05-19 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #4316 from MetaMask/fix-signature-request | kumavis | 2018-05-22 | 1 | -2/+0 |
|\ \ | |||||
| * | | Fix signature request header text | Alexander Tseung | 2018-05-21 | 1 | -2/+0 |
| |/ | |||||
* | | Merge pull request #4273 from brunobar79/fix-new-ui-popup-header | kumavis | 2018-05-22 | 1 | -2/+0 |
|\ \ | |||||
| * | | remove fix header height | Bruno | 2018-05-17 | 1 | -2/+0 |
| |/ | |||||
* / | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 8 | -18/+18 |
|/ | |||||
* | Merge pull request #4255 from MetaMask/i4233-dropdowns | kumavis | 2018-05-17 | 5 | -21/+58 |
|\ | |||||
| * | Fix account and network dropdowns in confirm screen | Alexander Tseung | 2018-05-15 | 5 | -21/+58 |
* | | ui - unlock - remove setNetworkEndpoints calls from new unlock screen | kumavis | 2018-05-17 | 2 | -3/+0 |
* | | ui - remove files accidently added by bad merge | kumavis | 2018-05-17 | 2 | -328/+0 |
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-05-17 | 45 | -317/+850 |
|\ \ | |||||
| * | | Add error message when passwords don't match in first time flow. Change input... | Alexander Tseung | 2018-05-14 | 2 | -48/+54 |
| |/ | |||||
| * | Add TextField component to storybook | Alexander Tseung | 2018-05-12 | 3 | -2/+25 |
| * | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 22 | -569/+559 |
| * | Merge pull request #4196 from MetaMask/i3457-fontweight | Thomas Huang | 2018-05-09 | 11 | -22/+2 |
| |\ | |||||
| | * | Change font weight from 300 to 400 | Alexander Tseung | 2018-05-06 | 11 | -22/+2 |
| * | | Add storybook integration | Alexander Tseung | 2018-05-04 | 5 | -2/+96 |
| |/ | |||||
| * | Merge pull request #4156 from MetaMask/i4010-spinner | kumavis | 2018-05-03 | 9 | -10/+115 |
| |\ | |||||
| | * | Fix styling of the app spinner | Alexander Tseung | 2018-05-01 | 9 | -10/+115 |
| * | | Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccount | kumavis | 2018-05-02 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | ui - actions - importNewAccount - rethrow err on failure | kumavis | 2018-05-02 | 1 | -1/+1 |
* | | | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 6 | -13/+0 |
* | | | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 7 | -29/+1 |
|/ / / | |||||
* / / | Handle Promise rejections when importing accounts (#4142) | Paul Bouchon | 2018-05-01 | 2 | -0/+4 |
|/ / | |||||
* | | ui - actions - importNewAccount - use async and pify for cleaner syntax | kumavis | 2018-05-01 | 1 | -24/+20 |
* | | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 13 | -329/+354 |
|\ \ | |||||
| * | | Redirect to correct seed phrase screen | Alexander Tseung | 2018-04-27 | 1 | -2/+2 |
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-23 | 1 | -1/+9 |
| |\ \ | |||||
| * | | | Use new design for reveal seed screen. Persist seed words only in first time ... | Alexander Tseung | 2018-04-23 | 12 | -285/+346 |
| * | | | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 2 | -27/+3 |
* | | | | Fix ShapeShift purchases on new UI | bitpshr | 2018-04-29 | 1 | -6/+7 |
* | | | | Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-deci... | kumavis | 2018-04-28 | 4 | -45/+43 |
|\ \ \ \ | |||||
| * | | | | Simplify return of existing token in getSymbolAndDecimals | Dan | 2018-04-28 | 1 | -4/+1 |
| * | | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol or... | Dan | 2018-04-28 | 3 | -20/+10 |
| * | | | | Wraps calls to symbol() and decimals() in try catch | Dan | 2018-04-28 | 3 | -30/+41 |
| | |_|/ | |/| | | |||||
* / | | | Allow transactions with 0-gwei gas price (#4073) | Paul Bouchon | 2018-04-27 | 3 | -12/+11 |
|/ / / | |||||
* | | | i18n-helper - wrap fallback in brackets to help indicate something is wrong | kumavis | 2018-04-26 | 1 | -1/+1 |
* | | | Return key instead of empty string on i18n fail | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
* | | | i18n-helper - abort on i18n failure | kumavis | 2018-04-25 | 1 | -1/+2 |
* | | | Merge pull request #3940 from nyatla/master | Dan Finlay | 2018-04-24 | 3 | -1/+3 |
|\ \ \ | |||||
| * | | | Reduced button padding. | nyatla | 2018-04-10 | 1 | -0/+1 |
| * | | | Expanded dropdown menu width of title. | nyatla | 2018-04-10 | 1 | -1/+1 |
| * | | | Changed mouse cursor to "pointer" on the cancel text at the top left of the p... | nyatla | 2018-04-10 | 1 | -0/+1 |
* | | | | Merge pull request #3968 from MetaMask/gh-3653 | Dan Finlay | 2018-04-24 | 10 | -13/+17 |
|\ \ \ \ | |||||
| * | | | | Clean up network config | Alexander Tseung | 2018-04-24 | 10 | -13/+17 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #4028 from MetaMask/i4016-customrpc | Dan Finlay | 2018-04-24 | 1 | -6/+8 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix custom RPC not redirecting to Settings page | Alexander Tseung | 2018-04-19 | 1 | -6/+8 |
| | |/ | |/| | |||||
* | | | Merge pull request #4030 from MetaMask/i4014-metamask-version | Thomas Huang | 2018-04-20 | 1 | -1/+9 |
|\ \ \ | |||||
| * | | | Show correct MetaMask version number in the Info page | Alexander Tseung | 2018-04-19 | 1 | -1/+9 |
| |/ / | |||||
* / / | Fix exception thrown when revealing seed words | Alexander Tseung | 2018-04-19 | 1 | -6/+18 |
|/ / | |||||
* | | Merge pull request #3977 from MetaMask/i-3913-big-number | Dan Finlay | 2018-04-19 | 4 | -25/+49 |
|\ \ | |||||
| * | | Fix spinner layout | Alexander Tseung | 2018-04-18 | 4 | -24/+26 |
| * | | Fix BigNumber exception in confirm-send-ether | Alexander Tseung | 2018-04-18 | 1 | -3/+25 |
* | | | Merge pull request #4004 from MetaMask/i3955-reveal-seed | Dan Finlay | 2018-04-19 | 2 | -3/+27 |
|\ \ \ | |||||
| * | | | Fix UI getting stuck in Reveal Seed screen | Alexander Tseung | 2018-04-19 | 2 | -3/+27 |
* | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-address | Dan Finlay | 2018-04-19 | 10 | -26/+44 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Show checksummed addresses throughout the UI | bitpshr | 2018-04-18 | 10 | -26/+44 |
| |/ / | |||||
* | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 24 | -107/+52 |
|\| | | |||||
| * | | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 5 | -13/+18 |
| * | | Merge branch 'master' into i3981-contract-rates | Dan Finlay | 2018-04-17 | 14 | -3/+14 |
| |\ \ | |||||
| | * \ | Merge pull request #3970 from MetaMask/i3651-removeGlobalLog | Dan Finlay | 2018-04-17 | 13 | -2/+13 |
| | |\ \ | |||||
| | | * | | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 13 | -2/+13 |
| | * | | | Fix action for setting locale | Dan Finlay | 2018-04-14 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Maintain token prices using a background service | bitpshr | 2018-04-16 | 4 | -81/+6 |
| * | | | Fetch token prices based on contract address | bitpshr | 2018-04-16 | 8 | -81/+85 |
| |/ / | |||||
* | | | Lint fix. | Dan | 2018-04-10 | 2 | -2/+2 |
* | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 49 | -1081/+2630 |
|\| | | |||||
| * | | Fix integration tests | Alexander Tseung | 2018-04-07 | 3 | -4/+6 |
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-06 | 2 | -2/+8 |
| |\| | |||||
| | * | Merge pull request #3883 from danjm/i3685-define-event-privatekey-import | kumavis | 2018-04-06 | 1 | -1/+2 |
| | |\ | |||||
| | | * | event object actually passed to this.createKeyringOnEnter in private-key.js | Dan | 2018-04-05 | 1 | -1/+2 |
| | * | | Merge pull request #3892 from alextsg/gh-3891 | kumavis | 2018-04-06 | 1 | -1/+6 |
| | |\ \ | |||||
| | | * | | Fix populating txParams with undefined data | Alexander Tseung | 2018-04-06 | 1 | -1/+6 |
| * | | | | Fix editing transaction | Alexander Tseung | 2018-04-06 | 1 | -2/+1 |
| * | | | | Revert "commit" | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
| * | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-06 | 3 | -3/+2 |
| |\| | | | |||||
| | * | | | Merge pull request #3865 from MetaMask/openlinkinnewwindow | Thomas Huang | 2018-04-06 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into openlink... | Kevin Serrano | 2018-04-05 | 2 | -3/+4 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | Make token helpscout link open in new tab. | Kevin Serrano | 2018-04-04 | 1 | -0/+1 |
| | * | | | | Merge pull request #3882 from MetaMask/i#3791 | Kevin Serrano | 2018-04-05 | 1 | -0/+1 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Change double-quotes to single-quotes | Thomas | 2018-04-05 | 1 | -1/+1 |
| | | * | | | Add target=_blank exportAsFile | Thomas | 2018-04-05 | 1 | -0/+1 |
| | | | |/ | | | |/| | |||||
| | * / | | Allow from and to address to be the same in new-ui. | Dan | 2018-04-05 | 1 | -3/+0 |
| | |/ / | |||||
| * | | | commit | Alexander Tseung | 2018-04-06 | 1 | -2/+1 |
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-05 | 2 | -3/+4 |
| |\| | | |||||
| | * | | hot-fix new-ui - default to an object if identities is undefined | frankiebee | 2018-04-05 | 1 | -1/+2 |
| | * | | Don't prevent user from setting an eth address in to field if there is no ens... | Dan | 2018-04-05 | 1 | -2/+2 |
| | |/ | |||||
| * | | Use new design for showing seed words | Alexander Tseung | 2018-04-04 | 1 | -1/+13 |
| * | | commit | Alexander Tseung | 2018-04-04 | 1 | -8/+2 |
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-04 | 4 | -28/+45 |
| |\| | |||||
| | * | Merge pull request #3834 from MetaMask/3734 | kumavis | 2018-04-04 | 2 | -15/+35 |
| | |\ | |||||
| | | * | Address feedback | David Yoo | 2018-04-04 | 2 | -8/+24 |
| | | * | Address Add Token design feedback | David Yoo | 2018-04-03 | 2 | -7/+11 |
| | * | | app - warn on fetch errors instead of spamming sentry | kumavis | 2018-04-04 | 1 | -12/+9 |
| * | | | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 2 | -17/+32 |
| * | | | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 15 | -67/+331 |
| |\ \ \ | |||||
| * | | | | Fix lint errors | Alexander Tseung | 2018-04-03 | 7 | -229/+2 |
| * | | | | Add withRouter to I18nProvider component | Alexander Tseung | 2018-04-03 | 1 | -1/+6 |
| * | | | | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 9 | -47/+60 |
| * | | | | Fix conf-tx render | Alexander Tseung | 2018-03-31 | 2 | -2/+8 |
| * | | | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 75 | -471/+829 |
| |\ \ \ \ | |||||
| * | | | | | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 9 | -606/+693 |
| * | | | | | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 82 | -567/+815 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 13 | -33/+65 |
| * | | | | | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 129 | -4073/+3914 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix react-router related exceptions | Alexander Tseung | 2018-02-10 | 2 | -2/+2 |
| * | | | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 2 | -36/+28 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 17 | -102/+432 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix lint errors | Alexander Tseung | 2018-02-02 | 4 | -10/+3 |
| * | | | | | | | | | | Checks if there is currently a send in progress before redirecting to default... | Dan | 2018-02-01 | 1 | -3/+7 |
| * | | | | | | | | | | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 16 | -153/+214 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 18 | -225/+156 |
| * | | | | | | | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 61 | -956/+2059 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add route for signature request | Alexander Tseung | 2017-12-15 | 6 | -305/+454 |
| * | | | | | | | | | | | | Add initialized checks for first time flow routes | Alexander Tseung | 2017-12-15 | 5 | -79/+56 |
| * | | | | | | | | | | | | Add route for Mascara confirm seed | Alexander Tseung | 2017-12-15 | 2 | -3/+12 |
| * | | | | | | | | | | | | Fix lint errors | Alexander Tseung | 2017-12-15 | 4 | -14/+44 |
| * | | | | | | | | | | | | Add routes for mascara | Alexander Tseung | 2017-12-15 | 9 | -56/+123 |
| * | | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 40 | -1464/+1976 |
* | | | | | | | | | | | | | Internationalize converted value in confirm screens | Dan | 2018-04-10 | 2 | -4/+36 |
* | | | | | | | | | | | | | Internationalize converted value in currency-input.js | Dan | 2018-04-10 | 1 | -10/+25 |
* | | | | | | | | | | | | | Improve display of crypto currencies when selected as the 'Current Conversion' | Dan | 2018-04-10 | 1 | -4/+13 |
* | | | | | | | | | | | | | Linted | Dan Finlay | 2018-04-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | Internationalize currency | Dan Finlay | 2018-04-04 | 1 | -1/+6 |
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 3 | -16/+100 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3825 from danjm/i3668-warnusertxsimulationfails | Thomas Huang | 2018-04-03 | 3 | -16/+100 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Adds simulation failure error messages to confirm screen. | Dan | 2018-04-03 | 3 | -0/+41 |
| | * | | | | | | | | | | UpdateSendErrors only called when balance defined, recalled if balance updates. | Dan | 2018-04-03 | 2 | -16/+59 |
* | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 9 | -33/+198 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Ensure txParams are prefixed with 0x when sending. | Dan | 2018-04-03 | 1 | -0/+4 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | identicon - set blockies height and width to identicon diameter | kumavis | 2018-03-31 | 1 | -3/+2 |
| * | | | | | | | | | | Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist | kumavis | 2018-03-31 | 2 | -9/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist | Dan | 2018-03-30 | 72 | -452/+818 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Ensure correct address used when rendering transfer transactions. | Dan | 2018-03-29 | 1 | -1/+2 |
| | * | | | | | | | | | | | Fix display of unapprovedMessages in txList (old and new ui); includes fix of... | Dan | 2018-03-28 | 2 | -9/+16 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-31 | 6 | -21/+175 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix lint and tests | Dan | 2018-03-30 | 2 | -4/+4 |
| | * | | | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | Dan | 2018-03-30 | 72 | -451/+817 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Show insufficient funds on confirm screen on first render. | Dan | 2018-03-30 | 2 | -1/+21 |
| | * | | | | | | | | | | Confirm send token detects if balance is sufficient for gas. | Dan | 2018-03-28 | 1 | -0/+3 |
| | * | | | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-28 | 81 | -572/+722 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Confirm send token detects if balance is sufficient for gas. | Dan | 2018-03-28 | 2 | -7/+56 |
| | * | | | | | | | | | | Checking for sufficient balance in confirm ether screen; includes error messa... | Dan | 2018-03-28 | 4 | -15/+97 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-03-31 | 7 | -22/+23 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif... | kumavis | 2018-03-30 | 72 | -451/+817 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | ui - fix typo in settings | kumavis | 2018-03-29 | 1 | -1/+1 |
| * | | | | | | | | | | ui - add guard against unset locale | kumavis | 2018-03-29 | 1 | -1/+2 |
| * | | | | | | | | | | ui - identicon - use relative link for ether logo | kumavis | 2018-03-29 | 1 | -1/+1 |
| * | | | | | | | | | | ui - use relative location for images | kumavis | 2018-03-29 | 3 | -4/+4 |
| * | | | | | | | | | | ui - fix relative url for deposit-ether-modal | kumavis | 2018-03-29 | 1 | -1/+1 |
| * | | | | | | | | | | ui - use relative url for i18n-helper fetching locales | kumavis | 2018-03-29 | 1 | -1/+1 |
| * | | | | | | | | | | ui - css - use relative path for fonts | kumavis | 2018-03-29 | 1 | -14/+14 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | development - screens - use localhost for network | kumavis | 2018-03-31 | 1 | -3/+8 |
* | | | | | | | | | | network - use providerType for localhost | kumavis | 2018-03-31 | 2 | -6/+7 |
* | | | | | | | | | | development - screenshotter - capture screens across all locales | kumavis | 2018-03-30 | 1 | -0/+5 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Stopping wrapping provider children in div; stop wrapping old-ui in provider. | Dan | 2018-03-30 | 3 | -6/+5 |
* | | | | | | | | | Removes t from props via metamask-connect and instead places it on context vi... | Dan | 2018-03-29 | 73 | -450/+817 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3745 from danjm/i3723-fix-long-token-ammounts | kumavis | 2018-03-28 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Long token amounts in wallet are truncated with ellipsis. | Dan | 2018-03-27 | 1 | -1/+8 |
* | | | | | | | | | Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0x | kumavis | 2018-03-28 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Prefixes to addresses with 0x before sending. | Dan | 2018-03-27 | 1 | -1/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefined | kumavis | 2018-03-28 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Prevent users from adding custom token if decimals is an empty string. | Dan | 2018-03-27 | 1 | -1/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | ui - actions - fix log for background call | kumavis | 2018-03-28 | 1 | -1/+1 |
* | | | | | | | | | ui - settings - fix for currentLocale | kumavis | 2018-03-28 | 1 | -2/+3 |
* | | | | | | | | | ui - settings - derrive locales from index | kumavis | 2018-03-28 | 1 | -8/+1 |
* | | | | | | | | | Don't query for undefined. | Dan | 2018-03-28 | 1 | -1/+3 |
* | | | | | | | | | Remove comments and console.logs | Dan | 2018-03-27 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 5 | -116/+258 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboarding | Thomas Huang | 2018-03-27 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Pop uses new ui onboarding when in beta. | Dan | 2018-03-23 | 1 | -3/+3 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate | Thomas Huang | 2018-03-27 | 3 | -113/+254 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into i3326-addtokenscreendesignupdate | Dan | 2018-03-27 | 28 | -189/+182 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Use new header on add token confirmation screen. | Dan | 2018-03-26 | 1 | -65/+68 |
| | * | | | | | | | | | Updates Add token screen to latest design. | Dan | 2018-03-24 | 3 | -99/+241 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3695 from danjm/i3379-signtypedata-overflow | Thomas Huang | 2018-03-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Signed type data notification handles long messages. | Dan | 2018-03-23 | 1 | -0/+1 |
| | |/ / / / / / / | |||||
* | | | | | | | | | 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 |
| |/ / / / / / / | |||||
* | | | | | | | | i18n helper fetchLocale handles 404 gracefully | Dan | 2018-03-24 | 1 | -4/+12 |
* | | | | | | | | 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 | 2 | -2/+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 | 63 | -439/+405 |
* | | | | | | | | | | 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 | 39 | -3070/+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 |