Skip to content

Commit

Permalink
Merge branch 'master' into occ-groups-list-single-group
Browse files Browse the repository at this point in the history
  • Loading branch information
Keeper-of-the-Keys authored Nov 2, 2024
2 parents aebf076 + 2c75182 commit 8ef7a7d
Show file tree
Hide file tree
Showing 180 changed files with 840 additions and 287 deletions.
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/apps/contactsinteraction/appinfo/info.xml @kesselb @SebastianKrupinski
/apps/contactsinteraction/lib @kesselb @SebastianKrupinski
/apps/contactsinteraction/tests @kesselb @SebastianKrupinski
/apps/dashboard/appinfo/info.xml @julien-nc @juliushaertl
/apps/dashboard/appinfo/info.xml @julien-nc @juliusknorr
/apps/dav/lib/CalDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/lib/CardDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/tests/unit/CalDAV @miaulalala @st3iny @SebastianKrupinski
Expand All @@ -24,14 +24,14 @@
/apps/settings/appinfo/info.xml @Pytal @JuliaKirschenheuter
/apps/sharebymail/appinfo/info.xml @Altahrim
/apps/systemtags/appinfo/info.xml @Antreesy @marcelklehr
/apps/theming/appinfo/info.xml @skjnldsv @juliushaertl
/apps/theming/appinfo/info.xml @skjnldsv @juliusknorr
/apps/twofactor_backupcodes/appinfo/info.xml @st3iny @miaulalala @ChristophWurst
/apps/updatenotification/appinfo/info.xml @Pytal @JuliaKirschenheuter
/apps/user_ldap/appinfo/info.xml @come-nc @blizzz
/apps/user_status/appinfo/info.xml @Antreesy @nickvergessen
/apps/weather_status/appinfo/info.xml @julien-nc @juliushaertl
/apps/weather_status/appinfo/info.xml @julien-nc @juliusknorr
/apps/webhook_listeners/appinfo/info.xml @come-nc @julien-nc
/apps/workflowengine/appinfo/info.xml @blizzz @juliushaertl
/apps/workflowengine/appinfo/info.xml @blizzz @juliusknorr

# Frontend expertise
/apps/files/src* @skjnldsv
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty
Submodule 3rdparty updated 25 files
+1 −1 composer.json
+6 −6 composer.lock
+6 −6 composer/installed.json
+3 −3 composer/installed.php
+1 −1 giggsey/libphonenumber-for-php-lite/METADATA-VERSION.php
+4 −4 giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php
+4 −7 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CO.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DE.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MG.php
+4 −3 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MM.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NO.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PA.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PE.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SJ.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SN.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php
+1 −1 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php
+2 −2 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UZ.php
+5 −3 giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_WF.php
+6 −3 giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_NO.php
+12 −3 giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_SJ.php
+3 −2 giggsey/libphonenumber-for-php-lite/src/data/ShortNumberMetadata_UY.php
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ OC.L10N.register(
"Unable to update federated files sharing config" : "تعذر تحديث تهيئة مُشاركة الملفات عبر السحابة الموحدة",
"Federated Cloud" : "السحابة الموحدة",
"You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like [email protected]" : "يُمكنك المشاركة مع أي شخص يستخدم خادم نكست كلاود أو خوادم وخدمات أخرى متوافقة مع بروتوكول Open Cloud Mesh (OCM)! فقط ضع مُعرّف السحابة الموحدة Federated Cloud في مربع حوار المُشاركة؛ و الذي سيكون شكله على هذا النسق: [email protected]",
"Your Federated Cloud ID" : "مُعرِّف شبكتك الاتحادية",
"Share it so your friends can share files with you:" : "شاركه مع أصدقائك بحيث يمكنهم مُشاركة الملفات معك:",
"Facebook" : "فيسبوك",
"X (formerly Twitter)" : "منصة X (تويتر سابقاً)",
Expand All @@ -52,6 +53,7 @@ OC.L10N.register(
"Remote share" : "مُشاركة بعيدة remote",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "هل ترغب في إضافة مُشاركة بعيدة remote ـ {name} من {owner}@{remote}؟",
"Remote share password" : "كلمة مرور مشاركة بعيدة remote",
"Incoming share could not be processed" : "لا يمكن معالجة المشاركة الواردة",
"Sharing %1$s failed, because this item is already shared with user %2$s" : "مُشاركة %1$s فشلت؛ بسبب أن هذا العنصر سبقت مُشاركته مع المُستخدِم %2$s ",
"Not allowed to create a federated share with the same user" : "غيرُ مسموحٍ أن تُنشيء مُشاركةً السحابة الموحدة مع نفس المُستخدِم",
"Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing." : "ضبط كيف يتشارك الأشخاص عبر الخوادم. و هذا يشمل المشاركات بين المستخدمين على هذا الخادم و ما بين الخوادم عبر السحابة الموحدة كذلك.",
Expand Down
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"Unable to update federated files sharing config" : "تعذر تحديث تهيئة مُشاركة الملفات عبر السحابة الموحدة",
"Federated Cloud" : "السحابة الموحدة",
"You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like [email protected]" : "يُمكنك المشاركة مع أي شخص يستخدم خادم نكست كلاود أو خوادم وخدمات أخرى متوافقة مع بروتوكول Open Cloud Mesh (OCM)! فقط ضع مُعرّف السحابة الموحدة Federated Cloud في مربع حوار المُشاركة؛ و الذي سيكون شكله على هذا النسق: [email protected]",
"Your Federated Cloud ID" : "مُعرِّف شبكتك الاتحادية",
"Share it so your friends can share files with you:" : "شاركه مع أصدقائك بحيث يمكنهم مُشاركة الملفات معك:",
"Facebook" : "فيسبوك",
"X (formerly Twitter)" : "منصة X (تويتر سابقاً)",
Expand All @@ -50,6 +51,7 @@
"Remote share" : "مُشاركة بعيدة remote",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "هل ترغب في إضافة مُشاركة بعيدة remote ـ {name} من {owner}@{remote}؟",
"Remote share password" : "كلمة مرور مشاركة بعيدة remote",
"Incoming share could not be processed" : "لا يمكن معالجة المشاركة الواردة",
"Sharing %1$s failed, because this item is already shared with user %2$s" : "مُشاركة %1$s فشلت؛ بسبب أن هذا العنصر سبقت مُشاركته مع المُستخدِم %2$s ",
"Not allowed to create a federated share with the same user" : "غيرُ مسموحٍ أن تُنشيء مُشاركةً السحابة الموحدة مع نفس المُستخدِم",
"Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing." : "ضبط كيف يتشارك الأشخاص عبر الخوادم. و هذا يشمل المشاركات بين المستخدمين على هذا الخادم و ما بين الخوادم عبر السحابة الموحدة كذلك.",
Expand Down
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/de.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"Unable to update federated files sharing config" : "Einstellungen zum Federated-Teilen konnten nicht aktualisiert werden",
"Federated Cloud" : "Federated Cloud",
"You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like [email protected]" : "Du kannst mit jedem teilen, der einen Nextcloud-Server oder andere Open Cloud Mesh (OCM) kompatible Server und Dienste verwendet! Gib einfach deren Federated-Cloud-ID in den Teilen-Dialog ein. Diese sieht wie folgt aus: [email protected]",
"Your Federated Cloud ID" : "Deine Federated-Cloud-ID",
"Share it so your friends can share files with you:" : "Teile es, so dass deine Freunde Dateien mit dir teilen können:",
"Facebook" : "Facebook",
"X (formerly Twitter)" : "X (früher Twitter)",
Expand All @@ -50,6 +51,7 @@
"Remote share" : "Externe Freigabe",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die externe Freigabe {name} von {owner}@{remote} hinzugefügt werden?",
"Remote share password" : "Passwort für die externe Freigabe",
"Incoming share could not be processed" : "Eingehende Freigabe konnte nicht verarbeitet werden",
"Sharing %1$s failed, because this item is already shared with user %2$s" : "Das Teilen von %1$s ist fehlgeschlagen, da dieses Objekt bereits mit Benutzer %2$s geteilt wird",
"Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",
"Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing." : "Legt fest, wie Personen zwischen Servern teilen können. Dies gilt auch für Freigaben zwischen Benutzern auf diesem Server, wenn sie die Federated-Sharing verwenden.",
Expand Down
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/de_DE.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"Unable to update federated files sharing config" : "Einstellungen zum Federated-Teilen konnten nicht aktualisiert werden",
"Federated Cloud" : "Federated Cloud",
"You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like [email protected]" : "Sie können mit jedem teilen, der einen Nextcloud-Server oder andere Open Cloud Mesh (OCM) kompatible Server und Dienste verwendet! Geben Sie einfach deren Federated-Cloud-ID in den Teilen-Dialog ein. Diese sieht wie folgt aus: [email protected]",
"Your Federated Cloud ID" : "Ihre Federated-Cloud-ID",
"Share it so your friends can share files with you:" : "Teilen Sie es, so dass Ihre Freunde Dateien mit Ihnen teilen können:",
"Facebook" : "Facebook",
"X (formerly Twitter)" : "X (früher Twitter)",
Expand All @@ -50,6 +51,7 @@
"Remote share" : "Externe Freigabe",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die externe Freigabe {name} von {owner}@{remote} hinzufügen?",
"Remote share password" : "Passwort für die externe Freigabe",
"Incoming share could not be processed" : "Eingehende Freigabe konnte nicht verarbeitet werden",
"Sharing %1$s failed, because this item is already shared with user %2$s" : "Freigabe von %1$s fehlgeschlagen, da dieses Element schon mit dem Benutzer %2$s geteilt wird.",
"Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",
"Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing." : "Legt fest, wie Personen zwischen Servern teilen können. Dies gilt auch für Freigaben zwischen Benutzern auf diesem Server, wenn sie die Federated-Sharing verwenden.",
Expand Down
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/en_GB.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ OC.L10N.register(
"Unable to update federated files sharing config" : "Unable to update federated files sharing config",
"Federated Cloud" : "Federated Cloud",
"You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like [email protected]" : "You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialogue. It looks like [email protected]",
"Your Federated Cloud ID" : "Your Federated Cloud ID",
"Share it so your friends can share files with you:" : "Share it so your friends can share files with you:",
"Facebook" : "Facebook",
"X (formerly Twitter)" : "X (formerly Twitter)",
Expand All @@ -52,6 +53,7 @@ OC.L10N.register(
"Remote share" : "Remote share",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Do you want to add the remote share {name} from {owner}@{remote}?",
"Remote share password" : "Remote share password",
"Incoming share could not be processed" : "Incoming share could not be processed",
"Sharing %1$s failed, because this item is already shared with user %2$s" : "Sharing %1$s failed, because this item is already shared with user %2$s",
"Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",
"Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing." : "Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing.",
Expand Down
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/en_GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"Unable to update federated files sharing config" : "Unable to update federated files sharing config",
"Federated Cloud" : "Federated Cloud",
"You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like [email protected]" : "You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialogue. It looks like [email protected]",
"Your Federated Cloud ID" : "Your Federated Cloud ID",
"Share it so your friends can share files with you:" : "Share it so your friends can share files with you:",
"Facebook" : "Facebook",
"X (formerly Twitter)" : "X (formerly Twitter)",
Expand All @@ -50,6 +51,7 @@
"Remote share" : "Remote share",
"Do you want to add the remote share {name} from {owner}@{remote}?" : "Do you want to add the remote share {name} from {owner}@{remote}?",
"Remote share password" : "Remote share password",
"Incoming share could not be processed" : "Incoming share could not be processed",
"Sharing %1$s failed, because this item is already shared with user %2$s" : "Sharing %1$s failed, because this item is already shared with user %2$s",
"Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",
"Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing." : "Adjust how people can share between servers. This includes shares between users on this server as well if they are using federated sharing.",
Expand Down
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/l10n/fr.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8ef7a7d

Please sign in to comment.