| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 2 | -4/+4 |
| |\ | |||||
| | * | Update button styles | Alexander Tseung | 2018-03-26 | 2 | -4/+4 |
| | | | |||||
| * | | Lint fixes | Dan | 2018-03-22 | 2 | -4/+2 |
| | | | |||||
| * | | Fix references to undefined 'this.props' | Dan | 2018-03-22 | 1 | -12/+10 |
| | | | |||||
| * | | i18n redux solution doesn't require importing t() and passing state to each ↵ | Dan | 2018-03-22 | 4 | -24/+20 |
| | | | | | | | | | t() call; t is just available on props. | ||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-21 | 2 | -4/+4 |
| |\| | | | | | | | i18n-translator-redux | ||||
| | * | i18n Import flow | Thomas | 2018-03-21 | 2 | -5/+5 |
| | | | |||||
| * | | Lint fixes. | Dan | 2018-03-20 | 2 | -0/+2 |
| | | | |||||
| * | | Handle i18n with redux. | Dan | 2018-03-16 | 4 | -23/+23 |
| | | | |||||
| * | | i18n - load locales manually | kumavis | 2018-03-15 | 4 | -10/+9 |
| |/ | |||||
| * | Add i18n back into JsonImportSubview | Thomas | 2018-03-12 | 1 | -7/+7 |
| | | |||||
| * | Merge branch 'master' into i18n | Thomas Huang | 2018-03-12 | 1 | -78/+102 |
| |\ | |||||
| | * | Explicitly define state in import account from json component (#3491) | Alexander Tseung | 2018-03-09 | 1 | -78/+102 |
| | | | |||||
| * | | Merge branch 'master' into i18n | Dan Finlay | 2018-03-07 | 1 | -0/+15 |
| |\| | |||||
| | * | Import Account disclaimer | Thomas | 2018-03-03 | 1 | -9/+2 |
| | | | |||||
| | * | Add import account disclaimer | Thomas | 2018-02-28 | 1 | -0/+22 |
| | | | |||||
| * | | Correct merge conflict resolution errors. | Dan | 2018-03-07 | 1 | -2/+0 |
| | | | |||||
| * | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 3 | -7/+20 |
| |\| | |||||
| | * | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 1 | -0/+6 |
| | |\ | |||||
| | | * | Merge branch 'master' into uat | Dan | 2018-02-08 | 1 | -0/+6 |
| | | |\ | |||||
| | | | * | Add warning when importing no valid file | Dan Finlay | 2018-01-31 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | Fixes #3089 | ||||
| | * | | | [NewUI] Updates capitalization and alignment for the import account screen. ↵ | Dan J Miller | 2018-02-01 | 2 | -8/+13 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | (#3122) * Updates capitalization and alignment for the import account screen. * Align elements in import form. | ||||
| * | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 3 | -12/+13 |
| | | | | |||||
| * | | | separate out cross-browser i18n for extensions | Nick Doiron | 2018-01-25 | 3 | -0/+3 |
| | | | | |||||
| * | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 3 | -13/+12 |
| |/ / | |||||
| * | | New add account page with create and import options. | Dan | 2018-01-13 | 3 | -77/+58 |
| | | | |||||
| * | | Merge branch 'master' into merge-master | Chi Kei Chan | 2017-11-16 | 1 | -0/+1 |
| |\| | |||||
| | * | Remove warning message when show import page | Daijiro Wachi | 2017-10-31 | 1 | -0/+1 |
| | | | | | | | | | Fixes: https://github.com/MetaMask/metamask-extension/issues/1192 | ||||
| * | | Clear import error state on logout. | Dan | 2017-10-27 | 1 | -0/+4 |
| | | | |||||
| * | | Update Import Account Help Link | Chi Kei Chan | 2017-10-25 | 1 | -1/+1 |
| | | | |||||
| * | | New Account modal | Chi Kei Chan | 2017-10-18 | 1 | -0/+1 |
| | | | |||||
| * | | Fix SELECT TYPE dropdown changing sizes based on error message (#2359) | Alexander Tseung | 2017-10-14 | 1 | -2/+4 |
| | | | |||||
| * | | Move responsive ui into its own folder for easier merges | Dan Finlay | 2017-07-21 | 4 | -0/+297 |
| | | | |||||
| * | | Make folder for responsive UI | Dan Finlay | 2017-07-04 | 4 | -297/+0 |
| |/ | |||||
| * | Add Back Button for Import Screen | Thomas Huang | 2017-06-28 | 1 | -0/+9 |
| | | |||||
| * | Add a new warning for file import JSON | Kevin Serrano | 2017-06-15 | 1 | -0/+3 |
| | | |||||
| * | Fix linting warnings | Thomas Huang | 2017-04-27 | 1 | -1/+1 |
| | | |||||
| * | Fix styling of error message. | Kevin Serrano | 2017-03-23 | 2 | -4/+2 |
| | | |||||
| * | Implement naieve JSON file importing | Dan Finlay | 2017-01-19 | 2 | -5/+76 |
| | | | | | Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production. | ||||
| * | Added new modular private key import system | Dan Finlay | 2017-01-19 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well! | ||||
| * | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 2 | -6/+84 |
| | | | | | | | | | Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`. | ||||
| * | Develop import subviews | Dan Finlay | 2016-11-05 | 3 | -15/+84 |
| | | |||||
| * | Add import account placeholder template | Dan Finlay | 2016-11-05 | 1 | -0/+70 |
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) |
| aboutsummaryrefslogtreecommitdiffstats |