aboutsummaryrefslogtreecommitdiffstats
path: root/mascara/src/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-093-29/+44
|\
| * Change styling of Import Account with Seed Phrease (#3182)Alexander Tseung2018-02-063-29/+44
* | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-011-1/+1
* | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-302-12/+61
|\|
| * Merge pull request #2848 from MetaMask/NewUI-flatAlexander Tseung2018-01-041-1/+1
| |\
| | * Fix mascara first time flow button colorsAlexander Tseung2017-12-301-3/+3
| * | Merge pull request #2799 from MetaMask/NewUI-flatAlexander Tseung2017-12-231-1/+1
| |\|
| * | mascara:create-password - use less words in metamask explanationfrankiebee2017-11-071-1/+1
| * | mascara - fix words and enviroment varsfrankiebee2017-11-031-8/+4
| * | mascara:first-time - fix wordingfrankiebee2017-11-011-2/+2
| * | mascara:first-time - add alpha warning and a about metamask and mascotfrankiebee2017-11-012-47/+107
* | | Add prop-types to package.json, redirect from create-password screen when isI...Alexander Tseung2017-12-151-1/+20
* | | Add initialized checks for first time flow routesAlexander Tseung2017-12-151-4/+4
* | | Add route for Mascara confirm seedAlexander Tseung2017-12-152-117/+139
* | | Add routes for mascaraAlexander Tseung2017-12-154-142/+173
| |/ |/|
* | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-1/+1
|/
* Add BuyEtherWidget for future use in buy ether modalChi Kei Chan2017-10-251-0/+197
* Add error messages when importing an accounttmashuang2017-10-241-16/+22
* Add Import With Seed PhraseChi Kei Chan2017-10-214-4/+133
* Add mobile responsivenessChi Kei Chan2017-10-211-2/+73
* Remove import optionChi Kei Chan2017-10-211-1/+3
* Fix importChi Kei Chan2017-10-211-21/+31
* Fix capitializationChi Kei Chan2017-10-211-1/+1
* Add Integration TestsChi Kei Chan2017-10-211-5/+5
* ShapeShift IntegrationChi Kei Chan2017-10-213-86/+245
* Add ShapeShift UIChi Kei Chan2017-10-212-72/+257
* Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-212-20/+20
* Move "Skip this step" to side panelJacky Chan2017-10-212-12/+17
* Disable CTA unless notice is scrolled to bottomJacky Chan2017-10-212-4/+29
* Fix Buy Ether flowJacky Chan2017-10-212-2/+5
* Shuffle tokensJacky Chan2017-10-212-22/+38
* Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-217-67/+104
* Hide Warning after changing import optionsJacky Chan2017-10-212-5/+10
* Implement Buy Ether Screen UIJacky Chan2017-10-213-8/+318
* Implement Import Account ScreenJacky Chan2017-10-214-6/+311
* Add BackupPhraseScreenJacky Chan2017-10-214-7/+394
* Add NoticeScreenJacky Chan2017-10-213-7/+104
* Add UniqueImageScreenJacky Chan2017-10-217-43/+298
* Add BreadcrumbsJacky Chan2017-10-213-2/+47
* CreatePasswordScreenJacky Chan2017-10-213-3/+104
* Adding CreatePasswordScreenJacky Chan2017-10-212-0/+67