aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages
Commit message (Expand)AuthorAgeFilesLines
* Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-172-2/+2
* ui - unlock - remove setNetworkEndpoints calls from new unlock screenkumavis2018-05-172-3/+0
* ui - remove files accidently added by bad mergekumavis2018-05-171-189/+0
* Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-174-0/+267
|\
| * Add TextField component to storybookAlexander Tseung2018-05-122-2/+1
| * Add new unlock screen designAlexander Tseung2018-05-125-194/+268
* | lint - cleanup some unused variableskumavis2018-05-032-2/+0
* | network - remove setNetworkEndpointskumavis2018-05-012-5/+0
|/
* Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-012-0/+4
* Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-012-147/+116
|\
| * Redirect to correct seed phrase screenAlexander Tseung2018-04-271-2/+2
| * Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-231-1/+9
| |\
| * | Use new design for reveal seed screen. Persist seed words only in first time ...Alexander Tseung2018-04-231-145/+114
* | | Convert decimals to string in getSymbolAndDecimals; return null for symbol or...Dan2018-04-281-1/+1
* | | Clean up network configAlexander Tseung2018-04-242-2/+2
| |/ |/|
* | Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
|/
* Fix confirmation popup not always openingAlexander Tseung2018-04-171-2/+3
* Require loglevel singleton in each module that uses itbitpshr2018-04-142-0/+2
* Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-061-1/+2
* Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-061-0/+1
* Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-041-9/+12
* Fix transaction confirmationsAlexander Tseung2018-04-041-14/+16
* Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-031-15/+14
* Fix lint errorsAlexander Tseung2018-04-033-4/+0
* Refactor onboarding flowAlexander Tseung2018-04-024-15/+15
* Fix merge conflictsAlexander Tseung2018-03-318-94/+135
* Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-315-358/+434
* Fix i18n merge conflictsAlexander Tseung2018-03-308-115/+153
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-299-17/+36
* Fix merge conflictsAlexander Tseung2018-03-278-286/+360
* Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-092-4/+15
* Fix merge conflicts from uat-nextAlexander Tseung2018-02-014-14/+20
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-0111-112/+284
* Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-305-65/+85
* Add route for signature requestAlexander Tseung2017-12-151-0/+321
* Add initialized checks for first time flow routesAlexander Tseung2017-12-154-71/+48
* Add routes for mascaraAlexander Tseung2017-12-155-25/+78
* Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-1513-0/+1897