aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
Commit message (Expand)AuthorAgeFilesLines
* Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-301-1/+1
* Update designs for Add Token screenAlexander Tseung2018-05-201-0/+3
* Fix account and network dropdowns in confirm screenAlexander Tseung2018-05-151-11/+2
* Add new unlock screen designAlexander Tseung2018-05-121-113/+17
* Merge pull request #4156 from MetaMask/i4010-spinnerkumavis2018-05-031-1/+2
|\
| * Fix styling of the app spinnerAlexander Tseung2018-05-011-1/+2
* | Use new design for reveal seed screen. Persist seed words only in first time ...Alexander Tseung2018-04-231-1/+1
* | Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-221-13/+1
|/
* Merge pull request #3977 from MetaMask/i-3913-big-numberDan Finlay2018-04-191-13/+0
|\
| * Fix spinner layoutAlexander Tseung2018-04-181-13/+0
* | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-191-1/+13
|/
* Require loglevel singleton in each module that uses itbitpshr2018-04-141-0/+1
* Fix integration testsAlexander Tseung2018-04-071-2/+0
* commitAlexander Tseung2018-04-041-8/+2
* Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-031-3/+2
|\
* | Fix lint errorsAlexander Tseung2018-04-031-219/+1
* | Refactor onboarding flowAlexander Tseung2018-04-021-20/+4
* | Fix conf-tx renderAlexander Tseung2018-03-311-1/+4
* | Fix merge conflictsAlexander Tseung2018-03-311-14/+15
|\|
| * Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-301-13/+19
| |\
| | * Removes t from props via metamask-connect and instead places it on context vi...Dan2018-03-291-13/+19
| * | ui - use relative location for imageskumavis2018-03-291-1/+1
| |/
* | Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-311-235/+207
* | Fix i18n merge conflictsAlexander Tseung2018-03-301-13/+15
|\|
| * Merge branch 'master' into i18n-translator-reduxDan2018-03-271-3/+3
| |\
| * | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-221-13/+12
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-211-6/+27
| |\ \
| * \ \ Merge branch 'master' into i18n-translator-reduxDan2018-03-201-6/+8
| |\ \ \
| * | | | Handle i18n with redux.Dan2018-03-161-4/+4
| * | | | i18n - load locales manuallykumavis2018-03-151-1/+1
* | | | | Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-291-11/+15
* | | | | Fix merge conflictsAlexander Tseung2018-03-271-4/+62
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Pop uses new ui onboarding when in beta.Dan2018-03-231-3/+3
| | |_|/ | |/| |
| * | | Add connecting indication templatesDan Finlay2018-03-201-6/+27
| | |/ | |/|
| * | Update margins for consistency in first time flow (#3588)Alexander Tseung2018-03-161-6/+8
| |/
| * Merge branch 'master' into i18nThomas Huang2018-03-141-4/+19
| |\
| | * Styling fixes to welcome; hide network component on create password; shown we...Dan2018-03-131-2/+2
| | * Add welcome screen to new-ui browser first time flow.Dan2018-03-091-3/+18
| * | Merge branch 'master' into i18nDan2018-03-071-23/+54
| |\|
| | * Fix seed phrase validation clearing form (#3417)Alexander Tseung2018-03-071-4/+4
| | * Fixes shapeshift coin selection dropdown. (#3416)Dan J Miller2018-03-061-1/+3
| | * Fix NewUI reveal seed flow. (#3410)Dan J Miller2018-03-031-3/+11
| | * Adds beta label to Metamask name in full screen app bar.Dan2018-02-281-0/+2
| | * Move beta warning to app header.Dan2018-02-281-0/+6
| | * Fix Import Existing DEN in popup New UI first time flow.Dan2018-02-201-1/+1
| | * Ensures that mascara initialize screen is not shown in popup. (#3279)Dan J Miller2018-02-171-1/+4
| | * [NewUI] Adds the mascara first time flow to betaUI extension (#3257)Dan J Miller2018-02-161-4/+6
| | * Remove chrome focus outline for mouse users. (#3230)Dan J Miller2018-02-131-1/+17
| * | Implemented feedback to make i18n work on macDan Finlay2018-03-071-1/+2
* | | Fix react-router related exceptionsAlexander Tseung2018-02-101-1/+1
* | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-091-15/+23
|\ \ \ | | |/ | |/|
| * | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-081-15/+7
| |/
* | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-011-3/+3
* | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-301-15/+14
|\|
| * Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-171-357/+206
| |\
| | * New add account page with create and import options.Dan2018-01-131-0/+5
| | * Merge branch 'uat' into cb-388Chi Kei Chan2018-01-131-1/+5
| | |\
| | | * Fix styling in initializationAlexander Tseung2018-01-131-1/+5
| | * | Update main view stylingAlexander Tseung2018-01-111-10/+4
| | |/
| | * Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-041-356/+203
| | |\
| * | | Rename lock to log outDan Finlay2018-01-161-1/+1
| |/ /
| * | fix commentoosthuizenr2018-01-031-1/+1
| * | Fixes #2834Renier Oosthuizen2018-01-031-5/+6
* | | Add route for signature requestAlexander Tseung2017-12-151-1/+24
* | | Add initialized checks for first time flow routesAlexander Tseung2017-12-151-8/+8
* | | Add route for Mascara confirm seedAlexander Tseung2017-12-151-2/+9
* | | Fix lint errorsAlexander Tseung2017-12-151-11/+43
* | | Add routes for mascaraAlexander Tseung2017-12-151-11/+37
* | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-411/+497
| |/ |/|
* | Fix height of login screenDan2017-12-131-27/+25
* | Update newUI UI for switching back to old UI.Dan2017-12-051-7/+0
* | Lint fixDan2017-12-051-2/+2
* | Add UI selectionDan2017-12-051-26/+34
* | More lint fixesDan2017-11-021-1/+1
* | Lint fixes for NewUI-flat.Dan2017-11-021-6/+1
* | Add Info sectionAlexander Tseung2017-10-261-1/+1
* | Show home page when metafox is clickedChi Kei Chan2017-10-251-4/+6
* | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-251-0/+74
|\|
| * Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-211-7/+8
| * Shuffle tokensJacky Chan2017-10-211-3/+3
| * Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-211-4/+13
| * Add UniqueImageScreenJacky Chan2017-10-211-11/+13
| * Adding CreatePasswordScreenJacky Chan2017-10-211-0/+24
| * Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-191-1/+1
| * ui - network - fix localhost active statuskumavis2017-10-111-1/+1
* | Disable network dropdown on conf tx screenChi Kei Chan2017-10-241-8/+17
* | Update settings screen to new UIAlexander Tseung2017-10-231-2/+2
* | Fix loading animation not showing on network changeAlexander Tseung2017-10-201-2/+1
* | Fix selectorsChi Kei Chan2017-10-201-1/+0
* | Get currency from state in account details, send and confirm screens.Dan2017-10-201-1/+4
* | Turn off feature toggle.Dan2017-10-191-8/+10
* | wipChi Kei Chan2017-10-181-4/+7
* | [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state...Dan J Miller2017-10-141-2/+7
* | Adding Account Dropdown V2Chi Kei Chan2017-10-131-1/+4
* | Various styling fixesChi Kei Chan2017-10-131-18/+27
* | Adds checkFeatureToggle util.Dan2017-10-091-4/+2
* | UI for send screen container without form rows.Dan2017-10-091-1/+10
* | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-041-0/+1
|\|
| * Removed MetaMasktitle. Fixed #1730.Branden Soropia2017-10-021-8/+0
| * network - convert localhost from custom rpc to network typekumavis2017-09-301-1/+1
* | Shapeshift deposit tx modal.Dan2017-10-021-33/+0
* | Enables the old shapeshift UI within new ui.Dan2017-10-021-1/+5
* | Always set currency to USD on app mountChi Kei Chan2017-09-291-0/+5
* | Merge branch 'master' into nmChi Kei Chan2017-09-191-0/+2
|\|
| * Resolve merge conflict from masterKevin Serrano2017-09-061-1/+1
| |\
| | * Cleanup stray logs and lintsdtsui2017-08-111-1/+0
| | * Fix logic for dropdown components attaching checkmark to correct accountsdtsui2017-08-111-1/+2
| * | Readd loose label onto accounts.Kevin Serrano2017-08-101-0/+3
| |/
* | Make send token responsive; fix desktop send modal heightChi Kei Chan2017-09-151-1/+1
* | Add responsive UI to send ether modalChi Kei Chan2017-09-151-1/+1
* | Send Token screen partial UIChi Kei Chan2017-09-071-0/+5
* | Fix header style; Address commentsChi Kei Chan2017-09-051-2/+3
* | Fix menu styleJacky Chan2017-09-051-3/+4
* | Fix margin, padding, height for header.Dan2017-09-011-40/+41
* | Lint fixesDan2017-08-311-16/+9
* | Extend modal implementation and state management to accomodate multiple modal...sdtsui2017-08-211-2/+2
* | Remove unnecessary imports, and account-detail.jssdtsui2017-08-141-3/+0
* | Remove unused code - network dropdown components in appsdtsui2017-08-141-204/+0
* | Remove deprecated feature: main app settings dropdownsdtsui2017-08-141-48/+0
* | [WIP] Extract network dropdown into own componentsdtsui2017-08-141-3/+20
* | [WIP] Extract network dropdown out of main app render functionsdtsui2017-08-141-0/+2
* | Move global modals into own pod, inside components/modalssdtsui2017-08-141-3/+4
* | Add minor comments and cleanup for new componentssdtsui2017-08-091-11/+1
* | Move buy view into its own component - BuyOptionssdtsui2017-08-091-36/+2
* | Add an additional font-size breakpoint for buy modal on the largest screenssdtsui2017-08-091-1/+1
* | Move inline styles out into explicitly named BEM classessdtsui2017-08-091-28/+17
* | Implement modal content for buy flow - mobile viewsdtsui2017-08-091-1/+49
* | Implement global modalsdtsui2017-08-091-0/+10
* | Merge branch 'NewUI' into feat/mm-ui-5-mergedsdtsui2017-08-071-6/+40
|\|
| * Fix integration test failures: unnecessary sandwich-expando event stopPropaga...sdtsui2017-08-051-1/+0
| * Re-enable css transitions for dropdowns in header, needs menu-droppo library ...sdtsui2017-08-051-0/+2
| * Lint ui/appsdtsui2017-08-041-10/+7
| * Increase size of network dropdownsdtsui2017-08-041-0/+18
| * De-dupe click handler for sandwich-expandosdtsui2017-08-041-6/+12
| * Move accountselector menu-droppo up to app-headersdtsui2017-08-041-0/+22
| * Fix wonky widths for notices.Kevin Serrano2017-08-041-1/+1
| * lint fixkumavis2017-08-021-1/+1
* | Add sidebar click handler to overlaysdtsui2017-08-071-2/+11
* | Refactor app-header css, including box shadow and z-indexsdtsui2017-08-071-24/+5
* | Add notes for @Zanibar, with props.isUnlocked and currentView.name logssdtsui2017-08-031-0/+4
* | Isolate routing logic for isUnlocked, remove stray logssdtsui2017-08-031-14/+4
* | Finalize sidebar dimensionssdtsui2017-08-031-27/+3
* | Adjust header spacing for 500px and 900px heightssdtsui2017-08-031-13/+4
* | Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-031-10/+6
* | Ensure app-header is rendered in responsive layoutsdtsui2017-08-031-1/+2
* | Cleanup send, move send token into separate func to make room for send ETHsdtsui2017-08-031-0/+1
* | Move overlay out of transition areasdtsui2017-08-031-17/+18
* | Hook up css animationsdtsui2017-08-031-41/+68
* | Add notes for overlay click actionsdtsui2017-08-031-0/+1
* | Implement custom sidebar, with close buttonsdtsui2017-08-031-1/+67
* | Integrate slideout menu with tx viewsdtsui2017-08-031-0/+1
* | Implement mobile-friendly responsive layout with flex wrapsdtsui2017-08-011-1/+3
* | Add layout for main container elementssdtsui2017-07-311-12/+8
* | Remove old header spacesdtsui2017-07-311-11/+0
* | Adjust dimensions of popup.html and app bar to matchsdtsui2017-07-311-1/+1
* | Center send token content; hook up 'Next' and 'Cancel' buttonssdtsui2017-07-301-9/+11
* | Add token logo to send screensdtsui2017-07-301-0/+10
* | Rearrange header components: closer to redesigned UIsdtsui2017-07-301-31/+18
|/
* Fix dropdown behavior - networksdtsui2017-07-291-1/+11
* Fix dropdown toggle behavior - settingssdtsui2017-07-291-1/+5
* Fix react warningDan Finlay2017-07-281-0/+6
* Remove unused parameterDan Finlay2017-07-281-1/+1
* Fix custom provider indicationDan Finlay2017-07-271-5/+5
* Re-center network dropdownsdtsui2017-07-271-1/+3
* Lots of flex rearrangement on account detail viewDan Finlay2017-07-261-23/+8
* Restore sort order fixDan Finlay2017-07-251-1/+1
* Replace ui with responsive-uiDan Finlay2017-07-251-136/+136
* Move responsive ui into its own folder for easier mergesDan Finlay2017-07-211-0/+591
* Make folder for responsive UIDan Finlay2017-07-041-591/+0
* Merge branch 'master' into i1720-NoSpinnerOnConfigKevin Serrano2017-07-041-16/+31
|\
| * Indicate which network is being searched forDan Finlay2017-07-041-1/+22
| * Add menu carrat next to network searching indicatorDan Finlay2017-07-041-15/+9
* | No longer show network spinner on config screenDan Finlay2017-07-041-1/+1
|/
* Create add token button and template viewDan Finlay2017-06-151-0/+5
* Hide message on normal loadingDan Finlay2017-06-151-1/+3
* Multiple loading style improvementsDan Finlay2017-06-151-7/+12
* Modify FAQ to be more visible.Kevin Serrano2017-06-091-1/+1
* Remove all traces of testnetThomas Huang2017-05-161-1/+1
* Change default network to rinkebyThomas Huang2017-05-161-2/+2
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 19:14:58 +0800