Merges master

2020-03-14 12:05:38 -05:00
parent 8fcfef08a6 be9287c70a
commit 2e0528b754
18 changed files with 1453 additions and 89822 deletions
--- a/app/assets/templates/directives/account-menu.pug
+++ b/app/assets/templates/directives/account-menu.pug
@@ -338,10 +338,7 @@
      .sk-panel-row
        .sk-p.left.neutral.faded {{self.state.appVersion}}
        a.sk-a.right(
-          ng-click=`
-            self.state.formData.showLogin = false; 
-            self.state.formData.showRegister = false;
-            `, 
+          ng-click='self.hidePasswordForm()',
          ng-if='self.state.formData.showLogin || self.state.formData.showRegister'
          )
          | Cancel