Skip to content

Commit 7c96745

Browse files
authored
Merge branch 'nextcloud:master' into 2fa-stateless-provider-interface
2 parents f4643be + 8032ad8 commit 7c96745

179 files changed

Lines changed: 3084 additions & 1141 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.

.github/workflows/phpunit-32bits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ jobs:
5656
- name: PHPUnit
5757
uses: docker://ghcr.io/nextcloud/continuous-integration-php8.4-32bit:latest
5858
with:
59-
args: /bin/sh -c "composer run test -- --exclude-group PRIMARY-azure,PRIMARY-s3,PRIMARY-swift,Memcached,Redis,RoutingWeirdness"
59+
args: /bin/sh -c "composer run test -- --exclude-group PRIMARY-azure --exclude-group PRIMARY-s3 --exclude-group PRIMARY-swift --exclude-group Memcached --exclude-group Redis --exclude-group RoutingWeirdness"

apps/dav/composer/composer/autoload_classmap.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@
210210
'OCA\\DAV\\ConfigLexicon' => $baseDir . '/../lib/ConfigLexicon.php',
211211
'OCA\\DAV\\Connector\\LegacyDAVACL' => $baseDir . '/../lib/Connector/LegacyDAVACL.php',
212212
'OCA\\DAV\\Connector\\LegacyPublicAuth' => $baseDir . '/../lib/Connector/LegacyPublicAuth.php',
213+
'OCA\\DAV\\Connector\\Sabre\\AddExtraHeadersPlugin' => $baseDir . '/../lib/Connector/Sabre/AddExtraHeadersPlugin.php',
213214
'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => $baseDir . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
214215
'OCA\\DAV\\Connector\\Sabre\\AppleQuirksPlugin' => $baseDir . '/../lib/Connector/Sabre/AppleQuirksPlugin.php',
215216
'OCA\\DAV\\Connector\\Sabre\\Auth' => $baseDir . '/../lib/Connector/Sabre/Auth.php',

apps/dav/composer/composer/autoload_static.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ class ComposerStaticInitDAV
225225
'OCA\\DAV\\ConfigLexicon' => __DIR__ . '/..' . '/../lib/ConfigLexicon.php',
226226
'OCA\\DAV\\Connector\\LegacyDAVACL' => __DIR__ . '/..' . '/../lib/Connector/LegacyDAVACL.php',
227227
'OCA\\DAV\\Connector\\LegacyPublicAuth' => __DIR__ . '/..' . '/../lib/Connector/LegacyPublicAuth.php',
228+
'OCA\\DAV\\Connector\\Sabre\\AddExtraHeadersPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AddExtraHeadersPlugin.php',
228229
'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
229230
'OCA\\DAV\\Connector\\Sabre\\AppleQuirksPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AppleQuirksPlugin.php',
230231
'OCA\\DAV\\Connector\\Sabre\\Auth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Auth.php',

apps/dav/l10n/cs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ OC.L10N.register(
236236
"Failed to check file size: %1$s" : "Nepodařilo se zkontrolovat velikost souboru: %1$s",
237237
"Could not open file: %1$s (%2$d), file does seem to exist" : "Nebylo možné otevřít soubor: %1$s (%2$d) – zdá se, že soubor existuje",
238238
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Nebylo možné otevřít soubor: %1$s (%2$d) – zdá se, že soubor neexistuje",
239+
"Failed to get size for : %1$s" : "Nepodařilo se získat velikost pro: %1$s",
239240
"Encryption not ready: %1$s" : "Šifrování není připraveno: %1$s",
240241
"Failed to open file: %1$s" : "Nepodařilo se otevřít soubor: %1$s",
241242
"Failed to unlink: %1$s" : "Nepodařilo se zrušit propojení: %1$s",
@@ -252,6 +253,7 @@ OC.L10N.register(
252253
"Completed on %s" : "Dokončeno %s",
253254
"Due on %s by %s" : "Termín do %s od %s",
254255
"Due on %s" : "Termín do %s",
256+
"This is an example contact" : "Toto je kontakt pro ukázku",
255257
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Vítejte v Nextcloud Kalendáři!\n\nToto je událost pro ukázku – prozkoumejte flexibilitu plánování pomoc Nextcloud Kalendáře upravením čeho chcete!\n\nS Nextcloud Kalendářem je možné:\n- Jednoduše vytvářet, upravovat a spravovat události.\n- Vytvářet vícero kalendářů a sdílet je s kolegy, přáteli či rodinou.\n- Zjišťovat dostupnost a zobrazovat své doby nedostupnosti ostatním.\n- Hladce napojovat na aplikace a zřízení prostřednictvím CalDAV.\n- Přizpůsobit si svůj dojem z používání: plánovat opakující se události, upravovat notifikace a ostatní nastavení.",
256258
"Example event - open me!" : "Událost pro ukázku – otevřete ji!",
257259
"System Address Book" : "Systémový adresář kontaktů",

apps/dav/l10n/cs.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
"Failed to check file size: %1$s" : "Nepodařilo se zkontrolovat velikost souboru: %1$s",
235235
"Could not open file: %1$s (%2$d), file does seem to exist" : "Nebylo možné otevřít soubor: %1$s (%2$d) – zdá se, že soubor existuje",
236236
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Nebylo možné otevřít soubor: %1$s (%2$d) – zdá se, že soubor neexistuje",
237+
"Failed to get size for : %1$s" : "Nepodařilo se získat velikost pro: %1$s",
237238
"Encryption not ready: %1$s" : "Šifrování není připraveno: %1$s",
238239
"Failed to open file: %1$s" : "Nepodařilo se otevřít soubor: %1$s",
239240
"Failed to unlink: %1$s" : "Nepodařilo se zrušit propojení: %1$s",
@@ -250,6 +251,7 @@
250251
"Completed on %s" : "Dokončeno %s",
251252
"Due on %s by %s" : "Termín do %s od %s",
252253
"Due on %s" : "Termín do %s",
254+
"This is an example contact" : "Toto je kontakt pro ukázku",
253255
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Vítejte v Nextcloud Kalendáři!\n\nToto je událost pro ukázku – prozkoumejte flexibilitu plánování pomoc Nextcloud Kalendáře upravením čeho chcete!\n\nS Nextcloud Kalendářem je možné:\n- Jednoduše vytvářet, upravovat a spravovat události.\n- Vytvářet vícero kalendářů a sdílet je s kolegy, přáteli či rodinou.\n- Zjišťovat dostupnost a zobrazovat své doby nedostupnosti ostatním.\n- Hladce napojovat na aplikace a zřízení prostřednictvím CalDAV.\n- Přizpůsobit si svůj dojem z používání: plánovat opakující se události, upravovat notifikace a ostatní nastavení.",
254256
"Example event - open me!" : "Událost pro ukázku – otevřete ji!",
255257
"System Address Book" : "Systémový adresář kontaktů",

apps/dav/l10n/fr.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ OC.L10N.register(
236236
"Failed to check file size: %1$s" : "Impossible de vérifier la taille du fichier : %1$s",
237237
"Could not open file: %1$s (%2$d), file does seem to exist" : "Impossible d'ouvrir le fichier : %1$s (%2$d), le fichier semble exister",
238238
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Impossible d'ouvrir le fichier : %1$s (%2$d), le fichier ne semble pas exister",
239+
"Failed to get size for : %1$s" : "Impossible d'obtenir la taille pour : %1$s",
239240
"Encryption not ready: %1$s" : "Chiffrement pas prêt : %1$s",
240241
"Failed to open file: %1$s" : "Impossible d'ouvrir le fichier : %1$s",
241242
"Failed to unlink: %1$s" : "Impossible de supprimer le lien :%1$s",
@@ -252,6 +253,7 @@ OC.L10N.register(
252253
"Completed on %s" : "Terminé le %s",
253254
"Due on %s by %s" : "Echéance le %s pour %s",
254255
"Due on %s" : "Echéance le %s",
256+
"This is an example contact" : "Ceci est un contact pour l'exemple",
255257
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Bienvenue dans Nextcloud Calendar !\n\nCeci est un exemple d'événement. Découvrez la flexibilité de la planification avec Nextcloud Calendar en effectuant toutes les modifications que vous souhaitez !\n\nAvec Nextcloud Calendar, vous pouvez :\n- Créer, modifier et gérer des événements sans effort.\n- Créer plusieurs calendriers et les partager avec vos collègues, vos amis ou votre famille.\n- Vérifier vos disponibilités et afficher vos périodes d'indisponibilité à d'autres personnes.\n- Intégrer de manière transparente des applications et des appareils via CalDAV.\n- Personnaliser votre expérience : planifier des événements récurrents, ajuster les notifications et d'autres paramètres.",
256258
"Example event - open me!" : "Exemple d'événement - ouvrez-moi !",
257259
"System Address Book" : "Carnet d'adresses du système",

apps/dav/l10n/fr.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
"Failed to check file size: %1$s" : "Impossible de vérifier la taille du fichier : %1$s",
235235
"Could not open file: %1$s (%2$d), file does seem to exist" : "Impossible d'ouvrir le fichier : %1$s (%2$d), le fichier semble exister",
236236
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Impossible d'ouvrir le fichier : %1$s (%2$d), le fichier ne semble pas exister",
237+
"Failed to get size for : %1$s" : "Impossible d'obtenir la taille pour : %1$s",
237238
"Encryption not ready: %1$s" : "Chiffrement pas prêt : %1$s",
238239
"Failed to open file: %1$s" : "Impossible d'ouvrir le fichier : %1$s",
239240
"Failed to unlink: %1$s" : "Impossible de supprimer le lien :%1$s",
@@ -250,6 +251,7 @@
250251
"Completed on %s" : "Terminé le %s",
251252
"Due on %s by %s" : "Echéance le %s pour %s",
252253
"Due on %s" : "Echéance le %s",
254+
"This is an example contact" : "Ceci est un contact pour l'exemple",
253255
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Bienvenue dans Nextcloud Calendar !\n\nCeci est un exemple d'événement. Découvrez la flexibilité de la planification avec Nextcloud Calendar en effectuant toutes les modifications que vous souhaitez !\n\nAvec Nextcloud Calendar, vous pouvez :\n- Créer, modifier et gérer des événements sans effort.\n- Créer plusieurs calendriers et les partager avec vos collègues, vos amis ou votre famille.\n- Vérifier vos disponibilités et afficher vos périodes d'indisponibilité à d'autres personnes.\n- Intégrer de manière transparente des applications et des appareils via CalDAV.\n- Personnaliser votre expérience : planifier des événements récurrents, ajuster les notifications et d'autres paramètres.",
254256
"Example event - open me!" : "Exemple d'événement - ouvrez-moi !",
255257
"System Address Book" : "Carnet d'adresses du système",

apps/dav/l10n/hr.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ OC.L10N.register(
236236
"Failed to check file size: %1$s" : "Neuspjela provjera veličine datoteke: %1$s",
237237
"Could not open file: %1$s (%2$d), file does seem to exist" : "Nije moguće otvoriti datoteku: %1$s (%2$d), čini se da datoteka postoji",
238238
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Nije moguće otvoriti datoteku: %1$s (%2$d), čini se da datoteka ne postoji",
239+
"Failed to get size for : %1$s" : "Neuspjelo dohvaćanje veličine: %1$s",
239240
"Encryption not ready: %1$s" : "Šifriranje nije spremno: %1$s",
240241
"Failed to open file: %1$s" : "Neuspjelo otvaranje datoteke: %1$s",
241242
"Failed to unlink: %1$s" : "Neuspjelo uklanjanje veze: %1$s",
@@ -252,6 +253,7 @@ OC.L10N.register(
252253
"Completed on %s" : "Završeno na %s",
253254
"Due on %s by %s" : "%s treba završiti do %s",
254255
"Due on %s" : "Treba završiti do %s",
256+
"This is an example contact" : "Ovo je primjer kontakta",
255257
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Dobrodošli u Nextcloud Kalendar!\n\nOvo je primjer događaja – istražite fleksibilnost planiranja s Nextcloud Kalendarom tako da napravite bilo kakve izmjene koje želite!\n\nUz Nextcloud Kalendar možete:\n- Jednostavno stvarati, uređivati i upravljati događajima..\n- Stvarati više kalendara i dijeliti ih s kolegama, prijateljima ili obitelji.\n- Provjeravati dostupnost i drugima prikazivati svoja zauzeta razdoblja.\n- Neprimjetno se integrirati s aplikacijama i uređajima putem CalDAV-a.\n- Prilagoditi svoje iskustvo: zakazivati ponavljajuće događaje, prilagođavati obavijesti i druge postavke.",
256258
"Example event - open me!" : "Primjer događaja – otvori me!",
257259
"System Address Book" : "Adresar sustava",

apps/dav/l10n/hr.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
"Failed to check file size: %1$s" : "Neuspjela provjera veličine datoteke: %1$s",
235235
"Could not open file: %1$s (%2$d), file does seem to exist" : "Nije moguće otvoriti datoteku: %1$s (%2$d), čini se da datoteka postoji",
236236
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Nije moguće otvoriti datoteku: %1$s (%2$d), čini se da datoteka ne postoji",
237+
"Failed to get size for : %1$s" : "Neuspjelo dohvaćanje veličine: %1$s",
237238
"Encryption not ready: %1$s" : "Šifriranje nije spremno: %1$s",
238239
"Failed to open file: %1$s" : "Neuspjelo otvaranje datoteke: %1$s",
239240
"Failed to unlink: %1$s" : "Neuspjelo uklanjanje veze: %1$s",
@@ -250,6 +251,7 @@
250251
"Completed on %s" : "Završeno na %s",
251252
"Due on %s by %s" : "%s treba završiti do %s",
252253
"Due on %s" : "Treba završiti do %s",
254+
"This is an example contact" : "Ovo je primjer kontakta",
253255
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Dobrodošli u Nextcloud Kalendar!\n\nOvo je primjer događaja – istražite fleksibilnost planiranja s Nextcloud Kalendarom tako da napravite bilo kakve izmjene koje želite!\n\nUz Nextcloud Kalendar možete:\n- Jednostavno stvarati, uređivati i upravljati događajima..\n- Stvarati više kalendara i dijeliti ih s kolegama, prijateljima ili obitelji.\n- Provjeravati dostupnost i drugima prikazivati svoja zauzeta razdoblja.\n- Neprimjetno se integrirati s aplikacijama i uređajima putem CalDAV-a.\n- Prilagoditi svoje iskustvo: zakazivati ponavljajuće događaje, prilagođavati obavijesti i druge postavke.",
254256
"Example event - open me!" : "Primjer događaja – otvori me!",
255257
"System Address Book" : "Adresar sustava",

apps/dav/l10n/zh_CN.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ OC.L10N.register(
236236
"Failed to check file size: %1$s" : "检查文件大小失败:%1$s",
237237
"Could not open file: %1$s (%2$d), file does seem to exist" : "无法打开文件:%1$s(%2$d),文件似乎不存在",
238238
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "无法打开文件:%1$s(%2$d),文件似乎不存在",
239+
"Failed to get size for : %1$s" : "无法获取以下项目的大小:%1$s",
239240
"Encryption not ready: %1$s" : "加密不可用:%1$s",
240241
"Failed to open file: %1$s" : "打开文件失败:%1$s",
241242
"Failed to unlink: %1$s" : "解除链接失败:%1$s",
@@ -252,6 +253,7 @@ OC.L10N.register(
252253
"Completed on %s" : "已完成 %s",
253254
"Due on %s by %s" : "到期于 %s,在 %s 之前",
254255
"Due on %s" : "到期于 %s",
256+
"This is an example contact" : "这是一个示例联系人",
255257
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "欢迎使用 Nextcloud 日历!\n\n这是一个示例事件——探索使用 Nextcloud 日历进行规划的灵活性,进行任何您想要的编辑!\n\n使用 Nextcloud 日历,您可以:\n- 轻松创建、编辑和管理事件。\n- 创建多个日历并与队友、朋友或家人共享。\n- 查看空闲时间并向他人显示您的忙碌时间。\n- 通过 CalDAV 与应用和设备无缝集成。\n- 自定义您的体验:安排重复事件、调整通知和其他设置。",
256258
"Example event - open me!" : "示例事件——打开我!",
257259
"System Address Book" : "系统通讯录",

0 commit comments

Comments
 (0)