aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
Commit message (Expand)AuthorAgeFilesLines
* Delete all code related to disclaimers.Kevin Serrano2017-02-101-5/+0
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-022-7/+7
|\
| * rename selectedAccount to selectedAddresskumavis2017-01-312-7/+7
* | Clean up message manger includes:Frankie2017-01-292-16/+16
|/
* Add ability to import v3 JSON walletsDan Finlay2017-01-191-0/+1
* Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-181-0/+9
|\
| * Scaffold new account viewDan Finlay2016-11-051-0/+9
* | Add "import account" menu item + template viewDan Finlay2017-01-181-0/+8
* | Merge branch 'master' into devDan Finlay2017-01-171-1/+1
|\ \
| * | update coinbase info and viewFrankie2017-01-111-1/+1
* | | Merge pull request #937 from MetaMask/i900-forgot-password-flowDan Finlay2016-12-201-1/+11
|\ \ \
| * | | Modify actions to support better transition.Kevin Serrano2016-12-201-0/+9
| * | | Redirect to seed word screen for forgotten passwords.Kevin Serrano2016-12-201-1/+2
* | | | Merged master into devDan Finlay2016-12-202-0/+19
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-172-0/+19
* | | Fix vault encrypting & unlocking bugDan Finlay2016-12-011-1/+13
* | | Fix proper behavior for restoring accounts when password forgotten.Kevin Serrano2016-11-241-0/+1
* | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-222-2/+1
* | | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-151-1/+1
* | | Linting to the max.Kevin Serrano2016-11-121-1/+0
| |/ |/|
* | Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-021-1/+1
* | Phase out extra warning screen.Kevin Serrano2016-10-262-10/+1
* | LintedDan Finlay2016-10-211-1/+1
* | Initial work on UI sideKevin Serrano2016-10-161-1/+9
|/
* Drop the buy button in the confTx view if account does not have enough ethFrankie2016-09-161-2/+2
* Merge branch 'master' into qrCodeFrankie2016-09-142-2/+0
|\
| * ui - remove unused currentDomain propkumavis2016-09-132-2/+0
* | Remove unused code in qr actionsFrankie2016-09-131-2/+0
* | Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo...Frankie2016-09-131-2/+3
|/
* Remove console.logFrankie2016-09-091-1/+0
* Add to CHANGELOG.md and Remove unnecessary catchFrankie2016-09-091-9/+0
* Add network checks for unconfirmed TxsFrankie2016-09-091-3/+16
* Merge branch 'master' into i#563forgotPasswordFrankie2016-08-261-1/+4
|\
| * LintedDan Finlay2016-08-241-1/+0
| * Close notification on opening main UIDan Finlay2016-08-241-7/+1
| * Close popup even if last tx is dismissed from main UIDan Finlay2016-08-241-7/+8
| * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-231-0/+14
| |\
| * | LintedDan Finlay2016-08-171-7/+4
| * | MVP Popup Notifications WorkingDan Finlay2016-08-171-0/+12
* | | Add a back button on lock screen to go back to init menuFrankie2016-08-261-0/+21
| |/ |/|
* | Create a ShapeShift tx in tx HistoryFrankie2016-08-191-1/+1
* | Merge branch 'master' into shapeshiftTxFrankie2016-08-191-0/+10
|\|
| * Added compliance for tests and properly accounts for N/A conversions.Kevin Serrano2016-08-171-1/+1
| * Merge master.Kevin Serrano2016-08-162-5/+102
| |\
| * | Holding off on select formatting for now. Renamed keys for options.Kevin Serrano2016-08-051-1/+1
| * | Create default values for metamask state for conversion. Fix config files for...Kevin Serrano2016-08-051-0/+3
| * | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-232-1/+22
| |\ \
| * | | Linting!Kevin Serrano2016-07-231-1/+1
| * | | Add date access throughout the data flow.Kevin Serrano2016-07-221-0/+1
| * | | Add data field to pass up parameters up to reducer.Kevin Serrano2016-07-221-0/+6
* | | | WIP: ShapeShift txFrankie2016-08-191-1/+15
| |_|/ |/| |
* | | Change buy forms so that they are their own view and add Qr-codeFrankie2016-08-131-33/+27
* | | Fix merge messFrankie2016-08-111-2/+104
* | | Fix ether warning checkbox.Kevin Serrano2016-08-111-1/+2
| |/ |/|
* | Buy button (#474)Frankie2016-07-222-1/+22
|/
* Move main drop-down state to component stateDan Finlay2016-07-021-10/+0
* Manually lintedDan Finlay2016-06-223-12/+11
* Auto lintedDan Finlay2016-06-223-403/+398
* Create disclaimer approval reducerDan Finlay2016-06-171-0/+5
* A couple seed recovery enhancementsDan Finlay2016-06-031-2/+4
* Added seed word recovery to config screenDan Finlay2016-06-031-1/+13
* Add clicking txs in list shows tx conf screenDan Finlay2016-05-271-2/+26
* Merge branch 'master' into FixTransactionBackButtonDan Finlay2016-05-261-0/+1
|\
| * Fix persistent warning bugDan Finlay2016-05-261-0/+1
* | Add number indicating pending txs to account listDan Finlay2016-05-261-1/+0
* | Fix back button on pending tx screenDan Finlay2016-05-261-3/+20
|/
* Added ability to nickname wallets locallyDan Finlay2016-05-211-0/+8
* Add ability to add account to vaultDan Finlay2016-05-211-0/+6
* Make accounts page transition forward from account detailDan Finlay2016-05-191-2/+2
* Add dynamic list item stylesDan Finlay2016-05-191-0/+5
* Add animated sandwich buttonDan Finlay2016-05-191-0/+6
* Streamlined some transition logicDan Finlay2016-05-131-1/+7
* Fix more transition bugsDan Finlay2016-05-122-6/+16
* Make default providers more easiliy configurable for metamask devsDan Finlay2016-05-111-1/+11
* Merge branch 'MoveAccountExportToSubview' into FixButtonStyleBugDan Finlay2016-05-051-0/+17
|\
| * Move account export to subviewDan Finlay2016-05-051-0/+17
* | Fix routing bugDan Finlay2016-05-051-0/+2
|/
* Show any pending txs when unlockingDan Finlay2016-05-041-0/+1
* Add UI for Signing MessagesDan Finlay2016-05-042-8/+27
* Fix outdated transitionsDan Finlay2016-04-301-4/+3
* When no account is selected, show accounts viewDan Finlay2016-04-261-2/+3
* Persist selected accountDan Finlay2016-04-261-3/+1
* Fixed some loading bugsDan Finlay2016-04-261-3/+1
* Fix testDan Finlay2016-04-261-2/+0
* Make account detail view the primary viewDan Finlay2016-04-261-2/+25
* Moved UI into repo with its own dependency stackDan Finlay2016-04-143-0/+372