Skip to content

Commit

Permalink
Merge branch 'master' into exceptionsTranslateShare
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Sep 3, 2024
2 parents 9269da0 + b98b5bb commit dab8cb9
Show file tree
Hide file tree
Showing 360 changed files with 3,776 additions and 1,577 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

# Update to coding-standard 1.1.1
aa5f037af71c915424c6dcfd5ad2dc82797dc0d6
# Update to coding-standard 1.2.3
af6de04e9e141466dc229e444ff3f146f4a34765
0bd284cb81b6866338aaaa67aa1d81ef9bfbb2ab
8 changes: 4 additions & 4 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
run: ./node_modules/cypress/bin/cypress install

- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
uses: cypress-io/github-action@df7484c5ba85def7eef30db301afa688187bc378 # v6.7.2
uses: cypress-io/github-action@496e7dc0edc421a9de8a36a31c793340e00c61bf # v6.7.5
with:
# We already installed the dependencies in the init job
install: false
Expand All @@ -143,7 +143,7 @@ jobs:
SPLIT_INDEX: ${{ matrix.containers == 'component' && 0 || matrix.containers }}

- name: Upload snapshots
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
if: always()
with:
name: snapshots_${{ matrix.containers }}
Expand All @@ -154,7 +154,7 @@ jobs:
run: docker logs nextcloud-cypress-tests-${{ env.APP_NAME }} > nextcloud.log

- name: Upload NC logs
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
if: failure() && matrix.containers != 'component'
with:
name: nc_logs_${{ matrix.containers }}
Expand All @@ -165,7 +165,7 @@ jobs:
run: docker exec nextcloud-cypress-tests-server tar -cvjf - data > data.tar

- name: Upload data dir archive
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
if: failure() && matrix.containers != 'component'
with:
name: nc_data_${{ matrix.containers }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/files-external-smb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:

- name: Upload code coverage
if: ${{ !cancelled() && matrix.coverage }}
uses: codecov/codecov-action@922d8d7b314a529f2be903c1e79ee8283c492863 # v4.1.1
uses: codecov/codecov-action@4b21c320b5517fc6ffd4406a28e66325c721dc20 # v4.1.1
with:
files: ./clover.xml
flags: phpunit-files-external-smb
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/files-external-webdav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:

- name: Upload code coverage
if: ${{ !cancelled() && matrix.coverage }}
uses: codecov/codecov-action@922d8d7b314a529f2be903c1e79ee8283c492863 # v4.1.1
uses: codecov/codecov-action@4b21c320b5517fc6ffd4406a28e66325c721dc20 # v4.1.1
with:
files: ./clover.xml
flags: phpunit-files-external-webdav
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/node-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
run: npm run test:coverage --if-present

- name: Collect coverage
uses: codecov/codecov-action@922d8d7b314a529f2be903c1e79ee8283c492863 # v4.3.1
uses: codecov/codecov-action@4b21c320b5517fc6ffd4406a28e66325c721dc20 # v4.3.1
with:
files: ./coverage/lcov.info

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:

- name: Upload profiles
if: always()
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
with:
name: profiles
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpunit-mysql-sharding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
submodules: true

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b #v2.31.0
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
with:
php-version: ${{ matrix.php-versions }}
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:

- name: Upload db code coverage
if: ${{ !cancelled() && matrix.coverage }}
uses: codecov/codecov-action@v4.1.1
uses: codecov/codecov-action@v4.5.0
with:
files: ./clover.db.xml
flags: phpunit-mysql
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ OC.L10N.register(
"Failed to unlink: %1$s" : "تعذّر فك الارتباط: %1$s",
"Failed to write file contents: %1$s" : "إخفاق في كتابة محتويات الملف: %1$s",
"File not found: %1$s" : "ملف غير موجود: %1$s",
"Invalid target path" : "المسار الهدف غير صحيح",
"System is in maintenance mode." : "النظام في حالة صيانة.",
"Upgrade needed" : "يجب التحديث",
"Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "%s الخاص بك يجب تهيئته لاستخدام HTTPS حتى يمكن استعمال CalDAV و CardDAV في نظام التشغيل iOS/macOS. ",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
"Failed to unlink: %1$s" : "تعذّر فك الارتباط: %1$s",
"Failed to write file contents: %1$s" : "إخفاق في كتابة محتويات الملف: %1$s",
"File not found: %1$s" : "ملف غير موجود: %1$s",
"Invalid target path" : "المسار الهدف غير صحيح",
"System is in maintenance mode." : "النظام في حالة صيانة.",
"Upgrade needed" : "يجب التحديث",
"Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "%s الخاص بك يجب تهيئته لاستخدام HTTPS حتى يمكن استعمال CalDAV و CardDAV في نظام التشغيل iOS/macOS. ",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ OC.L10N.register(
"Failed to unlink: %1$s" : "Échec à la suppression :%1$s",
"Failed to write file contents: %1$s" : "Échec à l'écriture du contenu du fichier : %1$s",
"File not found: %1$s" : "Fichier non trouvé : %1$s",
"Invalid target path" : "Chemin d’accès invalide",
"System is in maintenance mode." : "Le système est en mode maintenance.",
"Upgrade needed" : "Mise à jour requise",
"Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Votre %s a besoin d'être configuré pour utiliser le HTTPS dans le but d'utiliser CalDAV et CardDAV avec iOS/macOS.",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
"Failed to unlink: %1$s" : "Échec à la suppression :%1$s",
"Failed to write file contents: %1$s" : "Échec à l'écriture du contenu du fichier : %1$s",
"File not found: %1$s" : "Fichier non trouvé : %1$s",
"Invalid target path" : "Chemin d’accès invalide",
"System is in maintenance mode." : "Le système est en mode maintenance.",
"Upgrade needed" : "Mise à jour requise",
"Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Votre %s a besoin d'être configuré pour utiliser le HTTPS dans le but d'utiliser CalDAV et CardDAV avec iOS/macOS.",
Expand Down
4 changes: 4 additions & 0 deletions apps/dav/l10n/uk.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ OC.L10N.register(
"Description: %s" : "Опис: %s",
"Where: %s" : "Місце: %s",
"%1$s via %2$s" : "%1$s через %2$s",
"Could not generate when statement" : "Неможливо створити твердження \"коли\"",
"Could not generate next recurrence statement" : "Неможливо створити твердження наступного повторення",
"Cancelled: %1$s" : "Скасовано: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" скасовано",
"Re: %1$s" : "Re: %1$s",
Expand Down Expand Up @@ -112,6 +114,7 @@ OC.L10N.register(
"October" : "Жовтень",
"November" : "Листопад",
"December" : "Грудень",
"Last" : "Останній",
"Contacts" : "Контакти",
"{actor} created address book {addressbook}" : "{actor} створив(-ла) адресну книгу {addressbook}",
"You created address book {addressbook}" : "Ви створили адресну книгу {addressbook}",
Expand Down Expand Up @@ -154,6 +157,7 @@ OC.L10N.register(
"Failed to unlink: %1$s" : "Не вдалося від’єднати: %1$s",
"Failed to write file contents: %1$s" : "Не вдалося записати вміст файлу: %1$s",
"File not found: %1$s" : "Файл не знайдено: %1$s",
"Invalid target path" : "Недійсний шлях призначення",
"System is in maintenance mode." : "Система в режимі обслуговування.",
"Upgrade needed" : "Потрібно оновитися",
"Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Ваш %s мусить бути налаштований на використання HTTPS для надання доступу до CalDAV і CardDAV з iOS/macOS.",
Expand Down
4 changes: 4 additions & 0 deletions apps/dav/l10n/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
"Description: %s" : "Опис: %s",
"Where: %s" : "Місце: %s",
"%1$s via %2$s" : "%1$s через %2$s",
"Could not generate when statement" : "Неможливо створити твердження \"коли\"",
"Could not generate next recurrence statement" : "Неможливо створити твердження наступного повторення",
"Cancelled: %1$s" : "Скасовано: %1$s",
"\"%1$s\" has been canceled" : "\"%1$s\" скасовано",
"Re: %1$s" : "Re: %1$s",
Expand Down Expand Up @@ -110,6 +112,7 @@
"October" : "Жовтень",
"November" : "Листопад",
"December" : "Грудень",
"Last" : "Останній",
"Contacts" : "Контакти",
"{actor} created address book {addressbook}" : "{actor} створив(-ла) адресну книгу {addressbook}",
"You created address book {addressbook}" : "Ви створили адресну книгу {addressbook}",
Expand Down Expand Up @@ -152,6 +155,7 @@
"Failed to unlink: %1$s" : "Не вдалося від’єднати: %1$s",
"Failed to write file contents: %1$s" : "Не вдалося записати вміст файлу: %1$s",
"File not found: %1$s" : "Файл не знайдено: %1$s",
"Invalid target path" : "Недійсний шлях призначення",
"System is in maintenance mode." : "Система в режимі обслуговування.",
"Upgrade needed" : "Потрібно оновитися",
"Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "Ваш %s мусить бути налаштований на використання HTTPS для надання доступу до CalDAV і CardDAV з iOS/macOS.",
Expand Down
Loading

0 comments on commit dab8cb9

Please sign in to comment.