Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 2 | -2/+2 |
| | |||||
* | 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 | 1 | -189/+0 |
| | |||||
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 4 | -0/+267 |
|\ | | | | | | | network-controller-remove-setNetworkEndpoints | ||||
| * | Add TextField component to storybook | Alexander Tseung | 2018-05-12 | 2 | -2/+1 |
| | | |||||
| * | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 5 | -194/+268 |
| | | |||||
* | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 2 | -2/+0 |
| | | |||||
* | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 2 | -5/+0 |
|/ | |||||
* | Handle Promise rejections when importing accounts (#4142) | Paul Bouchon | 2018-05-01 | 2 | -0/+4 |
| | | | | * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement | ||||
* | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 2 | -147/+116 |
|\ | | | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow. | ||||
| * | 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 |
| |\ | | | | | | | | | | i-4033-seed-words | ||||
| * | | Use new design for reveal seed screen. Persist seed words only in first time ↵ | Alexander Tseung | 2018-04-23 | 1 | -145/+114 |
| | | | | | | | | | | | | flow | ||||
* | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol ↵ | Dan | 2018-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | | or decimals. | ||||
* | | | Clean up network config | Alexander Tseung | 2018-04-24 | 2 | -2/+2 |
| |/ |/| | |||||
* | | Show correct MetaMask version number in the Info page | Alexander Tseung | 2018-04-19 | 1 | -1/+9 |
|/ | |||||
* | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 1 | -2/+3 |
| | |||||
* | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 2 | -0/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
| | | | | cb-254 | ||||
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -0/+1 |
| | | | | cb-254 | ||||
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-04 | 1 | -9/+12 |
| | | | | cb-254 | ||||
* | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 1 | -14/+16 |
| | |||||
* | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -15/+14 |
| | |||||
* | Fix lint errors | Alexander Tseung | 2018-04-03 | 3 | -4/+0 |
| | |||||
* | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 4 | -15/+15 |
| | |||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 8 | -94/+135 |
| | |||||
* | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 5 | -358/+434 |
| | |||||
* | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 8 | -115/+153 |
| | |||||
* | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 9 | -17/+36 |
| | |||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 8 | -286/+360 |
| | |||||
* | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 2 | -4/+15 |
| | | | | into cb-254 | ||||
* | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 4 | -14/+20 |
| | |||||
* | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 11 | -112/+284 |
| | |||||
* | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 5 | -65/+85 |
| | |||||
* | Add route for signature request | Alexander Tseung | 2017-12-15 | 1 | -0/+321 |
| | |||||
* | Add initialized checks for first time flow routes | Alexander Tseung | 2017-12-15 | 4 | -71/+48 |
| | |||||
* | Add routes for mascara | Alexander Tseung | 2017-12-15 | 5 | -25/+78 |
| | |||||
* | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 13 | -0/+1897 |