Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 2 | -73/+108 |
|\ | |||||
| * | Fix grammar | Dan Finlay | 2018-03-14 | 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 |
| |\ | | | | | | | improved verification of restore from seed phrase | ||||
| | * | FIX #3440 improved verification of restore from seed phrase | criw | 2018-03-06 | 1 | -0/+13 |
| | | | |||||
| * | | Explicitly define state in import account from json component (#3491) | Alexander Tseung | 2018-03-09 | 1 | -73/+95 |
| | | | |||||
* | | | Adds styles for dropped txs in old-ui. | Dan | 2018-03-14 | 2 | -0/+9 |
| | | | |||||
* | | | Correctly set latest submitted retry with nonces that matches others in ↵ | Dan | 2018-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | old-ui transaction-list-item. | ||||
* | | | Undefined check in showRetryButton | Dan | 2018-03-14 | 1 | -3/+4 |
| | | | |||||
* | | | Use new submittedTime field to correctly show retry button in old and new ui. | Dan | 2018-03-14 | 2 | -4/+10 |
|/ / | |||||
* | | Merge branch 'master' into ImportAccountMessageV2 | kumavis | 2018-03-07 | 2 | -4/+4 |
|\ \ | |||||
| * \ | Merge branch 'master' into i2475-UnifyLogInWording | Dan Finlay | 2018-03-07 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | Ensure this reference is defined in old-ui info.js (#3450) | Dan J Miller | 2018-03-07 | 1 | -3/+3 |
| | |/ | |||||
| * / | Replace Lock wording with Log Out / Log In | Dan Finlay | 2018-03-07 | 1 | -1/+1 |
| |/ | | | | | | | Fixes #2475 | ||||
* | | Merge branch 'master' into ImportAccountMessageV2 | Thomas Huang | 2018-03-03 | 8 | -55/+787 |
|\| | |||||
| * | Allow adding 0 balance tokens in old ui and editing custom token info in new ↵ | Dan J Miller | 2018-03-03 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | (#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). | ||||
| * | Add retry transaction back into old ui transaction list item (#3381) | Thomas Huang | 2018-03-03 | 1 | -35/+92 |
| | | | | | | | | | | | | * Add retry transaction back into old ui transaction list item * Update Changelog | ||||
| * | Merge pull request #3356 from MetaMask/cdn-minimization | Kevin Serrano | 2018-03-02 | 2 | -4/+677 |
| |\ | | | | | | | Check in all font files locally. | ||||
| | * | Correct ttf format name to 'truetype' | Dan | 2018-03-02 | 2 | -84/+84 |
| | | | |||||
| | * | Check in all font files locally. | Kevin Serrano | 2018-03-01 | 2 | -4/+677 |
| | | | |||||
| * | | Merge pull request #3339 from danjm/i3336-cancel-button-buy-eth | kumavis | 2018-03-01 | 1 | -1/+1 |
| |\ \ | | | | | | | | | [Old-UI] Fix cancel button on buy eth screen. | ||||
| | * | | Fix cancel button on buy eth screen. | Dan | 2018-02-28 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #3340 from danjm/i3338-contract-published-terminology | kumavis | 2018-03-01 | 1 | -1/+1 |
| |\ \ | | | | | | | | | [NewUI] Replace 'Contract Published' label with 'Contract Deployment' | ||||
| | * | | Replace 'Contract Published' with 'Contract Deployment' for clearer ↵ | Dan | 2018-02-28 | 1 | -1/+1 |
| | |/ | | | | | | | | | | indication of contract tx state. | ||||
| * | | Merge pull request #3350 from danjm/onclick-undefined-sentry-error | kumavis | 2018-03-01 | 1 | -9/+11 |
| |\ \ | | | | | | | | | [old-ui] Prevent user from switching network in old-ui notification | ||||
| | * | | Prevent user from switching network in old-ui notification | Dan | 2018-03-01 | 1 | -9/+11 |
| | |/ | |||||
| * / | Define event locally in onClickOutside method in account-dropdowns.js | Dan | 2018-03-01 | 1 | -1/+1 |
| |/ | |||||
* | | Change Loose label to Imported | Thomas | 2018-02-28 | 1 | -1/+1 |
| | | |||||
* | | Add import account disclaimer | Thomas | 2018-02-28 | 2 | -5/+23 |
|/ | |||||
* | Fix old-ui active notices width. | Dan | 2018-02-21 | 1 | -1/+3 |
| | |||||
* | Add 8MM gas limit default to send screen | Dan Finlay | 2018-02-21 | 1 | -1/+2 |
| | |||||
* | Merge pull request #3200 from alextsg/cb-703 | kumavis | 2018-02-17 | 2 | -2/+2 |
|\ | | | | | [NewUI] Remove accessing PropTypes from main React package | ||||
| * | Remove accessing PropTypes from main React package | Alexander Tseung | 2018-02-07 | 2 | -2/+2 |
| | | |||||
* | | Make oldui compatible with newUI style changes | Thomas Huang | 2018-02-16 | 3 | -3/+4 |
| | | |||||
* | | Merge pull request #3209 from danjm/MM-634-newui-reset-account | Dan Finlay | 2018-02-14 | 1 | -0/+47 |
|\ \ | | | | | | | [NewUI] Add reset account button to new UI. | ||||
| * | | Add reset account button to new UI. | Dan | 2018-02-09 | 1 | -0/+47 |
| | | | |||||
* | | | Try beta link on unlock and privacy screens. | Dan | 2018-02-09 | 1 | -5/+25 |
|/ / | |||||
* / | Merge branch 'master' into uat | Dan | 2018-02-08 | 2 | -3/+47 |
|/ | |||||
* | Merge branch 'master' into uat | Thomas | 2018-01-23 | 2 | -2/+16 |
| | |||||
* | Merge pull request #3005 from alextsg/cb-385 | Chi Kei Chan | 2018-01-18 | 1 | -0/+1 |
|\ | | | | | [NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button | ||||
| * | Fix rendering QR code in old UI, hide unnecessary back button | Alexander Tseung | 2018-01-17 | 1 | -0/+1 |
| | | |||||
* | | Fix merge conflicts | Alexander Tseung | 2018-01-17 | 1 | -5/+14 |
| | | |||||
* | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 4 | -26/+28 |
|/ | |||||
* | Fix margin styling for name and address in account detail section. (#2790) | Dan J Miller | 2018-01-12 | 2 | -3/+4 |
| | |||||
* | Fix merge conflict | Alexander Tseung | 2018-01-04 | 1 | -1/+0 |
| | |||||
* | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 1 | -0/+17 |
| | |||||
* | Track usage of old and new UI (#2794) | Alexander Tseung | 2017-12-23 | 1 | -1/+5 |
| | | | [NewUI] Track usage of old and new UI | ||||
* | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 3 | -2/+16 |
| | |||||
* | [NewUI] Hide UI toggle in mascara (#2772) | Dan J Miller | 2017-12-21 | 1 | -1/+1 |
| | | | | | | * Hides old-UI on mascara. * Improve code clarity in select-app.js | ||||
* | Remove inline style. | Dan | 2017-12-13 | 3 | -4/+4 |
| | |||||
* | Make transaction list and item more flexible. | Dan | 2017-12-13 | 2 | -4/+4 |
| | |||||
* | Flex account-data-subsection | Dan | 2017-12-13 | 3 | -19/+20 |
| | |||||
* | Fix old ui width in mobile and extension. | Dan | 2017-12-13 | 2 | -24/+21 |
| | |||||
* | Delete uneeded files from old-ui. | Dan | 2017-12-13 | 7 | -2028/+0 |
| | |||||
* | Show user notifications after switch between UIs | Dan | 2017-12-05 | 2 | -1/+50 |
| | |||||
* | Use newui actions in old-ui | Dan | 2017-12-05 | 26 | -25/+28 |
| | |||||
* | Add UI selection | Dan | 2017-12-05 | 1 | -22/+23 |
| | |||||
* | Add old-ui directory | Dan | 2017-12-05 | 81 | -0/+17488 |