Merge branch 'master' into feature/max-version

apps/dav/composer/composer/autoload_classmap.php

@@ -265,6 +265,7 @@
     'OCA\\DAV\\Listener\\CalendarShareUpdateListener' => $baseDir . '/../lib/Listener/CalendarShareUpdateListener.php',
     'OCA\\DAV\\Listener\\CardListener' => $baseDir . '/../lib/Listener/CardListener.php',
     'OCA\\DAV\\Listener\\ClearPhotoCacheListener' => $baseDir . '/../lib/Listener/ClearPhotoCacheListener.php',
+    'OCA\\DAV\\Listener\\OutOfOfficeListener' => $baseDir . '/../lib/Listener/OutOfOfficeListener.php',
     'OCA\\DAV\\Listener\\SubscriptionListener' => $baseDir . '/../lib/Listener/SubscriptionListener.php',
     'OCA\\DAV\\Listener\\TrustedServerRemovedListener' => $baseDir . '/../lib/Listener/TrustedServerRemovedListener.php',
     'OCA\\DAV\\Listener\\UserPreferenceListener' => $baseDir . '/../lib/Listener/UserPreferenceListener.php',
@@ -316,6 +317,7 @@
     'OCA\\DAV\\Search\\EventsSearchProvider' => $baseDir . '/../lib/Search/EventsSearchProvider.php',
     'OCA\\DAV\\Search\\TasksSearchProvider' => $baseDir . '/../lib/Search/TasksSearchProvider.php',
     'OCA\\DAV\\Server' => $baseDir . '/../lib/Server.php',
+    'OCA\\DAV\\ServerFactory' => $baseDir . '/../lib/ServerFactory.php',
     'OCA\\DAV\\Service\\AbsenceService' => $baseDir . '/../lib/Service/AbsenceService.php',
     'OCA\\DAV\\Settings\\AvailabilitySettings' => $baseDir . '/../lib/Settings/AvailabilitySettings.php',
     'OCA\\DAV\\Settings\\CalDAVSettings' => $baseDir . '/../lib/Settings/CalDAVSettings.php',

apps/dav/composer/composer/autoload_static.php

@@ -280,6 +280,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Listener\\CalendarShareUpdateListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarShareUpdateListener.php',
         'OCA\\DAV\\Listener\\CardListener' => __DIR__ . '/..' . '/../lib/Listener/CardListener.php',
         'OCA\\DAV\\Listener\\ClearPhotoCacheListener' => __DIR__ . '/..' . '/../lib/Listener/ClearPhotoCacheListener.php',
+        'OCA\\DAV\\Listener\\OutOfOfficeListener' => __DIR__ . '/..' . '/../lib/Listener/OutOfOfficeListener.php',
         'OCA\\DAV\\Listener\\SubscriptionListener' => __DIR__ . '/..' . '/../lib/Listener/SubscriptionListener.php',
         'OCA\\DAV\\Listener\\TrustedServerRemovedListener' => __DIR__ . '/..' . '/../lib/Listener/TrustedServerRemovedListener.php',
         'OCA\\DAV\\Listener\\UserPreferenceListener' => __DIR__ . '/..' . '/../lib/Listener/UserPreferenceListener.php',
@@ -331,6 +332,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Search\\EventsSearchProvider' => __DIR__ . '/..' . '/../lib/Search/EventsSearchProvider.php',
         'OCA\\DAV\\Search\\TasksSearchProvider' => __DIR__ . '/..' . '/../lib/Search/TasksSearchProvider.php',
         'OCA\\DAV\\Server' => __DIR__ . '/..' . '/../lib/Server.php',
+        'OCA\\DAV\\ServerFactory' => __DIR__ . '/..' . '/../lib/ServerFactory.php',
         'OCA\\DAV\\Service\\AbsenceService' => __DIR__ . '/..' . '/../lib/Service/AbsenceService.php',
         'OCA\\DAV\\Settings\\AvailabilitySettings' => __DIR__ . '/..' . '/../lib/Settings/AvailabilitySettings.php',
         'OCA\\DAV\\Settings\\CalDAVSettings' => __DIR__ . '/..' . '/../lib/Settings/CalDAVSettings.php',

apps/dav/l10n/de_DE.js

@@ -177,8 +177,8 @@ OC.L10N.register(
     "Friday" : "Freitag",
     "Saturday" : "Samstag",
     "Sunday" : "Sonntag",
-    "Pick a start time for {dayName}" : "Eine Startzeit für {name} wählen",
-    "Pick a end time for {dayName}" : "Eine Endezeit für {name} wählen",
+    "Pick a start time for {dayName}" : "Eine Startzeit für {dayName} wählen",
+    "Pick a end time for {dayName}" : "Eine Endezeit für {dayName} wählen",
     "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Setzen Sie den Benutzerstatus wenn Sie nicht erreichbar sind automatisch auf „Nicht stören“, um alle Benachrichtigungen stumm zu schalten.",
     "Failed to load availability" : "Laden der Verfügbarkeit fehlgeschlagen",
     "Saved availability" : "Verfügbarkeit gespeichert",

apps/dav/l10n/de_DE.json

@@ -175,8 +175,8 @@
     "Friday" : "Freitag",
     "Saturday" : "Samstag",
     "Sunday" : "Sonntag",
-    "Pick a start time for {dayName}" : "Eine Startzeit für {name} wählen",
-    "Pick a end time for {dayName}" : "Eine Endezeit für {name} wählen",
+    "Pick a start time for {dayName}" : "Eine Startzeit für {dayName} wählen",
+    "Pick a end time for {dayName}" : "Eine Endezeit für {dayName} wählen",
     "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Setzen Sie den Benutzerstatus wenn Sie nicht erreichbar sind automatisch auf „Nicht stören“, um alle Benachrichtigungen stumm zu schalten.",
     "Failed to load availability" : "Laden der Verfügbarkeit fehlgeschlagen",
     "Saved availability" : "Verfügbarkeit gespeichert",

apps/dav/l10n/ja.js

@@ -149,14 +149,22 @@ OC.L10N.register(
     "Completed on %s" : "%sに完了",
     "Due on %s by %s" : "期限日%s が%sにより設定",
     "Due on %s" : "期限日：%s",
+    "DAV system address book" : "DAVシステムアドレス帳",
     "No outstanding DAV system address book sync." : "DAVシステムアドレス帳の同期が完了していません。",
     "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling occ dav:sync-system-addressbook." : "あなたのインスタンスのユーザー数が1000人以上であるか、エラーが発生したため、DAVシステムアドレス帳の同期がまだ実行されていません。occ dav:sync-system-addressbook を呼び出して手動で実行してください。",
     "Migrated calendar (%1$s)" : "カレンダーを移行しました (%1$s)",
     "Calendars including events, details and attendees" : "カレンダーには、イベント、イベントの詳細及び出席者が含まれます",
     "Contacts and groups" : "連絡先とグループ",
     "WebDAV" : "WebDAV",
     "WebDAV endpoint" : "WebDAVエンドポイント",
+    "First day" : "初日",
+    "Last day (inclusive)" : "最終日（含む）",
+    "Short absence status" : "短い不在のステータス",
+    "Long absence Message" : "長期不在のメッセージ",
     "Save" : "保存",
+    "Disable absence" : "不在を無効にする",
+    "Failed to save your absence settings" : "不在設定の保存に失敗しました",
+    "Failed to clear your absence settings" : "不在設定の解除に失敗しました",
     "Time zone:" : "時間帯：",
     "to" : "宛先",
     "Delete slot" : "スロットを削除",
@@ -169,12 +177,16 @@ OC.L10N.register(
     "Friday" : "金曜日",
     "Saturday" : "土曜日",
     "Sunday" : "日曜日",
+    "Pick a start time for {dayName}" : "{dayName} 開始時間を指定してください",
+    "Pick a end time for {dayName}" : "{dayName} の終了時間を指定してください",
     "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "利用時間外は自動的にユーザーステータスを\"非通知\" に設定し、すべての通知をミュートします。",
     "Failed to load availability" : "可用性の読み込みに失敗",
     "Saved availability" : "可用性を保存しました",
     "Failed to save availability" : "可用性を保存しました",
     "Availability" : "応対可能日時",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "勤務時間を設定すると、他のユーザが会議を予約する際に、あなたがいつ不在であるかがわかります。",
+    "Absence" : "不在",
+    "Configure your next absence period." : "次の不在期間を設定します。",
     "Calendar server" : "カレンダーサーバー",
     "Send invitations to attendees" : "参加者に招待状を送信する",
     "Automatically generate a birthday calendar" : "自動的に誕生日カレンダーを生成する",

apps/dav/l10n/ja.json

@@ -147,14 +147,22 @@
     "Completed on %s" : "%sに完了",
     "Due on %s by %s" : "期限日%s が%sにより設定",
     "Due on %s" : "期限日：%s",
+    "DAV system address book" : "DAVシステムアドレス帳",
     "No outstanding DAV system address book sync." : "DAVシステムアドレス帳の同期が完了していません。",
     "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling occ dav:sync-system-addressbook." : "あなたのインスタンスのユーザー数が1000人以上であるか、エラーが発生したため、DAVシステムアドレス帳の同期がまだ実行されていません。occ dav:sync-system-addressbook を呼び出して手動で実行してください。",
     "Migrated calendar (%1$s)" : "カレンダーを移行しました (%1$s)",
     "Calendars including events, details and attendees" : "カレンダーには、イベント、イベントの詳細及び出席者が含まれます",
     "Contacts and groups" : "連絡先とグループ",
     "WebDAV" : "WebDAV",
     "WebDAV endpoint" : "WebDAVエンドポイント",
+    "First day" : "初日",
+    "Last day (inclusive)" : "最終日（含む）",
+    "Short absence status" : "短い不在のステータス",
+    "Long absence Message" : "長期不在のメッセージ",
     "Save" : "保存",
+    "Disable absence" : "不在を無効にする",
+    "Failed to save your absence settings" : "不在設定の保存に失敗しました",
+    "Failed to clear your absence settings" : "不在設定の解除に失敗しました",
     "Time zone:" : "時間帯：",
     "to" : "宛先",
     "Delete slot" : "スロットを削除",
@@ -167,12 +175,16 @@
     "Friday" : "金曜日",
     "Saturday" : "土曜日",
     "Sunday" : "日曜日",
+    "Pick a start time for {dayName}" : "{dayName} 開始時間を指定してください",
+    "Pick a end time for {dayName}" : "{dayName} の終了時間を指定してください",
     "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "利用時間外は自動的にユーザーステータスを\"非通知\" に設定し、すべての通知をミュートします。",
     "Failed to load availability" : "可用性の読み込みに失敗",
     "Saved availability" : "可用性を保存しました",
     "Failed to save availability" : "可用性を保存しました",
     "Availability" : "応対可能日時",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "勤務時間を設定すると、他のユーザが会議を予約する際に、あなたがいつ不在であるかがわかります。",
+    "Absence" : "不在",
+    "Configure your next absence period." : "次の不在期間を設定します。",
     "Calendar server" : "カレンダーサーバー",
     "Send invitations to attendees" : "参加者に招待状を送信する",
     "Automatically generate a birthday calendar" : "自動的に誕生日カレンダーを生成する",

apps/dav/l10n/sv.js

@@ -149,12 +149,22 @@ OC.L10N.register(
     "Completed on %s" : "Slutförd %s",
     "Due on %s by %s" : "Slutar den %s vid %s",
     "Due on %s" : "Slutar den %s",
+    "DAV system address book" : "DAV-systemets adressbok",
+    "No outstanding DAV system address book sync." : "Ingen utestående synkronisering för DAV-systemets adressbok.",
+    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling occ dav:sync-system-addressbook." : "DAV-systemets adressbokssynkronisering har inte körts ännu eftersom din instans har fler än 1000 användare eller för att ett fel uppstod. Kör det manuellt genom att anropa occ dav:sync-system-addressbook.",
     "Migrated calendar (%1$s)" : "Migrerade kalender (%1$s)",
     "Calendars including events, details and attendees" : "Kalendrar inklusive händelser, detaljer och deltagare",
     "Contacts and groups" : "Kontakter och grupper",
     "WebDAV" : "WebDAV",
     "WebDAV endpoint" : "WebDAV endpoint",
+    "First day" : "Första dagen",
+    "Last day (inclusive)" : "Sista dagen (inklusive)",
+    "Short absence status" : "Kort frånvarostatus",
+    "Long absence Message" : "Långt frånvaromeddelande",
     "Save" : "Spara",
+    "Disable absence" : "Inaktivera frånvaro",
+    "Failed to save your absence settings" : "Kunde inte spara dina frånvaroinställningar",
+    "Failed to clear your absence settings" : "Kunde inte rensa dina frånvaroinställningar",
     "Time zone:" : "Tidszon:",
     "to" : "till",
     "Delete slot" : "Radera lucka",
@@ -167,12 +177,16 @@ OC.L10N.register(
     "Friday" : "Fredag",
     "Saturday" : "Lördag",
     "Sunday" : "Söndag",
+    "Pick a start time for {dayName}" : "Välj en starttid för {dayName}",
+    "Pick a end time for {dayName}" : "Välj en sluttid för {dayName}",
     "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Sätt automatiskt användarstatus till \"Stör ej\" utanför tillgängliga tider för att tysta alla notifikationer.",
     "Failed to load availability" : "Misslyckades med att ladda tidsluckor",
     "Saved availability" : "Sparade tidslucka",
     "Failed to save availability" : "Misslyckades med att spara tidslucka",
     "Availability" : "Tillgänglighet",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Om du konfigurerar dina arbetstimmar kan andra användare se när du inte är på jobbet när de bokar ett möte.",
+    "Absence" : "Frånvaro",
+    "Configure your next absence period." : "Konfigurera din nästa frånvaroperiod.",
     "Calendar server" : "Kalenderserver",
     "Send invitations to attendees" : "Skicka inbjudan till deltagare",
     "Automatically generate a birthday calendar" : "Generera en födelsedagskalender automatiskt",

apps/dav/l10n/sv.json

@@ -147,12 +147,22 @@
     "Completed on %s" : "Slutförd %s",
     "Due on %s by %s" : "Slutar den %s vid %s",
     "Due on %s" : "Slutar den %s",
+    "DAV system address book" : "DAV-systemets adressbok",
+    "No outstanding DAV system address book sync." : "Ingen utestående synkronisering för DAV-systemets adressbok.",
+    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling occ dav:sync-system-addressbook." : "DAV-systemets adressbokssynkronisering har inte körts ännu eftersom din instans har fler än 1000 användare eller för att ett fel uppstod. Kör det manuellt genom att anropa occ dav:sync-system-addressbook.",
     "Migrated calendar (%1$s)" : "Migrerade kalender (%1$s)",
     "Calendars including events, details and attendees" : "Kalendrar inklusive händelser, detaljer och deltagare",
     "Contacts and groups" : "Kontakter och grupper",
     "WebDAV" : "WebDAV",
     "WebDAV endpoint" : "WebDAV endpoint",
+    "First day" : "Första dagen",
+    "Last day (inclusive)" : "Sista dagen (inklusive)",
+    "Short absence status" : "Kort frånvarostatus",
+    "Long absence Message" : "Långt frånvaromeddelande",
     "Save" : "Spara",
+    "Disable absence" : "Inaktivera frånvaro",
+    "Failed to save your absence settings" : "Kunde inte spara dina frånvaroinställningar",
+    "Failed to clear your absence settings" : "Kunde inte rensa dina frånvaroinställningar",
     "Time zone:" : "Tidszon:",
     "to" : "till",
     "Delete slot" : "Radera lucka",
@@ -165,12 +175,16 @@
     "Friday" : "Fredag",
     "Saturday" : "Lördag",
     "Sunday" : "Söndag",
+    "Pick a start time for {dayName}" : "Välj en starttid för {dayName}",
+    "Pick a end time for {dayName}" : "Välj en sluttid för {dayName}",
     "Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Sätt automatiskt användarstatus till \"Stör ej\" utanför tillgängliga tider för att tysta alla notifikationer.",
     "Failed to load availability" : "Misslyckades med att ladda tidsluckor",
     "Saved availability" : "Sparade tidslucka",
     "Failed to save availability" : "Misslyckades med att spara tidslucka",
     "Availability" : "Tillgänglighet",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Om du konfigurerar dina arbetstimmar kan andra användare se när du inte är på jobbet när de bokar ett möte.",
+    "Absence" : "Frånvaro",
+    "Configure your next absence period." : "Konfigurera din nästa frånvaroperiod.",
     "Calendar server" : "Kalenderserver",
     "Send invitations to attendees" : "Skicka inbjudan till deltagare",
     "Automatically generate a birthday calendar" : "Generera en födelsedagskalender automatiskt",