Merge branch 'setttingssync' into shigusegubu-themes3

src/components/post_status_form/post_status_form.vue

@@ -9,9 +9,11 @@
       @dragover.prevent="fileDrag"
     >
       <div class="form-group">
-        <div class="visibility-notice notice-dismissible">
+        <div
+          v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
+          class="visibility-notice notice-dismissible"
+        >
           <i18n-t
-            v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
             keypath="post_status.account_not_locked_warning"
             tag="p"
             class=""

src/services/notification_utils/notification_utils.js

@@ -77,7 +77,6 @@ export const maybeShowNotification = (
   muteFilters,
   notification,
 ) => {
-  console.log('NOTIF', store, notificationVisibility, muteFilters, notification)
   const rootState = store.rootState || store.state
 
   if (notification.seen) return