| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix integration tests | Alexander Tseung | 2018-04-07 | 2 | -2/+6 |
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
|\ |
|
* | | 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 | 1 | -0/+1 |
|\| |
|
* | | 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 |
* | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-04 | 1 | -9/+12 |
|\| |
|
* | | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 1 | -14/+16 |
* | | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 9 | -43/+257 |
|\| |
|
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 2 | -16/+89 |
| |\ |
|
| | * | Adds simulation failure error messages to confirm screen. | Dan | 2018-04-03 | 2 | -0/+30 |
| | * | 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 | 7 | -23/+166 |
| |\| |
|
| | * | 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 | 53 | -288/+538 |
| | | |\ |
|
| | | * | | 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 | 4 | -11/+147 |
| | |\ \ \ |
|
| | | * | | | Fix lint and tests | Dan | 2018-03-30 | 2 | -4/+4 |
| | | * | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | Dan | 2018-03-30 | 53 | -287/+537 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | * | | | 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 | 54 | -346/+337 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | * | | | 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 | 2 | -5/+69 |
| * | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-03-31 | 3 | -5/+5 |
| |\| | | | |
|
| * | | | | | network - use providerType for localhost | kumavis | 2018-03-31 | 1 | -4/+4 |
| | |_|_|/
| |/| | | |
|
* | | | | | Fix lint errors | Alexander Tseung | 2018-04-03 | 3 | -4/+0 |
* | | | | | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 4 | -15/+15 |
* | | | | | Fix conf-tx render | Alexander Tseung | 2018-03-31 | 1 | -1/+4 |
* | | | | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 61 | -386/+673 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif... | kumavis | 2018-03-30 | 53 | -287/+537 |
| |\| | | |
|
| | * | | | Removes t from props via metamask-connect and instead places it on context vi... | Dan | 2018-03-29 | 53 | -287/+537 |
| | | |/
| | |/| |
|
| * | | | 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 | 2 | -3/+3 |
| * | | | ui - fix relative url for deposit-ether-modal | kumavis | 2018-03-29 | 1 | -1/+1 |
| |/ / |
|
* | | | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 6 | -361/+448 |
* | | | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 62 | -456/+485 |
|\| | |
|
| * | | Remove comments and console.logs | Dan | 2018-03-27 | 2 | -2/+2 |
| * | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 10 | -48/+32 |
| |\| |
|
| * | | 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 | 10 | -13/+14 |
| * | | Fix references to undefined 'this.props' | Dan | 2018-03-22 | 1 | -13/+13 |
| * | | 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 | 8 | -192/+269 |
| |\ \ |
|
| * | | | i18n redux solution doesn't require importing t() and passing state to each t... | Dan | 2018-03-22 | 45 | -283/+253 |
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-21 | 7 | -47/+289 |
| |\ \ \ |
|
| * | | | | Lint fixes. | Dan | 2018-03-20 | 8 | -5/+14 |
| * | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 1 | -6/+14 |
| |\ \ \ \ |
|
| * | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect re... | Dan | 2018-03-20 | 15 | -20/+23 |
| * | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 26 | -2145/+572 |
| |\ \ \ \ \ |
|
| * | | | | | | Handle i18n with redux. | Dan | 2018-03-16 | 56 | -303/+303 |
| * | | | | | | i18n - load locales manually | kumavis | 2018-03-15 | 29 | -45/+57 |
* | | | | | | | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 9 | -17/+36 |
* | | | | | | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 83 | -2744/+2070 |
|\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | Merge pull request #3721 from alextsg/cb-944 | Dan Finlay | 2018-03-27 | 8 | -15/+19 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Update button styles | Alexander Tseung | 2018-03-26 | 8 | -15/+19 |
| | | |_|_|_|/
| | |/| | | | |
|
| * / | | | | | Use ens-input component in send-v2 to allow sending to ens names. | Dan | 2018-03-26 | 2 | -32/+13 |
| |/ / / / / |
|
| * | | | | | 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 | 2 | -4/+11 |
| |\ \ \ \ \ |
|
| | * | | | | | Identify token transactions by method names token data, and not just whether ... | Dan | 2018-03-20 | 2 | -4/+11 |
| | | |_|/ /
| | |/| | | |
|
| * | | | | | Merge pull request #3624 from alextsg/cb-941 | kumavis | 2018-03-21 | 4 | -182/+244 |
| |\ \ \ \ \ |
|
| | * | | | | | Update confirm transaction screen | Alexander Tseung | 2018-03-21 | 4 | -182/+244 |
| * | | | | | | Gas inputs can be changed by up and down arrows (#3598) | Dan J Miller | 2018-03-21 | 2 | -0/+3 |
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Add i18n to tx status | Thomas | 2018-03-21 | 1 | -1/+26 |
| * | | | | | Merge branch 'master' into i3571-CompleteI18nTemplates | Thomas | 2018-03-21 | 7 | -45/+260 |
| |\| | | | |
|
| | * | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 2 | -2/+6 |
| | |\ \ \ \ |
|
| | | * | | | | Don't block user from setting gas if estimating gas returns errors. (#3627) | Dan J Miller | 2018-03-20 | 2 | -2/+6 |
| | | |/ / / |
|
| | * | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 27 | -2155/+588 |
| | |\| | | |
|
| | * | | | | 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 | 1 | -4/+6 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | / /
| | | | |_|/ /
| | | |/| | | |
|
| | * | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 47 | -349/+386 |
| | |\ \ \ \ \ |
|
| | * | | | | | | Fix more lint errors. | Dan | 2018-03-14 | 3 | -11/+2 |
| | * | | | | | | Remove unnecessary addition of nonce to state. | Dan | 2018-03-14 | 1 | -3/+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 | 1 | -0/+1 |
| | * | | | | | | 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 | 1 | -2/+0 |
| | * | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-09 | 5 | -25/+28 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | Adds inline opening of gas customization to confirm-send-ether screen. | Dan | 2018-03-09 | 2 | -10/+42 |
| | * | | | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, customize-... | Dan | 2018-03-09 | 4 | -15/+83 |
| | * | | | | | | | Add html and css for responsive retry button. | Dan | 2018-03-09 | 1 | -0/+9 |
| * | | | | | | | | Started on Tx list i18n | Thomas | 2018-03-21 | 1 | -1/+1 |
| | |_|_|_|_|/ /
| |/| | | | | | |
|
| * | | | | | | | 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 |
| | | |_|_|_|/
| | |/| | | | |
|
| * | | | | | | Remove unused files from ui folder. (#3577) | anticlimactic | 2018-03-19 | 21 | -1626/+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 | 3 | -294/+340 |
| |/ / / / / |
|
| * | | | / | Update Deposit Eth icon (#3569) | Alexander Tseung | 2018-03-16 | 1 | -4/+6 |
| | |_|_|/
| |/| | | |
|
| * | | | | Fix translations whose substitutions params were not in arrays. | Dan | 2018-03-14 | 1 | -1/+1 |
| | |_|/
| |/| | |
|
| * | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-14 | 1 | -5/+5 |
| |\ \ \ |
|
| | * \ \ | Merge pull request #3495 from alextsg/cb-290 | kumavis | 2018-03-14 | 1 | -5/+5 |
| | |\ \ \ |
|
| | | * | | | Increase tap areas for menu buttons on mobile | Alexander Tseung | 2018-03-10 | 1 | -5/+5 |
| * | | | | | 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 | 2 | -54/+65 |
| |\| | | | |
|
| | * | | | | Update deposit ether styling (#3510) | Alexander Tseung | 2018-03-13 | 2 | -53/+68 |
| | |/ / / |
|
| * | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-12 | 2 | -6/+6 |
| |\| | | |
|
| | * | | | Add empty object default value for tokenData (#3493) | Alexander Tseung | 2018-03-09 | 1 | -2/+2 |
| | | |/
| | |/| |
|
| | * | | Update network colours for better accessibility. (#3469) | Dan J Miller | 2018-03-08 | 1 | -4/+4 |
| * | | | 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 | 1 | -16/+0 |
| |\| | |
|
| | * | | Merge branch 'master' into ImportAccountMessageV2 | kumavis | 2018-03-07 | 3 | -4/+23 |
| | |\ \ |
|
| | * \ \ | Merge branch 'master' into ImportAccountMessageV2 | Dan Finlay | 2018-03-07 | 1 | -5/+4 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | * | | | Merge branch 'master' into ImportAccountMessageV2 | Thomas Huang | 2018-03-03 | 6 | -18/+32 |
| | |\ \ \ |
|
| | * | | | | Remove committed out merge code | Thomas | 2018-02-28 | 1 | -16/+0 |
| | * | | | | Change Loose label to Imported | Thomas | 2018-02-28 | 1 | -1/+1 |
| * | | | | | Correct merge conflict resolution errors. | Dan | 2018-03-07 | 1 | -7/+0 |
| * | | | | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 24 | -117/+277 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | Shapeshift form handles market info unavailable errors. | Dan | 2018-03-07 | 3 | -4/+23 |
| | | |_|/
| | |/| | |
|
| | * | | | Fixes shapeshift coin selection dropdown. (#3416) | Dan J Miller | 2018-03-06 | 1 | -5/+4 |
| | | |/
| | |/| |
|
| | * | | Fix network menu for custom URLs (#3366) | Alexander Tseung | 2018-03-02 | 1 | -13/+27 |
| | * | | Fix exception thrown when styleOverride is not present (#3364) | Alexander Tseung | 2018-03-02 | 1 | -1/+1 |
| | * | | 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 |
| | |/ |
|
| | * | Try fixing notice screen synchronous state call | Dan Finlay | 2018-02-21 | 1 | -2/+1 |
| | * | 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 |
| | * | | Merge pull request #3209 from danjm/MM-634-newui-reset-account | Dan Finlay | 2018-02-14 | 3 | -6/+89 |
| | |\ \ |
|
| | | * | | Add reset account button to new UI. | Dan | 2018-02-09 | 3 | -6/+89 |
| | * | | | Updates the styling of confirm send ether and token screens. (#3235) | Dan J Miller | 2018-02-13 | 2 | -18/+14 |
| * | | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 26 | -77/+80 |
| * | | | | 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 | 17 | -0/+17 |
| * | | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 20 | -114/+103 |
| * | | | | first steps to i18n | Nick Doiron | 2018-01-23 | 30 | -144/+132 |
* | | | | | Fix react-router related exceptions | Alexander Tseung | 2018-02-10 | 1 | -1/+1 |
* | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 2 | -36/+28 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Fixes shapeshift txs so that they render in tx list. (#3208) | Dan J Miller | 2018-02-09 | 2 | -36/+28 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 4 | -19/+34 |
|\| | | |
|
| * | | | Make blockies icon round to match identicons (#3205) | Alexander Tseung | 2018-02-08 | 1 | -4/+4 |
| * | | | Fix alignment of ellipsis and address in wallet view. (#3198) | Dan J Miller | 2018-02-07 | 1 | -1/+1 |
| | |/
| |/| |
|
| * | | 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 | 1 | -12/+17 |
* | | | Fix lint errors | Alexander Tseung | 2018-02-02 | 2 | -7/+1 |
* | | | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 8 | -26/+78 |
|\| | |
|
| * | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) | Dan J Miller | 2018-02-01 | 2 | -10/+57 |
| |/ |
|
| * | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 77 | -1258/+8026 |
| |\ |
|
| * | | Add network-indicator classname to network loading spinner | Thomas | 2018-01-18 | 1 | -1/+1 |
* | | | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 12 | -115/+299 |
* | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 31 | -548/+731 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix transaction list font sizes, padding | Alexander Tseung | 2018-01-19 | 1 | -5/+1 |
| * | | Merge pull request #3024 from alextsg/cb-529 | Kevin Serrano | 2018-01-19 | 1 | -2/+2 |
| |\ \ |
|
| | * | | Update popout to fullscreen icon | Alexander Tseung | 2018-01-18 | 1 | -2/+2 |
| * | | | [NewUI] Send screen gas loading fixes (#3027) | Dan J Miller | 2018-01-18 | 1 | -1/+2 |
| |/ / |
|
| * | | Fix tx-list, confirmation screen styling | Alexander Tseung | 2018-01-18 | 1 | -5/+4 |
| * | | 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 |
| * | | | Readjust gas fees when switching networks on the send screen | Alexander Tseung | 2018-01-17 | 1 | -0/+1 |
| |/ / |
|
| * | | 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 | 1 | -2/+2 |
| * | | New add account page with create and import options. | Dan | 2018-01-13 | 2 | -17/+9 |
| * | | Merge branch 'uat' into cb-388 | Chi Kei Chan | 2018-01-13 | 8 | -296/+452 |
| |\ \ |
|
| | * | | [NewUI-flat] New deposit ether modal UI. (#2642) | Dan J Miller | 2018-01-13 | 7 | -295/+451 |
| | * | | Fix logging out of old UI causing infinite spinner (#2914) | Alexander Tseung | 2018-01-12 | 1 | -1/+1 |
| * | | | Change styling for network dropdown | Alexander Tseung | 2018-01-12 | 1 | -31/+10 |
| * | | | Update styling for buttons, font weights | Alexander Tseung | 2018-01-12 | 6 | -14/+18 |
| * | | | Update main view styling | Alexander Tseung | 2018-01-11 | 3 | -13/+5 |
| |/ / |
|
| * | | Merge pull request #2799 from MetaMask/NewUI-flat | Alexander Tseung | 2017-12-23 | 17 | -141/+314 |
| |\ \ |
|
| | * \ | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 4 | -57/+11 |
| | |\ \ |
|
| | | * | | Add constanst for token transfer function signature. | Dan | 2017-12-21 | 1 | -0/+3 |
| | | * | | Lint fixes. | Dan | 2017-12-21 | 2 | -3/+1 |
| | | * | | Adds updateTransaction to background and used it to update after editing in s... | Dan | 2017-12-21 | 3 | -67/+6 |
| | | * | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 2 | -2/+16 |
| | * | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 2 | -37/+94 |
| | |\ \ \
| | | |/ /
| | |/| /
| | | |/ |
|
| | | * | Merge pull request #2706 from danjm/MM-fix-buy-cancel-button | Thomas Huang | 2017-12-15 | 1 | -1/+1 |
| | | |\ |
|
| | | | * | Fixes the cancel button in the buy screen to take the user home. | Dan | 2017-12-09 | 1 | -1/+1 |
| | | * | | Show watched tokens with no balance | Dan Finlay | 2017-12-13 | 1 | -4/+1 |
| | | |/ |
|
| | | * | Add 10% price bump to retry attempts. | Dan Finlay | 2017-12-07 | 1 | -1/+3 |
| | | * | Show retry button on submitted transactions greater than 30 seconds, add hove... | Alexander Tseung | 2017-12-07 | 1 | -1/+7 |
| | | * | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R... | Dan Finlay | 2017-12-07 | 1 | -4/+4 |
| | | |\ |
|
| | | | * | Fix styling of Retry buton | Alexander Tseung | 2017-12-07 | 1 | -4/+4 |
| | | * | | Enforce retry tx at minimum gas of previous tx | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| | | |/ |
|
| | | * | Connect to redux for retryTransaction | Alexander Tseung | 2017-12-07 | 1 | -2/+10 |
| | | * | Add button to retry transaction | Alexander Tseung | 2017-12-07 | 1 | -34/+69 |
| | | * | Add retry background method and action | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| | * | | Hide fiat values on account details screen when eth/token value is 0. | Dan | 2017-12-21 | 3 | -3/+8 |
| | * | | Hides the sidebar after the an account menu actions changes the screen behind... | Dan | 2017-12-21 | 1 | -0/+6 |
| * | | | Merge pull request #2591 from MetaMask/NewUI-flat | Chi Kei Chan | 2017-11-16 | 19 | -116/+383 |
| |\ \ \ |
|
| * \ \ \ | Merge remote-tracking branch 'origin/uat' into mascara-first-screen | frankiebee | 2017-11-08 | 41 | -368/+451 |
| |\ \ \ \ |
|
| * | | | | | ui - allow optional size for mascot | frankiebee | 2017-11-01 | 1 | -3/+3 |
* | | | | | | Add route for signature request | Alexander Tseung | 2017-12-15 | 2 | -253/+321 |
* | | | | | | Add initialized checks for first time flow routes | Alexander Tseung | 2017-12-15 | 4 | -71/+48 |
* | | | | | | Fix lint errors | Alexander Tseung | 2017-12-15 | 2 | -2/+1 |
* | | | | | | Add routes for mascara | Alexander Tseung | 2017-12-15 | 6 | -42/+83 |
* | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 22 | -177/+1989 |
| |_|_|/ /
|/| | | | |
|
* | | | | | Fix edit to field bug. (#2738) | Dan J Miller | 2017-12-13 | 1 | -6/+7 |
* | | | | | Fix isMascara and update yarn.lock | Chi Kei Chan | 2017-12-13 | 1 | -2/+2 |
* | | | | | Substitute isMascara check for explicit check if user is on mobile browser. | Dan | 2017-12-13 | 1 | -1/+2 |
* | | | | | Hide open in browser button on mobile (but still show on extension); adds a f... | Dan | 2017-12-13 | 1 | -2/+3 |
* | | | | | Adds button for opening app in main browser window in extension. | Dan | 2017-12-13 | 1 | -0/+5 |
* | | | | | Merge branch 'NewUI-flat' into cb-372 | Chi Kei Chan | 2017-12-08 | 4 | -1/+110 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 2 | -1/+22 |
| |\ \ \ \ \ |
|
| | * | | | | | Update max amount behaviour to meet new specs. | Dan | 2017-12-07 | 2 | -1/+22 |
| * | | | | | | Show user notifications after switch between UIs | Dan | 2017-12-05 | 2 | -0/+88 |
| |/ / / / / |
|
* / / / / / | Update font weights to 300, remove animation from network dropdown, fix netwo... | Alexander Tseung | 2017-12-02 | 2 | -18/+23 |
|/ / / / / |
|
* | | | | | Remove useBlockie in props for render | Thomas Huang | 2017-11-29 | 1 | -1/+1 |
* | | | | | Fixes changes requested in pullrequestreview-79088534 | Jason Clark | 2017-11-27 | 1 | -2/+2 |
* | | | | | making eslint happy | Jason Clark | 2017-11-26 | 1 | -4/+5 |
* | | | | | fixing blockies display issues | Jason Clark | 2017-11-26 | 1 | -4/+8 |
* | | | | | swapped out ethereum-blockies lib for MEW blockies library, tightened up iden... | Jason Clark | 2017-11-26 | 2 | -85/+49 |
* | | | | | tweaking styling | Jason Clark | 2017-11-25 | 2 | -9/+27 |
* | | | | | incremental commit of working blockie component | Jason Clark | 2017-11-25 | 2 | -15/+56 |
* | | | | | incremental commit | Clark, Jason (Contractor) | 2017-11-24 | 1 | -1/+2 |
* | | | | | Remove unneeded type casting | Dan Finlay | 2017-11-21 | 1 | -1/+1 |
* | | | | | Fix bug where gas param was not a string | Dan Finlay | 2017-11-21 | 2 | -3/+3 |
| |_|/ /
|/| | | |
|
* | | | | Gas customzier does not consider amount when sending tokens. | Dan | 2017-11-16 | 1 | -1/+1 |
* | | | | Use currency input component in input number, to improve input behaviour in g... | Dan | 2017-11-16 | 1 | -4/+7 |
* | | | | Show tokens with zero balance | Alexander Tseung | 2017-11-15 | 1 | -4/+1 |
* | | | | Create single action for updating all of send in redux state. | Dan | 2017-11-15 | 3 | -13/+19 |
* | | | | Allow editing of token transactions. | Dan | 2017-11-15 | 1 | -8/+87 |
* | | | | Fix lint errors. | Dan | 2017-11-15 | 2 | -11/+10 |
* | | | | Allow editing of send ether. | Dan | 2017-11-15 | 2 | -6/+50 |
* | | | | Improve variable name. | Dan | 2017-11-14 | 1 | -2/+2 |
* | | | | Deposit button shows link to faucet on testnet networks. | Dan | 2017-11-14 | 1 | -15/+23 |
* | | | | Cursor pointer and hover background on from and to dropdown items. | Dan | 2017-11-11 | 3 | -0/+4 |
* | | | | Focus amount input when click anywhere in amount field container | Dan | 2017-11-11 | 2 | -0/+4 |
* | | | | Rounding of vals < 0.01 in currency display consistent with master. | Dan | 2017-11-11 | 1 | -1/+2 |
* | | | | Linting | Thomas Huang | 2017-11-11 | 3 | -4/+4 |
* | | | | Network loading does not block network loading. | Dan | 2017-11-10 | 3 | -16/+4 |
* | | | | darker backdrop style for modal | cjeria | 2017-11-10 | 1 | -1/+1 |
* | | | | Calculate max amount for send ether based on minimum gas total. | Dan | 2017-11-08 | 1 | -8/+0 |
* | | | | Fix amount max for sending token. | Dan | 2017-11-08 | 1 | -7/+23 |
* | | | | Add currency-input component to correct send amount behaviour and move curren... | Dan | 2017-11-08 | 2 | -28/+101 |
* | | | | Lint fixes. | Dan | 2017-11-07 | 3 | -4/+1 |
* | | | | Set gas price allows for WEI precision. | Dan | 2017-11-07 | 3 | -9/+29 |
* | | | | Insufficient balance warning in gas customizer works for send token | Dan | 2017-11-07 | 1 | -3/+1 |
* | | | | Adds max amount feature for send-ether | Dan | 2017-11-07 | 2 | -1/+3 |
* | | | | Token balance in send state; validating sufficient tokens, validation updates... | Dan | 2017-11-07 | 4 | -10/+46 |
* | | | | Merge pull request #2530 from MetaMask/uat | Chi Kei Chan | 2017-11-03 | 36 | -254/+234 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | More lint fixes | Dan | 2017-11-02 | 24 | -89/+81 |