| Commit message (Expand) | Author | Age | Files | Lines |
* | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 1 | -5/+0 |
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 2 | -7/+7 |
|\ |
|
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 2 | -7/+7 |
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 2 | -16/+16 |
|/ |
|
* | Add ability to import v3 JSON wallets | Dan Finlay | 2017-01-19 | 1 | -0/+1 |
* | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu | Dan Finlay | 2017-01-18 | 1 | -0/+9 |
|\ |
|
| * | Scaffold new account view | Dan Finlay | 2016-11-05 | 1 | -0/+9 |
* | | Add "import account" menu item + template view | Dan Finlay | 2017-01-18 | 1 | -0/+8 |
* | | Merge branch 'master' into dev | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
|\ \ |
|
| * | | update coinbase info and view | Frankie | 2017-01-11 | 1 | -1/+1 |
* | | | Merge pull request #937 from MetaMask/i900-forgot-password-flow | Dan Finlay | 2016-12-20 | 1 | -1/+11 |
|\ \ \ |
|
| * | | | Modify actions to support better transition. | Kevin Serrano | 2016-12-20 | 1 | -0/+9 |
| * | | | Redirect to seed word screen for forgotten passwords. | Kevin Serrano | 2016-12-20 | 1 | -1/+2 |
* | | | | Merged master into dev | Dan Finlay | 2016-12-20 | 2 | -0/+19 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 2 | -0/+19 |
* | | | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 1 | -1/+13 |
* | | | Fix proper behavior for restoring accounts when password forgotten. | Kevin Serrano | 2016-11-24 | 1 | -0/+1 |
* | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 2 | -2/+1 |
* | | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 1 | -1/+1 |
* | | | Linting to the max. | Kevin Serrano | 2016-11-12 | 1 | -1/+0 |
| |/
|/| |
|
* | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 1 | -1/+1 |
* | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 2 | -10/+1 |
* | | Linted | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
* | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 1 | -1/+9 |
|/ |
|
* | Drop the buy button in the confTx view if account does not have enough eth | Frankie | 2016-09-16 | 1 | -2/+2 |
* | Merge branch 'master' into qrCode | Frankie | 2016-09-14 | 2 | -2/+0 |
|\ |
|
| * | ui - remove unused currentDomain prop | kumavis | 2016-09-13 | 2 | -2/+0 |
* | | Remove unused code in qr actions | Frankie | 2016-09-13 | 1 | -2/+0 |
* | | Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo... | Frankie | 2016-09-13 | 1 | -2/+3 |
|/ |
|
* | Remove console.log | Frankie | 2016-09-09 | 1 | -1/+0 |
* | Add to CHANGELOG.md and Remove unnecessary catch | Frankie | 2016-09-09 | 1 | -9/+0 |
* | Add network checks for unconfirmed Txs | Frankie | 2016-09-09 | 1 | -3/+16 |
* | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 1 | -1/+4 |
|\ |
|
| * | Linted | Dan Finlay | 2016-08-24 | 1 | -1/+0 |
| * | Close notification on opening main UI | Dan Finlay | 2016-08-24 | 1 | -7/+1 |
| * | Close popup even if last tx is dismissed from main UI | Dan Finlay | 2016-08-24 | 1 | -7/+8 |
| * | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 1 | -0/+14 |
| |\ |
|
| * | | Linted | Dan Finlay | 2016-08-17 | 1 | -7/+4 |
| * | | MVP Popup Notifications Working | Dan Finlay | 2016-08-17 | 1 | -0/+12 |
* | | | Add a back button on lock screen to go back to init menu | Frankie | 2016-08-26 | 1 | -0/+21 |
| |/
|/| |
|
* | | Create a ShapeShift tx in tx History | Frankie | 2016-08-19 | 1 | -1/+1 |
* | | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 1 | -0/+10 |
|\| |
|
| * | Added compliance for tests and properly accounts for N/A conversions. | Kevin Serrano | 2016-08-17 | 1 | -1/+1 |
| * | Merge master. | Kevin Serrano | 2016-08-16 | 2 | -5/+102 |
| |\ |
|
| * | | Holding off on select formatting for now. Renamed keys for options. | Kevin Serrano | 2016-08-05 | 1 | -1/+1 |
| * | | Create default values for metamask state for conversion. Fix config files for... | Kevin Serrano | 2016-08-05 | 1 | -0/+3 |
| * | | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. | Kevin Serrano | 2016-07-23 | 2 | -1/+22 |
| |\ \ |
|
| * | | | Linting! | Kevin Serrano | 2016-07-23 | 1 | -1/+1 |
| * | | | Add date access throughout the data flow. | Kevin Serrano | 2016-07-22 | 1 | -0/+1 |
| * | | | Add data field to pass up parameters up to reducer. | Kevin Serrano | 2016-07-22 | 1 | -0/+6 |
* | | | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 1 | -1/+15 |
| |_|/
|/| | |
|
* | | | Change buy forms so that they are their own view and add Qr-code | Frankie | 2016-08-13 | 1 | -33/+27 |
* | | | Fix merge mess | Frankie | 2016-08-11 | 1 | -2/+104 |
* | | | Fix ether warning checkbox. | Kevin Serrano | 2016-08-11 | 1 | -1/+2 |
| |/
|/| |
|
* | | Buy button (#474) | Frankie | 2016-07-22 | 2 | -1/+22 |
|/ |
|
* | Move main drop-down state to component state | Dan Finlay | 2016-07-02 | 1 | -10/+0 |
* | Manually linted | Dan Finlay | 2016-06-22 | 3 | -12/+11 |
* | Auto linted | Dan Finlay | 2016-06-22 | 3 | -403/+398 |
* | Create disclaimer approval reducer | Dan Finlay | 2016-06-17 | 1 | -0/+5 |
* | A couple seed recovery enhancements | Dan Finlay | 2016-06-03 | 1 | -2/+4 |
* | Added seed word recovery to config screen | Dan Finlay | 2016-06-03 | 1 | -1/+13 |
* | Add clicking txs in list shows tx conf screen | Dan Finlay | 2016-05-27 | 1 | -2/+26 |
* | Merge branch 'master' into FixTransactionBackButton | Dan Finlay | 2016-05-26 | 1 | -0/+1 |
|\ |
|
| * | Fix persistent warning bug | Dan Finlay | 2016-05-26 | 1 | -0/+1 |
* | | Add number indicating pending txs to account list | Dan Finlay | 2016-05-26 | 1 | -1/+0 |
* | | Fix back button on pending tx screen | Dan Finlay | 2016-05-26 | 1 | -3/+20 |
|/ |
|
* | Added ability to nickname wallets locally | Dan Finlay | 2016-05-21 | 1 | -0/+8 |
* | Add ability to add account to vault | Dan Finlay | 2016-05-21 | 1 | -0/+6 |
* | Make accounts page transition forward from account detail | Dan Finlay | 2016-05-19 | 1 | -2/+2 |
* | Add dynamic list item styles | Dan Finlay | 2016-05-19 | 1 | -0/+5 |
* | Add animated sandwich button | Dan Finlay | 2016-05-19 | 1 | -0/+6 |
* | Streamlined some transition logic | Dan Finlay | 2016-05-13 | 1 | -1/+7 |
* | Fix more transition bugs | Dan Finlay | 2016-05-12 | 2 | -6/+16 |
* | Make default providers more easiliy configurable for metamask devs | Dan Finlay | 2016-05-11 | 1 | -1/+11 |
* | Merge branch 'MoveAccountExportToSubview' into FixButtonStyleBug | Dan Finlay | 2016-05-05 | 1 | -0/+17 |
|\ |
|
| * | Move account export to subview | Dan Finlay | 2016-05-05 | 1 | -0/+17 |
* | | Fix routing bug | Dan Finlay | 2016-05-05 | 1 | -0/+2 |
|/ |
|
* | Show any pending txs when unlocking | Dan Finlay | 2016-05-04 | 1 | -0/+1 |
* | Add UI for Signing Messages | Dan Finlay | 2016-05-04 | 2 | -8/+27 |
* | Fix outdated transitions | Dan Finlay | 2016-04-30 | 1 | -4/+3 |
* | When no account is selected, show accounts view | Dan Finlay | 2016-04-26 | 1 | -2/+3 |
* | Persist selected account | Dan Finlay | 2016-04-26 | 1 | -3/+1 |
* | Fixed some loading bugs | Dan Finlay | 2016-04-26 | 1 | -3/+1 |
* | Fix test | Dan Finlay | 2016-04-26 | 1 | -2/+0 |
* | Make account detail view the primary view | Dan Finlay | 2016-04-26 | 1 | -2/+25 |
* | Moved UI into repo with its own dependency stack | Dan Finlay | 2016-04-14 | 3 | -0/+372 |