| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵ | Alexander Tseung | 2018-06-01 | 1 | -2/+2 |
| | | | | | | | | | style buttons | ||||
| * | | Fix then-catch + error handling in import-account | Dan | 2018-05-31 | 1 | -2/+1 |
| | | | |||||
| * | | Importing account by json and private key shows error and does not change ↵ | Dan | 2018-05-31 | 1 | -5/+18 |
| |/ | | | | account if no selectedAddress comes after import. | ||||
| * | Handle Promise rejections when importing accounts (#4142) | Paul Bouchon | 2018-05-01 | 1 | -0/+2 |
| | | | | | * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement | ||||
| * | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -9/+13 |
| | | |||||
| * | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -10/+10 |
| | | |||||
| * | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 1 | -1/+1 |
| | | |||||
| * | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -82/+107 |
| | | |||||
| * | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 1 | -0/+6 |
| | | | | | into cb-254 | ||||
| * | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 1 | -0/+106 |
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) |
| aboutsummaryrefslogtreecommitdiffstats |