| Commit message (Expand) | Author | Age | Files | Lines |
* | fix mascara warnings | brunobar79 | 2018-07-03 | 3 | -7/+6 |
* | fix mascara/example/server.js warnings | brunobar79 | 2018-07-03 | 1 | -2/+2 |
* | eslint --fix . | brunobar79 | 2018-07-03 | 10 | -78/+79 |
* | notices - replace getLatestNotice with getNextNotice | kumavis | 2018-06-14 | 1 | -7/+7 |
* | Reduce height of notice container in onboarding (#4435) | Alexander Tseung | 2018-06-05 | 1 | -8/+9 |
* | Fix text field labels of first time flow. Add text fields to storybook (#4389) | Alexander Tseung | 2018-05-29 | 2 | -0/+4 |
* | Add error message when passwords don't match in first time flow. Change input... | Alexander Tseung | 2018-05-14 | 3 | -167/+145 |
* | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 2 | -15/+42 |
* | Handle Promise rejections when importing accounts (#4142) | Paul Bouchon | 2018-05-01 | 1 | -0/+4 |
* | Use new design for reveal seed screen. Persist seed words only in first time ... | Alexander Tseung | 2018-04-23 | 1 | -2/+12 |
* | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 2 | -66/+19 |
* | Fix UI getting stuck in Reveal Seed screen | Alexander Tseung | 2018-04-19 | 2 | -19/+66 |
* | Merge pull request #3894 from danjm/i3696-disablefirsttimeimportloading | kumavis | 2018-04-10 | 1 | -3/+4 |
|\ |
|
| * | Disable the first time flow import button while isLoading is true. | Dan | 2018-04-09 | 1 | -3/+4 |
* | | Fix integration tests | Alexander Tseung | 2018-04-05 | 1 | -3/+8 |
* | | Fix lint errors | Alexander Tseung | 2018-04-03 | 6 | -185/+19 |
* | | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 7 | -188/+343 |
* | | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 7 | -60/+53 |
|\| |
|
| * | clean - mascara - remove unused code | kumavis | 2018-03-30 | 1 | -2/+0 |
| * | mascara - server - serve bundles from dist | kumavis | 2018-03-30 | 2 | -13/+0 |
| * | mascara - fix proxy html script link | kumavis | 2018-03-29 | 1 | -1/+1 |
| * | mascara - use sw-controller and other cleanups | kumavis | 2018-03-29 | 4 | -38/+47 |
| * | mascara - server - server bundles before static assets + serve dist/mascara i... | kumavis | 2018-03-29 | 1 | -9/+8 |
| * | mascara - html - fix script locations | kumavis | 2018-03-29 | 2 | -4/+4 |
| * | mascara - move file locations to match extension structure | kumavis | 2018-03-29 | 3 | -6/+6 |
| * | remove unavailable goToBuyEtherView propType | gasolin | 2018-03-27 | 1 | -2/+0 |
* | | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 1 | -4/+1 |
* | | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 5 | -58/+111 |
* | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 13 | -199/+451 |
|\| |
|
| * | Fix tests. | Dan | 2018-03-27 | 1 | -1/+2 |
| * | Improve responsivensss of unique image screen. | Dan | 2018-03-24 | 1 | -0/+4 |
| * | Pop uses new ui onboarding when in beta. | Dan | 2018-03-23 | 2 | -7/+2 |
| * | Make entire gray container of 'reveal seed phrase' a clickable area. (#3596) | Dan J Miller | 2018-03-19 | 1 | -4/+6 |
| * | Update margins for consistency in first time flow (#3588) | Alexander Tseung | 2018-03-16 | 5 | -144/+206 |
| * | Merge branch 'master' into i3033-responsive-newui-onboarding | kumavis | 2018-03-14 | 1 | -23/+33 |
| |\ |
|
| | * | Update first time flow button fonts, and first-time-flow default font, to Rob... | Dan | 2018-03-08 | 1 | -0/+2 |
| | * | Change fonts in new-ui onboarding to Roboto, with weight 400. | Dan | 2018-03-08 | 1 | -23/+31 |
| * | | Left align create password. | Dan | 2018-03-13 | 2 | -10/+10 |
| * | | Styling fixes to welcome; hide network component on create password; shown we... | Dan | 2018-03-13 | 1 | -1/+1 |
| * | | Add welcome screen to new-ui browser first time flow. | Dan | 2018-03-09 | 2 | -9/+26 |
| * | | Make new-ui create password screen responsive. | Dan | 2018-03-08 | 2 | -1/+57 |
| |/ |
|
| * | Fix seed phrase validation clearing form (#3417) | Alexander Tseung | 2018-03-07 | 2 | -84/+123 |
| * | Padding of alpha warning aligns with app-bar | Dan | 2018-02-28 | 1 | -1/+1 |
| * | Move beta warning to app header. | Dan | 2018-02-28 | 1 | -1/+0 |
| * | NewUI first time flow warning message change. | Dan | 2018-02-28 | 1 | -1/+1 |
| * | Body width container in first time flow is consistent with app bar. | Dan | 2018-02-28 | 1 | -1/+6 |
| * | Render loading inside notice screen, and don't set isLoading from unMarkPassw... | Dan | 2018-02-21 | 2 | -31/+24 |
| * | Temporarily disable loading indicator. | Dan | 2018-02-21 | 1 | -3/+4 |
| * | Fix variable spelling error. | Dan | 2018-02-21 | 2 | -7/+8 |
| * | Fix Import Existing DEN in popup New UI first time flow. | Dan | 2018-02-20 | 2 | -7/+56 |
| * | Remove accessing PropTypes from main React package | Alexander Tseung | 2018-02-07 | 12 | -42/+60 |
* | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 3 | -29/+44 |
|\| |
|
| * | Change styling of Import Account with Seed Phrease (#3182) | Alexander Tseung | 2018-02-06 | 3 | -29/+44 |
* | | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 1 | -1/+1 |
* | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 4 | -13/+67 |
|\| |
|
| * | [NewUI] Build mascara with uglification and gzipping. (#2735) | Dan J Miller | 2018-01-12 | 2 | -1/+6 |
| * | Merge pull request #2848 from MetaMask/NewUI-flat | Alexander Tseung | 2018-01-04 | 1 | -1/+1 |
| |\ |
|
| | * | Fix mascara first time flow button colors | Alexander Tseung | 2017-12-30 | 1 | -3/+3 |
| * | | Merge pull request #2799 from MetaMask/NewUI-flat | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| |\| |
|
| * | | mascara:create-password - use less words in metamask explanation | frankiebee | 2017-11-07 | 1 | -1/+1 |
| * | | mascara - fix words and enviroment vars | frankiebee | 2017-11-03 | 1 | -8/+4 |
| * | | mascara:first-time - fix wording | frankiebee | 2017-11-01 | 1 | -2/+2 |
| * | | mascara:first-time - add alpha warning and a about metamask and mascot | frankiebee | 2017-11-01 | 2 | -47/+107 |
* | | | Add prop-types to package.json, redirect from create-password screen when isI... | Alexander Tseung | 2017-12-15 | 1 | -1/+20 |
* | | | Add initialized checks for first time flow routes | Alexander Tseung | 2017-12-15 | 1 | -4/+4 |
* | | | Add route for Mascara confirm seed | Alexander Tseung | 2017-12-15 | 2 | -117/+139 |
* | | | Add routes for mascara | Alexander Tseung | 2017-12-15 | 4 | -142/+173 |
| |/
|/| |
|
* | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-26 | 1 | -1/+1 |
|\ |
|
| * | Fix X-Frame-Options for mascara | tmashuang | 2017-10-25 | 1 | -1/+1 |
* | | Add BuyEtherWidget for future use in buy ether modal | Chi Kei Chan | 2017-10-25 | 1 | -0/+197 |
|/ |
|
* | Merge pull request #2422 from watilde/fixes-lint | Kevin Serrano | 2017-10-25 | 1 | -7/+8 |
|\ |
|
| * | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 1 | -7/+8 |
* | | Add error messages when importing an account | tmashuang | 2017-10-24 | 1 | -16/+22 |
* | | Add Import With Seed Phrase | Chi Kei Chan | 2017-10-21 | 4 | -4/+133 |
* | | Add mobile responsiveness | Chi Kei Chan | 2017-10-21 | 1 | -2/+73 |
* | | Remove import option | Chi Kei Chan | 2017-10-21 | 1 | -1/+3 |
* | | Fix import | Chi Kei Chan | 2017-10-21 | 1 | -21/+31 |
* | | Fix capitialization | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
* | | Add Integration Tests | Chi Kei Chan | 2017-10-21 | 1 | -5/+5 |
* | | ShapeShift Integration | Chi Kei Chan | 2017-10-21 | 3 | -86/+245 |
* | | Add ShapeShift UI | Chi Kei Chan | 2017-10-21 | 2 | -72/+257 |
* | | Fix merge conflict; separate onboarding buy screen | Chi Kei Chan | 2017-10-21 | 2 | -20/+20 |
* | | Move "Skip this step" to side panel | Jacky Chan | 2017-10-21 | 2 | -12/+17 |
* | | Disable CTA unless notice is scrolled to bottom | Jacky Chan | 2017-10-21 | 2 | -4/+29 |
* | | Fix Buy Ether flow | Jacky Chan | 2017-10-21 | 2 | -2/+5 |
* | | Shuffle tokens | Jacky Chan | 2017-10-21 | 2 | -22/+38 |
* | | Add Go to Coinbase; Show Buy Ether after signup | Jacky Chan | 2017-10-21 | 7 | -67/+104 |
* | | Hide Warning after changing import options | Jacky Chan | 2017-10-21 | 2 | -5/+10 |
* | | Implement Buy Ether Screen UI | Jacky Chan | 2017-10-21 | 3 | -8/+318 |
* | | Implement Import Account Screen | Jacky Chan | 2017-10-21 | 4 | -6/+311 |
* | | Add BackupPhraseScreen | Jacky Chan | 2017-10-21 | 4 | -7/+394 |
* | | Add NoticeScreen | Jacky Chan | 2017-10-21 | 3 | -7/+104 |
* | | Add UniqueImageScreen | Jacky Chan | 2017-10-21 | 7 | -43/+298 |
* | | Add Breadcrumbs | Jacky Chan | 2017-10-21 | 3 | -2/+47 |
* | | CreatePasswordScreen | Jacky Chan | 2017-10-21 | 3 | -3/+104 |
* | | Adding CreatePasswordScreen | Jacky Chan | 2017-10-21 | 3 | -1/+68 |
|/ |
|
* | mascara - set x-frame-options header to DENY | frankiebee | 2017-10-20 | 1 | -1/+1 |
* | mascara/background: use async await | frankiebee | 2017-10-05 | 1 | -20/+13 |
* | use log.debug | frankiebee | 2017-10-05 | 1 | -3/+3 |
* | mascara: linting and code clean up | frankiebee | 2017-10-05 | 5 | -58/+41 |
* | mascara:exampl/app - add a send tx button | frankiebee | 2017-10-05 | 2 | -8/+22 |
* | mascara: turn off background | frankiebee | 2017-09-20 | 1 | -2/+1 |
* | require metamascara | frankiebee | 2017-09-19 | 5 | -140/+22 |
* | test - mascara - move skip reload test flag | kumavis | 2017-09-16 | 1 | -0/+1 |
* | mascara - proxy - small cleanup | kumavis | 2017-09-16 | 1 | -2/+1 |
* | tests - integration - mascara - small cleanup and timeout adjustments | kumavis | 2017-09-16 | 1 | -4/+2 |
* | set time if platform is mascara | frankiebee | 2017-09-16 | 1 | -0/+1 |
* | remove testem files | frankiebee | 2017-09-16 | 2 | -34/+0 |
* | dont reload on initial download and wait before passing sw to ui | frankiebee | 2017-09-16 | 2 | -16/+26 |
* | tests - integration - get flat and mascara tests closer to compatible | kumavis | 2017-09-14 | 3 | -125/+3 |
* | tests - start migrating mascara tests to karma | kumavis | 2017-09-14 | 3 | -7/+20 |
* | mascara - fix iframe stream constructor | kumavis | 2017-09-02 | 2 | -4/+4 |
* | Merge pull request #1574 from MetaMask/internfix | Dan Finlay | 2017-06-13 | 1 | -1/+1 |
|\ |
|
| * | Modify wording to new accept. | Kevin Serrano | 2017-06-10 | 1 | -1/+1 |
| * | continue button changed to agree | Nihar | 2017-05-17 | 1 | -1/+1 |
* | | reload page if ui is not present | frankiebee | 2017-06-09 | 1 | -2/+6 |
* | | reload the page when switching networks | frankiebee | 2017-06-09 | 1 | -3/+2 |
* | | clean up code | frankiebee | 2017-06-09 | 1 | -5/+0 |
|/ |
|
* | mascara - fix deploy instructions | kumavis | 2017-05-16 | 1 | -1/+1 |
* | mascara - ui - fix scale on mobile | kumavis | 2017-05-16 | 1 | -1/+2 |
* | mascara - add deploy instructions | kumavis | 2017-05-16 | 1 | -2/+11 |
* | clean up code | frankiebee | 2017-04-29 | 3 | -5/+3 |
* | General cleanup and window reload if an update is found | frankiebee | 2017-04-28 | 4 | -12/+17 |
* | break out IndexDbController && Run the first time test on mascara | frankiebee | 2017-04-28 | 7 | -81/+43 |
* | Setup test enviroment for mascara | frankiebee | 2017-04-28 | 9 | -0/+231 |
* | Update README for mascara | frankiebee | 2017-04-27 | 1 | -11/+3 |
* | Clean up code | frankiebee | 2017-04-22 | 1 | -14/+13 |
* | Reduce wakeup time for firefox | frankiebee | 2017-04-21 | 1 | -1/+1 |
* | Fix for firefox | frankiebee | 2017-04-21 | 1 | -55/+39 |
* | fix syntax | frankiebee | 2017-04-07 | 1 | -1/+1 |
* | uncomment intervalDelay | frankiebee | 2017-04-07 | 1 | -1/+1 |
* | match intervals | frankiebee | 2017-04-07 | 1 | -1/+2 |
* | Fix wakeUps: | frankiebee | 2017-04-07 | 2 | -5/+5 |
* | remove unnecessary listner | frankiebee | 2017-04-07 | 1 | -6/+1 |
* | Ping service worker to keep it from going idle | frankiebee | 2017-04-07 | 2 | -2/+13 |
* | mascara - ready to deploy via docker | kumavis | 2017-04-06 | 1 | -4/+4 |
* | mascara - mascara lib - read mascara origin from env var | kumavis | 2017-04-06 | 1 | -17/+14 |
* | mascara - rename popup to ui | kumavis | 2017-04-05 | 2 | -3/+3 |
* | mascara - rename things + break out mascara asset server | kumavis | 2017-04-05 | 11 | -114/+135 |
* | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 2 | -1/+12 |
* | Remove out of date comments | frankiebee | 2017-04-04 | 1 | -9/+1 |
* | Fix first install flow | frankiebee | 2017-04-04 | 2 | -11/+4 |
* | Update todos on README | frankiebee | 2017-04-03 | 1 | -0/+4 |
* | Update MetaMascara README | frankiebee | 2017-04-03 | 1 | -11/+3 |
* | Rename mascara root directory | frankiebee | 2017-04-03 | 12 | -0/+605 |