Skip to content

Commit ab4fc5e

Browse files
emoral435nextcloud-command
emoral435
authored and
nextcloud-command
committed
Merge branch 'master' into fix/mtime-render
Signed-off-by: nextcloud-command <[email protected]>
2 parents 5318d71 + 743066a commit ab4fc5e

763 files changed

Lines changed: 14345 additions & 9724 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/dav/appinfo/routes.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*
55
* @author Georg Ehrke <[email protected]>
66
* @author Roeland Jago Douma <[email protected]>
7+
* @author Richard Steinmetz <[email protected]>
78
*
89
* @license GNU AGPL version 3 or any later version
910
*
@@ -28,9 +29,12 @@
2829
['name' => 'invitation_response#accept', 'url' => '/invitation/accept/{token}', 'verb' => 'GET'],
2930
['name' => 'invitation_response#decline', 'url' => '/invitation/decline/{token}', 'verb' => 'GET'],
3031
['name' => 'invitation_response#options', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'GET'],
31-
['name' => 'invitation_response#processMoreOptionsResult', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'POST']
32+
['name' => 'invitation_response#processMoreOptionsResult', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'POST'],
33+
['name' => 'availability_settings#updateAbsence', 'url' => '/settings/absence', 'verb' => 'POST'],
34+
['name' => 'availability_settings#clearAbsence', 'url' => '/settings/absence', 'verb' => 'DELETE'],
3235
],
3336
'ocs' => [
3437
['name' => 'direct#getUrl', 'url' => '/api/v1/direct', 'verb' => 'POST'],
38+
['name' => 'out_of_office#getCurrentOutOfOfficeData', 'url' => '/api/v1/outOfOffice/{userId}', 'verb' => 'GET'],
3539
],
3640
];

‎apps/dav/composer/composer/autoload_classmap.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'OCA\\DAV\\CalDAV\\CalendarProvider' => $baseDir . '/../lib/CalDAV/CalendarProvider.php',
5656
'OCA\\DAV\\CalDAV\\CalendarRoot' => $baseDir . '/../lib/CalDAV/CalendarRoot.php',
5757
'OCA\\DAV\\CalDAV\\EventComparisonService' => $baseDir . '/../lib/CalDAV/EventComparisonService.php',
58+
'OCA\\DAV\\CalDAV\\FreeBusy\\FreeBusyGenerator' => $baseDir . '/../lib/CalDAV/FreeBusy/FreeBusyGenerator.php',
5859
'OCA\\DAV\\CalDAV\\ICSExportPlugin\\ICSExportPlugin' => $baseDir . '/../lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php',
5960
'OCA\\DAV\\CalDAV\\IRestorable' => $baseDir . '/../lib/CalDAV/IRestorable.php',
6061
'OCA\\DAV\\CalDAV\\Integration\\ExternalCalendar' => $baseDir . '/../lib/CalDAV/Integration/ExternalCalendar.php',
@@ -97,6 +98,8 @@
9798
'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
9899
'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
99100
'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => $baseDir . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
101+
'OCA\\DAV\\CalDAV\\Status\\Status' => $baseDir . '/../lib/CalDAV/Status/Status.php',
102+
'OCA\\DAV\\CalDAV\\Status\\StatusService' => $baseDir . '/../lib/CalDAV/Status/StatusService.php',
100103
'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObject' => $baseDir . '/../lib/CalDAV/Trashbin/DeletedCalendarObject.php',
101104
'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObjectsCollection' => $baseDir . '/../lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php',
102105
'OCA\\DAV\\CalDAV\\Trashbin\\Plugin' => $baseDir . '/../lib/CalDAV/Trashbin/Plugin.php',
@@ -188,9 +191,11 @@
188191
'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => $baseDir . '/../lib/Connector/Sabre/SharesPlugin.php',
189192
'OCA\\DAV\\Connector\\Sabre\\TagList' => $baseDir . '/../lib/Connector/Sabre/TagList.php',
190193
'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => $baseDir . '/../lib/Connector/Sabre/TagsPlugin.php',
194+
'OCA\\DAV\\Controller\\AvailabilitySettingsController' => $baseDir . '/../lib/Controller/AvailabilitySettingsController.php',
191195
'OCA\\DAV\\Controller\\BirthdayCalendarController' => $baseDir . '/../lib/Controller/BirthdayCalendarController.php',
192196
'OCA\\DAV\\Controller\\DirectController' => $baseDir . '/../lib/Controller/DirectController.php',
193197
'OCA\\DAV\\Controller\\InvitationResponseController' => $baseDir . '/../lib/Controller/InvitationResponseController.php',
198+
'OCA\\DAV\\Controller\\OutOfOfficeController' => $baseDir . '/../lib/Controller/OutOfOfficeController.php',
194199
'OCA\\DAV\\DAV\\CustomPropertiesBackend' => $baseDir . '/../lib/DAV/CustomPropertiesBackend.php',
195200
'OCA\\DAV\\DAV\\GroupPrincipalBackend' => $baseDir . '/../lib/DAV/GroupPrincipalBackend.php',
196201
'OCA\\DAV\\DAV\\PublicAuth' => $baseDir . '/../lib/DAV/PublicAuth.php',
@@ -304,6 +309,7 @@
304309
'OCA\\DAV\\Profiler\\ProfilerPlugin' => $baseDir . '/../lib/Profiler/ProfilerPlugin.php',
305310
'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningNode' => $baseDir . '/../lib/Provisioning/Apple/AppleProvisioningNode.php',
306311
'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningPlugin' => $baseDir . '/../lib/Provisioning/Apple/AppleProvisioningPlugin.php',
312+
'OCA\\DAV\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
307313
'OCA\\DAV\\RootCollection' => $baseDir . '/../lib/RootCollection.php',
308314
'OCA\\DAV\\Search\\ACalendarSearchProvider' => $baseDir . '/../lib/Search/ACalendarSearchProvider.php',
309315
'OCA\\DAV\\Search\\ContactsSearchProvider' => $baseDir . '/../lib/Search/ContactsSearchProvider.php',

‎apps/dav/composer/composer/autoload_static.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class ComposerStaticInitDAV
7070
'OCA\\DAV\\CalDAV\\CalendarProvider' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarProvider.php',
7171
'OCA\\DAV\\CalDAV\\CalendarRoot' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarRoot.php',
7272
'OCA\\DAV\\CalDAV\\EventComparisonService' => __DIR__ . '/..' . '/../lib/CalDAV/EventComparisonService.php',
73+
'OCA\\DAV\\CalDAV\\FreeBusy\\FreeBusyGenerator' => __DIR__ . '/..' . '/../lib/CalDAV/FreeBusy/FreeBusyGenerator.php',
7374
'OCA\\DAV\\CalDAV\\ICSExportPlugin\\ICSExportPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php',
7475
'OCA\\DAV\\CalDAV\\IRestorable' => __DIR__ . '/..' . '/../lib/CalDAV/IRestorable.php',
7576
'OCA\\DAV\\CalDAV\\Integration\\ExternalCalendar' => __DIR__ . '/..' . '/../lib/CalDAV/Integration/ExternalCalendar.php',
@@ -112,6 +113,8 @@ class ComposerStaticInitDAV
112113
'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
113114
'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
114115
'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
116+
'OCA\\DAV\\CalDAV\\Status\\Status' => __DIR__ . '/..' . '/../lib/CalDAV/Status/Status.php',
117+
'OCA\\DAV\\CalDAV\\Status\\StatusService' => __DIR__ . '/..' . '/../lib/CalDAV/Status/StatusService.php',
115118
'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/Trashbin/DeletedCalendarObject.php',
116119
'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObjectsCollection' => __DIR__ . '/..' . '/../lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php',
117120
'OCA\\DAV\\CalDAV\\Trashbin\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/Trashbin/Plugin.php',
@@ -203,9 +206,11 @@ class ComposerStaticInitDAV
203206
'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/SharesPlugin.php',
204207
'OCA\\DAV\\Connector\\Sabre\\TagList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagList.php',
205208
'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagsPlugin.php',
209+
'OCA\\DAV\\Controller\\AvailabilitySettingsController' => __DIR__ . '/..' . '/../lib/Controller/AvailabilitySettingsController.php',
206210
'OCA\\DAV\\Controller\\BirthdayCalendarController' => __DIR__ . '/..' . '/../lib/Controller/BirthdayCalendarController.php',
207211
'OCA\\DAV\\Controller\\DirectController' => __DIR__ . '/..' . '/../lib/Controller/DirectController.php',
208212
'OCA\\DAV\\Controller\\InvitationResponseController' => __DIR__ . '/..' . '/../lib/Controller/InvitationResponseController.php',
213+
'OCA\\DAV\\Controller\\OutOfOfficeController' => __DIR__ . '/..' . '/../lib/Controller/OutOfOfficeController.php',
209214
'OCA\\DAV\\DAV\\CustomPropertiesBackend' => __DIR__ . '/..' . '/../lib/DAV/CustomPropertiesBackend.php',
210215
'OCA\\DAV\\DAV\\GroupPrincipalBackend' => __DIR__ . '/..' . '/../lib/DAV/GroupPrincipalBackend.php',
211216
'OCA\\DAV\\DAV\\PublicAuth' => __DIR__ . '/..' . '/../lib/DAV/PublicAuth.php',
@@ -319,6 +324,7 @@ class ComposerStaticInitDAV
319324
'OCA\\DAV\\Profiler\\ProfilerPlugin' => __DIR__ . '/..' . '/../lib/Profiler/ProfilerPlugin.php',
320325
'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningNode' => __DIR__ . '/..' . '/../lib/Provisioning/Apple/AppleProvisioningNode.php',
321326
'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningPlugin' => __DIR__ . '/..' . '/../lib/Provisioning/Apple/AppleProvisioningPlugin.php',
327+
'OCA\\DAV\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
322328
'OCA\\DAV\\RootCollection' => __DIR__ . '/..' . '/../lib/RootCollection.php',
323329
'OCA\\DAV\\Search\\ACalendarSearchProvider' => __DIR__ . '/..' . '/../lib/Search/ACalendarSearchProvider.php',
324330
'OCA\\DAV\\Search\\ContactsSearchProvider' => __DIR__ . '/..' . '/../lib/Search/ContactsSearchProvider.php',

‎apps/dav/l10n/ar.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,16 @@ OC.L10N.register(
148148
"Completed on %s" : "تمّ الانتهاء منه في %s",
149149
"Due on %s by %s" : "مطلوبٌ في %s من قِبَل%s",
150150
"Due on %s" : "مطلوبٌ في %s",
151-
"Checking for DAV system address book" : "فحص دفتر عناوين نظام DAV",
151+
"DAV system address book" : "دفتر عناوين نظام DAV",
152152
"No outstanding DAV system address book sync." : "لا توجد أي مزامنات معلقة لدفتر عناوني نظام DAV.",
153153
"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 لم تبدأ بعدٌ بسبب وجود أكثر من 1000 مستخدِم حالي للنظام أو بسبب حدوث خطأٍ آخر. رجاءً، قم بتشغيل المزامنة يدوياً و ذلك باستعمال الأمر السطري: \nocc dav:sync-system-addressbook",
154154
"Migrated calendar (%1$s)" : "تقويم مُرحّل (%1$s)",
155155
"Calendars including events, details and attendees" : "تحوي التقاويم الأحداث، و تفاصيلها، و الحُضُور",
156156
"Contacts and groups" : "جهات الاتصال والمجموعات",
157157
"WebDAV" : "WebDAV",
158158
"WebDAV endpoint" : "النقطة الحدّيّة endpoint لـ WebDAV",
159-
"Availability" : "أوقات التواجد availability",
160-
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه.",
159+
"First day" : "أوّل يومٍ",
160+
"Save" : "حفظ",
161161
"Time zone:" : "منطقة زمنية:",
162162
"to" : "إلى",
163163
"Delete slot" : "حذف فُرَضَةٍ slot زمنيّةٍ",
@@ -171,10 +171,11 @@ OC.L10N.register(
171171
"Saturday" : "السبت",
172172
"Sunday" : "الأحد",
173173
"Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "قم بتعيين حالة المستخدم تلقائيًا على \"عدم الإزعاج\" خارج نطاق أوقات التوافر لكتم جميع الإشعارات",
174-
"Save" : "حفظ",
175174
"Failed to load availability" : "إخفاق في تحميل أوقات التوافر",
176175
"Saved availability" : "تمّ حفظ أوقات التوافر",
177176
"Failed to save availability" : "إخفاق في حفظ أوقات التواجد",
177+
"Availability" : "أوقات التواجد availability",
178+
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه.",
178179
"Calendar server" : "خادوم التقويم",
179180
"Send invitations to attendees" : "إرسال دعوات للمُستهدفين بالحُضُُور",
180181
"Automatically generate a birthday calendar" : "تجاهل تقويم أعياد الميلاد تلقائيّاً",

‎apps/dav/l10n/ar.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,16 @@
146146
"Completed on %s" : "تمّ الانتهاء منه في %s",
147147
"Due on %s by %s" : "مطلوبٌ في %s من قِبَل%s",
148148
"Due on %s" : "مطلوبٌ في %s",
149-
"Checking for DAV system address book" : "فحص دفتر عناوين نظام DAV",
149+
"DAV system address book" : "دفتر عناوين نظام DAV",
150150
"No outstanding DAV system address book sync." : "لا توجد أي مزامنات معلقة لدفتر عناوني نظام DAV.",
151151
"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 لم تبدأ بعدٌ بسبب وجود أكثر من 1000 مستخدِم حالي للنظام أو بسبب حدوث خطأٍ آخر. رجاءً، قم بتشغيل المزامنة يدوياً و ذلك باستعمال الأمر السطري: \nocc dav:sync-system-addressbook",
152152
"Migrated calendar (%1$s)" : "تقويم مُرحّل (%1$s)",
153153
"Calendars including events, details and attendees" : "تحوي التقاويم الأحداث، و تفاصيلها، و الحُضُور",
154154
"Contacts and groups" : "جهات الاتصال والمجموعات",
155155
"WebDAV" : "WebDAV",
156156
"WebDAV endpoint" : "النقطة الحدّيّة endpoint لـ WebDAV",
157-
"Availability" : "أوقات التواجد availability",
158-
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه.",
157+
"First day" : "أوّل يومٍ",
158+
"Save" : "حفظ",
159159
"Time zone:" : "منطقة زمنية:",
160160
"to" : "إلى",
161161
"Delete slot" : "حذف فُرَضَةٍ slot زمنيّةٍ",
@@ -169,10 +169,11 @@
169169
"Saturday" : "السبت",
170170
"Sunday" : "الأحد",
171171
"Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "قم بتعيين حالة المستخدم تلقائيًا على \"عدم الإزعاج\" خارج نطاق أوقات التوافر لكتم جميع الإشعارات",
172-
"Save" : "حفظ",
173172
"Failed to load availability" : "إخفاق في تحميل أوقات التوافر",
174173
"Saved availability" : "تمّ حفظ أوقات التوافر",
175174
"Failed to save availability" : "إخفاق في حفظ أوقات التواجد",
175+
"Availability" : "أوقات التواجد availability",
176+
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه.",
176177
"Calendar server" : "خادوم التقويم",
177178
"Send invitations to attendees" : "إرسال دعوات للمُستهدفين بالحُضُُور",
178179
"Automatically generate a birthday calendar" : "تجاهل تقويم أعياد الميلاد تلقائيّاً",

‎apps/dav/l10n/bg.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ OC.L10N.register(
151151
"Contacts and groups" : "Контакти и групи",
152152
"WebDAV" : "WebDAV",
153153
"WebDAV endpoint" : "WebDAV крайна точка",
154-
"Availability" : "Наличност",
155-
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако конфигурирате работното си време, другите потребители ще виждат кога сте извън офиса, при резервиране на среща.",
154+
"First day" : "Първи ден",
155+
"Save" : "Запазване",
156156
"Time zone:" : "Часова зона",
157157
"to" : "до",
158158
"Delete slot" : "Изтриване на слот",
@@ -166,10 +166,11 @@ OC.L10N.register(
166166
"Saturday" : "Събота",
167167
"Sunday" : "Неделя",
168168
"Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Автоматично задаване на потребителският статус на „Не безпокойте“ извън достъпността, за заглушаване на всички известия.",
169-
"Save" : "Запазване",
170169
"Failed to load availability" : "Неуспешно зареждане на наличност",
171170
"Saved availability" : "Запазена наличност",
172171
"Failed to save availability" : "Неуспешно записване на наличност",
172+
"Availability" : "Наличност",
173+
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако конфигурирате работното си време, другите потребители ще виждат кога сте извън офиса, при резервиране на среща.",
173174
"Calendar server" : "Сървър на календар",
174175
"Send invitations to attendees" : "Изпращане на покани до участниците",
175176
"Automatically generate a birthday calendar" : "Автоматично генериране на календар с рождени дни.",

‎apps/dav/l10n/bg.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@
149149
"Contacts and groups" : "Контакти и групи",
150150
"WebDAV" : "WebDAV",
151151
"WebDAV endpoint" : "WebDAV крайна точка",
152-
"Availability" : "Наличност",
153-
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако конфигурирате работното си време, другите потребители ще виждат кога сте извън офиса, при резервиране на среща.",
152+
"First day" : "Първи ден",
153+
"Save" : "Запазване",
154154
"Time zone:" : "Часова зона",
155155
"to" : "до",
156156
"Delete slot" : "Изтриване на слот",
@@ -164,10 +164,11 @@
164164
"Saturday" : "Събота",
165165
"Sunday" : "Неделя",
166166
"Automatically set user status to \"Do not disturb\" outside of availability to mute all notifications." : "Автоматично задаване на потребителският статус на „Не безпокойте“ извън достъпността, за заглушаване на всички известия.",
167-
"Save" : "Запазване",
168167
"Failed to load availability" : "Неуспешно зареждане на наличност",
169168
"Saved availability" : "Запазена наличност",
170169
"Failed to save availability" : "Неуспешно записване на наличност",
170+
"Availability" : "Наличност",
171+
"If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако конфигурирате работното си време, другите потребители ще виждат кога сте извън офиса, при резервиране на среща.",
171172
"Calendar server" : "Сървър на календар",
172173
"Send invitations to attendees" : "Изпращане на покани до участниците",
173174
"Automatically generate a birthday calendar" : "Автоматично генериране на календар с рождени дни.",

0 commit comments

Comments
 (0)