| Commit message (Expand) | Author | Age | Files | Lines |
* | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 1 | -1/+1 |
* | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -4/+10 |
|\ |
|
| * | Removes t from props via metamask-connect and instead places it on context vi... | Dan | 2018-03-29 | 6 | -35/+69 |
* | | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -5/+4 |
|\| |
|
| * | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 3 | -6/+6 |
| |\ |
|
| * | | Correct proptypes for t in new-account/create-form.js | Dan | 2018-03-22 | 1 | -1/+1 |
| * | | Lint fixes | Dan | 2018-03-22 | 3 | -5/+3 |
| * | | 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 t... | Dan | 2018-03-22 | 6 | -33/+27 |
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-21 | 2 | -4/+4 |
| |\ \ |
|
| * | | | Lint fixes. | Dan | 2018-03-20 | 3 | -0/+3 |
| * | | | Handle i18n with redux. | Dan | 2018-03-16 | 6 | -34/+34 |
| * | | | i18n - load locales manually | kumavis | 2018-03-15 | 6 | -13/+12 |
* | | | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -0/+82 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Update button styles | Alexander Tseung | 2018-03-26 | 3 | -7/+7 |
| | |/
| |/| |
|
| * | | i18n Import flow | Thomas | 2018-03-21 | 2 | -5/+5 |
| |/ |
|
| * | Fix translations whose substitutions params were not in arrays. | Dan | 2018-03-14 | 1 | -1/+1 |
| * | 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 | 4 | -12/+28 |
| |\| |
|
| | * | 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 |
| | * | | | [NewUI] Updates capitalization and alignment for the import account screen. (... | Dan J Miller | 2018-02-01 | 2 | -8/+13 |
| | * | | | [NewUI] Set default new account name as placeholder, but not value (#3121) | Dan J Miller | 2018-02-01 | 1 | -5/+8 |
| | |/ / |
|
| * | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 4 | -16/+17 |
| * | | | separate out cross-browser i18n for extensions | Nick Doiron | 2018-01-25 | 5 | -0/+5 |
| * | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 5 | -21/+20 |
| |/ / |
|
* | | | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 3 | -257/+0 |
* | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 3 | -29/+182 |
|\| | |
|
| * | | Fix input box padding and select highlight in new account create and import p... | Dan | 2018-01-13 | 1 | -1/+0 |
| * | | New add account page with create and import options. | Dan | 2018-01-13 | 5 | -77/+236 |
* | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 3 | -201/+0 |
|/ / |
|
* | | 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 |
* | | 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 |
|/ |
|
* | Replace ui with responsive-ui | Dan Finlay | 2017-07-25 | 2 | -255/+0 |
* | Move responsive ui into its own folder for easier merges | Dan Finlay | 2017-07-21 | 6 | -0/+552 |
* | Make folder for responsive UI | Dan Finlay | 2017-07-04 | 6 | -552/+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 fiat rendering | Dan Finlay | 2017-05-17 | 2 | -2/+6 |
* | Remove redux dependency from eth-balance and its dependent tree | Dan Finlay | 2017-05-13 | 2 | -2/+5 |
* | Fix linting warnings | Thomas Huang | 2017-04-27 | 1 | -1/+1 |
* | Fix account detail transition fix. | Kevin Serrano | 2017-04-06 | 1 | -1/+1 |
* | Filter txs by txMeta network value in account detail | kumavis | 2017-03-29 | 1 | -1/+1 |
* | Fix styling of error message. | Kevin Serrano | 2017-03-23 | 2 | -4/+2 |
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 2 | -11/+4 |
|\ |
|
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 2 | -11/+4 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 1 | -2/+3 |
|\| |
|
| * | migration 5 - move keyring controller state to substate | kumavis | 2017-01-29 | 1 | -2/+3 |
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 1 | -5/+5 |
|/ |
|
* | Implement naieve JSON file importing | Dan Finlay | 2017-01-19 | 2 | -5/+76 |
* | Added new modular private key import system | Dan Finlay | 2017-01-19 | 1 | -2/+1 |
* | Remove unused UI files | Dan Finlay | 2017-01-18 | 2 | -109/+0 |
* | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 3 | -7/+86 |
* | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu | Dan Finlay | 2017-01-18 | 6 | -0/+255 |
|\ |
|
| * | Develop import subviews | Dan Finlay | 2016-11-05 | 4 | -16/+85 |
| * | Add import account placeholder template | Dan Finlay | 2016-11-05 | 2 | -30/+70 |
| * | Linted | Dan Finlay | 2016-11-05 | 1 | -6/+3 |
| * | Add account adding subview placeholders | Dan Finlay | 2016-11-05 | 3 | -37/+119 |
| * | Scaffold new account view | Dan Finlay | 2016-11-05 | 2 | -1/+61 |
* | | Fix rendering of loose accounts | Dan Finlay | 2016-12-24 | 1 | -2/+2 |
* | | Show a "LOOSE" warning on accounts not belonging to HD Seed phrase | Dan Finlay | 2016-12-23 | 2 | -7/+25 |
* | | Fix camel casing on setSelectedAccount action. | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
* | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 2 | -5/+5 |
|/ |
|
* | Remove insane actions hash | Dan Finlay | 2016-11-05 | 1 | -6/+2 |
* | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 1 | -3/+3 |
* | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 1 | -3/+3 |
* | Remove flex class from account list container | Dan Finlay | 2016-10-12 | 1 | -1/+1 |
* | Merge branch 'library' of github.com:MetaMask/metamask-plugin into library | kumavis | 2016-09-13 | 2 | -10/+7 |
|\ |
|
| * | Fix single account list formatting | Dan Finlay | 2016-09-13 | 2 | -5/+2 |
| * | Add accounts back to metamask state | Dan Finlay | 2016-09-13 | 1 | -5/+5 |
* | | ui - remove unused currentDomain prop | kumavis | 2016-09-13 | 1 | -1/+0 |
|/ |
|
* | Revert "Add new eth-lightwallet salting to vault." | Frankie | 2016-09-13 | 2 | -7/+10 |
* | Fix account list formatting when only a single item. | Dan Finlay | 2016-09-12 | 2 | -10/+7 |
* | Merge branch 'master' into i#589pendingTxsIssue | Frankie | 2016-09-09 | 1 | -2/+2 |
|\ |
|
| * | Nearly finished factoring fiat value into eth-balance | Dan Finlay | 2016-09-07 | 1 | -2/+2 |
* | | Add network checks for unconfirmed Txs | Frankie | 2016-09-09 | 1 | -0/+1 |
|/ |
|
* | Change account list balance rendering. | Kevin Serrano | 2016-08-17 | 1 | -2/+6 |
* | Add mock dev mode | Dan Finlay | 2016-07-22 | 1 | -2/+1 |
* | Replace manual copy buttons with new CopyButton component | Dan Finlay | 2016-06-30 | 1 | -9/+3 |
* | Add alt titles to most critical icons | Kevin Serrano | 2016-06-28 | 1 | -0/+1 |
* | accounts - rename account list item so it doesnt overlap | kumavis | 2016-06-24 | 2 | -2/+3 |
* | Fix for lint err | Frankie | 2016-06-22 | 1 | -6/+0 |
* | Fix conflict | Frankie | 2016-06-22 | 2 | -59/+56 |
|\ |
|
| * | Manually linted | Dan Finlay | 2016-06-22 | 2 | -3/+0 |
| * | Auto linted | Dan Finlay | 2016-06-22 | 2 | -57/+54 |
* | | Change the copy to cliboard icon | Frankie | 2016-06-22 | 1 | -2/+6 |
|/ |
|
* | Let account address take more space in account list | Dan Finlay | 2016-06-15 | 1 | -6/+18 |
* | Change chevron-down to fa-plus | Frankie | 2016-06-04 | 1 | -1/+1 |
* | Add number indicating pending txs to account list | Dan Finlay | 2016-05-26 | 2 | -0/+23 |
* | Add copy address button to account list | Dan Finlay | 2016-05-24 | 2 | -6/+47 |
* | Move account list panel to component | Dan Finlay | 2016-05-24 | 2 | -45/+28 |
* | Move accounts index | Dan Finlay | 2016-05-24 | 1 | -0/+182 |