Merge branch 'develop' into feature/account-menu-react

2021-07-12 12:26:51 -03:00
parent 5ebdd4f13b e9cfe45b39
commit f84d789b16
39 changed files with 892 additions and 215 deletions
--- a/app/assets/javascripts/views/footer/footer-view.pug
+++ b/app/assets/javascripts/views/footer/footer-view.pug
@@ -18,6 +18,11 @@
          application='ctrl.application'
          ng-if='ctrl.showAccountMenu',
        )
+      .sk-app-bar-item(
+        ng-click='ctrl.clickPreferences()'
+        ng-if='ctrl.appState.enableUnfinishedFeatures'
+      )
+        .sk-label.title Preferences
      .sk-app-bar-item
        a.no-decoration.sk-label.title(
          href='https://standardnotes.com/help',