aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/settings
Commit message (Expand)AuthorAgeFilesLines
* lint - cleanup some unused variableskumavis2018-05-031-1/+0
* network - remove setNetworkEndpointskumavis2018-05-011-1/+0
* Clean up network configAlexander Tseung2018-04-241-1/+1
* Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
* Fix merge conflictsAlexander Tseung2018-03-312-39/+47
* Fix i18n merge conflictsAlexander Tseung2018-03-302-40/+84
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-292-9/+28
* Fix merge conflictsAlexander Tseung2018-03-271-28/+40
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-013-4/+3
* Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-301-4/+10
* Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-153-0/+450