aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into rinkebyDan Finlay2017-04-281-1/+0
|\
| * Fix linting warningsThomas Huang2017-04-271-1/+0
* | Linting.Kevin Serrano2017-04-261-1/+1
* | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-261-1/+1
* | add rinkeby networkNickyg2017-04-261-0/+9
|/
* Add Kovan test network to our application.Kevin Serrano2017-03-231-0/+9
* Render config screen from unlock.Kevin Serrano2017-03-141-0/+4
* Display Custom RPC on lock screen.Kevin Serrano2017-03-141-1/+1
* Break out rpc update and rpclist into two reducers.Kevin Serrano2017-03-081-3/+1
* Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-281-0/+2
|\
| * Got personal_sign workingDan Finlay2017-02-241-0/+2
* | Concatenate custom RPC labels that are too longDan Finlay2017-02-281-1/+9
* | Tested against code to play nice with unit tests.Kevin Serrano2017-02-241-1/+3
* | Make the UI play nice with empty RPC lists.Kevin Serrano2017-02-231-1/+1
* | LintoKevin Serrano2017-02-231-1/+1
* | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-231-0/+23
|/
* Merge branch 'master' into i1128-noticesdevDan Finlay2017-02-211-0/+20
|\
| * Add debug logging to ui routing logic.Dan Finlay2017-02-211-0/+20
* | Re-enable notices on dev.Kevin Serrano2017-02-211-1/+1
|/
* Remove custom RPC option when on lock screen.Kevin Serrano2017-02-161-1/+1
* Change networks from lock screen.Kevin Serrano2017-02-161-6/+6
* fix debugKevin Serrano2017-02-101-1/+1
* Prevent notices from opening in test and debug mode.Kevin Serrano2017-02-101-1/+1
* Delete all code related to disclaimers.Kevin Serrano2017-02-101-19/+13
* Clean up message manger includes:Frankie2017-01-291-2/+2
* Add ability to import v3 JSON walletsDan Finlay2017-01-191-2/+3
* Remove outdated referenceDan Finlay2017-01-181-4/+0
* Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-181-1/+5
|\
| * Add account adding subview placeholdersDan Finlay2016-11-051-2/+2
| * Scaffold new account viewDan Finlay2016-11-051-0/+4
* | Add "import account" menu item + template viewDan Finlay2017-01-181-0/+11
* | Linting.Kevin Serrano2017-01-051-1/+1
* | Make network somewhat more modular, add new network indicator.Kevin Serrano2017-01-051-9/+15
* | Rename function to be an actionDan Finlay2016-12-231-2/+2
* | LintedDan Finlay2016-12-211-2/+2
* | Make notices confirmation configurableDan Finlay2016-12-211-1/+15
* | Merged master into devDan Finlay2016-12-201-9/+7
|\ \
| * | clean - code stylekumavis2016-12-171-4/+0
| * | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-0/+4
| * | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-0/+7
| * | Remove morden testnet providerDan Finlay2016-12-161-9/+0
* | | Revert "Interface enhancements"Dan Finlay2016-12-171-3/+11
* | | Fixed header h1 alignment and network nameLuis Iván Cuende2016-12-151-2/+3
* | | Better account details viewLuis Iván Cuende2016-12-151-8/+0
* | | Beautified disclaimerLuis Iván Cuende2016-12-141-1/+0
* | | Modify forgot password flow to go back to init screen.Kevin Serrano2016-11-241-34/+0
* | | Fix undefined provider menu itemDan Finlay2016-11-231-2/+5
* | | Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-221-7/+8
|\ \ \
| * | | Fix custom provider menu itemDan Finlay2016-11-221-7/+8
* | | | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-221-67/+26
|\| | | | |/ / |/| |
| * | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-151-3/+3
| * | Linting to the max.Kevin Serrano2016-11-121-2/+0
| |/
| * Add reveal of seed words.Kevin Serrano2016-11-021-0/+4
| * Make forgot password button.Dan Finlay2016-11-021-29/+12
| * Made progress on parity for MultiVaultKevin Serrano2016-11-021-16/+4
| * LintedKevin Serrano2016-11-011-1/+0
| * Implement seed word confirmation page.Kevin Serrano2016-11-011-0/+7
| * Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-291-8/+7
| |\
| * | Phase out extra warning screen.Kevin Serrano2016-10-261-5/+0
| * | Fix duplicate provider menu item bugDan Finlay2016-10-221-6/+1
| * | Began adding first basic keyringDan Finlay2016-10-211-1/+0
| * | Linted & added salting to vaultDan Finlay2016-10-211-1/+1
| * | Fix state updating after vault creation and unlockingDan Finlay2016-10-211-0/+1
| * | Initial work on UI sideKevin Serrano2016-10-161-0/+4
| * | Remove opinionated seed word codeDan Finlay2016-10-131-16/+2
* | | Begin adding Ropsten supportDan Finlay2016-11-221-1/+10
| |/ |/|
* | Fix provider menu selection indicationDan Finlay2016-10-261-8/+7
|/
* Prevent back/login buttons from appearing on the terms of service.Kevin Serrano2016-10-071-0/+1
* Rename drop menu item to be consistent with naming.Kevin Serrano2016-10-051-1/+1
* Show loading indication when selecting ShapeShiftDan Finlay2016-09-161-3/+4
* Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo...Frankie2016-09-131-1/+0
* Nearly finished factoring fiat value into eth-balanceDan Finlay2016-09-071-8/+7
* Show custom rpc menu item alwaysDan Finlay2016-08-301-6/+9
* make the back button its own functionFrankie2016-08-271-21/+22
* Merge branch 'master' into i#563forgotPasswordFrankie2016-08-261-0/+5
|\
| * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-231-0/+28
| |\
| * | MVP Popup Notifications WorkingDan Finlay2016-08-171-0/+5
* | | Change style on back button to be more like the rest of the appFrankie2016-08-261-25/+55
* | | Add a back button on lock screen to go back to init menuFrankie2016-08-261-1/+58
| |/ |/|
* | WIP: ShapeShift txFrankie2016-08-191-0/+28
|/
* Remove ethereum classic providerDan Finlay2016-08-151-9/+0
* Change buy forms so that they are their own view and add Qr-codeFrankie2016-08-131-1/+3
* Fix issue with dropdown menuFrankie2016-08-041-0/+1
* LintedDan Finlay2016-07-291-1/+1
* Add missing reference for providerDan Finlay2016-07-291-1/+1
* Add eth classic to provider menuDan Finlay2016-07-291-0/+12
* Fix menu droppo issues caused by Chrome 52.Kevin Serrano2016-07-271-0/+1
* Buy button (#474)Frankie2016-07-221-0/+4
* Fix main dropdown animationDan Finlay2016-07-121-2/+2
* Fix dropdown z-index issue.Kevin Serrano2016-07-071-3/+3
* LintedDan Finlay2016-07-021-1/+0
* Move main drop-down state to component stateDan Finlay2016-07-021-6/+9
* Formatted dev mode betterDan Finlay2016-07-011-2/+3
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndi...kumavis2016-06-301-12/+14
|\
| * Unify tooltip stylesDan Finlay2016-06-301-12/+14
* | Add to change logFrankie2016-06-301-1/+1
* | Add network name to indicator and some css fixesFrankie2016-06-301-1/+1
* | Add ✓ charchter to indicate active networkFrankie2016-06-301-0/+11
|/
* Remove missused actionFrankie2016-06-291-1/+0
* Make it so that when you click the custom rpc url it closes the dropdown menuFrankie2016-06-291-1/+1
* fix lintFrankie2016-06-291-4/+4
* Merge branch 'master' into networkDropdownFixFrankie2016-06-291-2/+2
|\
| * Modify network icons to reflect current design. (#355)Kevin Serrano2016-06-291-2/+2
* | Add custom to drop down menuFrankie2016-06-291-0/+22
|/
* Move clearNotifications to popup.jsFrankie2016-06-291-9/+0
* fix for lintingFrankie2016-06-291-5/+5
* Merge branch 'master' into i340+1Frankie2016-06-291-0/+1
|\
| * Add alt titles to most critical iconsKevin Serrano2016-06-281-0/+1
* | fix #341 close notifications when oppening pop upFrankie2016-06-291-0/+8
|/
* Add fox logo back to left of menuDan Finlay2016-06-241-8/+29
* Moved account change button to menu barDan Finlay2016-06-241-12/+35
* Manually lintedDan Finlay2016-06-221-7/+0
* Auto lintedDan Finlay2016-06-221-28/+26
* Remove dead codeDan Finlay2016-06-171-34/+0
* Conditionally display disclaimerDan Finlay2016-06-171-0/+6
* Rename Lock Account to simply LockDan Finlay2016-06-151-1/+1
* Add provider menu on clicking network status indicator.Dan Finlay2016-06-041-19/+18
* Clicking network status indicator reveals provider menuDan Finlay2016-06-041-1/+61
* Merge branch 'master' into display_networkDan Finlay2016-06-041-0/+4
|\
| * Added seed word recovery to config screenDan Finlay2016-06-031-0/+4
* | Remove metamask logo from headerDan Finlay2016-06-041-6/+0
* | undo styleZac Mitton2016-06-021-6/+5
* | network status getting set upon start-up and showing in title bar but not aut...Zac Mitton2016-06-021-6/+9
|/
* Fix back button on pending tx screenDan Finlay2016-05-261-13/+1
* Remove commented out codeDan Finlay2016-05-261-37/+0
* Fix typosDan Finlay2016-05-191-2/+2
* Finish clean implementation of drop-down menuDan Finlay2016-05-191-50/+55
* Add dynamic list item stylesDan Finlay2016-05-191-29/+78
* Add animated sandwich buttonDan Finlay2016-05-191-3/+11
* ui - redesign - unlock menukumavis2016-05-141-43/+46
* ui - redesign - trans group + + account detail + tx list fixeskumavis2016-05-141-1/+2
* ui - redesign - remove footerkumavis2016-05-141-22/+32
* Fix more transition bugsDan Finlay2016-05-121-6/+3
* Vertically center title bar contentDan Finlay2016-05-111-0/+3
* ui - redesign - app header + accounts selectionkumavis2016-05-111-14/+20
* Fix button width transition bugDan Finlay2016-05-051-1/+2
* Show any pending txs when unlockingDan Finlay2016-05-041-2/+17
* Add UI for Signing MessagesDan Finlay2016-05-041-1/+1
* Moved UI into repo with its own dependency stackDan Finlay2016-04-141-0/+242