Merge branch 'dev' into feature-permissions

diff --cc src-ui/src/app/components/manage/settings/settings.component.html
Simple merge

diff --cc src-ui/src/app/components/manage/settings/settings.component.ts
index 01f455b7343430352af2f42908bf8f0819070900,e1575a831662512cee60d1760cef90a9702468ab..ee26073f8cca9be87d5dbe11491ce34fc2ac6d59
--- 1/src-ui/src/app/components/manage/settings/settings.component.ts
--- 2/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@@ -92,9 -83,8 +92,10 @@@ export class SettingsComponen
      notificationsConsumerSuccess: new FormControl(null),
      notificationsConsumerFailed: new FormControl(null),
      notificationsConsumerSuppressOnDashboard: new FormControl(null),
 +    usersGroup: this.usersGroup,
 +    groupsGroup: this.groupsGroup,
  
+     savedViewsWarnOnUnsavedChange: new FormControl(null),
      savedViews: this.savedViewGroup,
  
      mailAccounts: this.mailAccountGroup,
@@@ -211,8 -195,9 +212,11 @@@
        notificationsConsumerSuppressOnDashboard: this.settings.get(
          SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD
        ),
+       savedViewsWarnOnUnsavedChange: this.settings.get(
+         SETTINGS_KEYS.SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE
+       ),
 +      usersGroup: {},
 +      groupsGroup: {},
        savedViews: {},
        mailAccounts: {},
        mailRules: {},

diff --cc src-ui/src/app/data/paperless-uisettings.ts
Simple merge

diff --cc src/paperless/settings.py
Simple merge