Merge branch 'main' into feat/add-labels-for-grid-accessibility

Author: GVodyanov

.github/workflows/lint-php.yml

@@ -21,7 +21,8 @@ jobs:
   matrix:
     runs-on: ubuntu-latest-low
     outputs:
-      php-versions: ${{ steps.versions.outputs.php-versions }}
+      php-min: ${{ steps.versions.outputs.php-min }}
+      php-max: ${{ steps.versions.outputs.php-max }}
     steps:
       - name: Checkout app
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -37,7 +38,7 @@ jobs:
     needs: matrix
     strategy:
       matrix:
-        php-versions: ${{fromJson(needs.matrix.outputs.php-versions)}}
+        php-versions: ['${{ needs.matrix.outputs.php-min }}', '${{ needs.matrix.outputs.php-max }}']
 
     name: php-lint
 

css/calendar.scss

@@ -2,14 +2,14 @@
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-@import 'app-navigation.scss';
-@import 'app-full.scss';
-@import 'app-settings.scss';
-@import 'app-modal.scss';
-@import 'freebusy.scss';
-@import 'fullcalendar.scss';
-@import 'global.scss';
-@import 'import.scss';
-@import 'print.scss';
-@import 'public.scss';
-@import 'props-linkify-links.scss';
+@use 'app-navigation.scss';
+@use 'app-full.scss';
+@use 'app-settings.scss';
+@use 'app-modal.scss';
+@use 'freebusy.scss';
+@use 'fullcalendar.scss';
+@use 'global.scss';
+@use 'import.scss';
+@use 'print.scss';
+@use 'public.scss';
+@use 'props-linkify-links.scss';

css/fullcalendar.scss

@@ -124,7 +124,7 @@
 	background-color: var(--color-background-dark) !important;
 	border: 1px solid var(--color-background-darker);
 	.fc-daygrid-day-top {
-		opacity: 0.6;
+		opacity: 0.8;
 	}
 }
 
@@ -133,13 +133,6 @@
 	padding-inline-start: 3px;
 	border-width: 2px;
 
-	&.fc-event-nc-task-completed,
-	&.fc-event-nc-tentative,
-	&.fc-event-past,
-	&.fc-event-nc-cancelled {
-		opacity: .5;
-	}
-
 	&.fc-event-nc-task-completed,
 	&.fc-event-nc-cancelled {
 		.fc-event-title,

l10n/af.js

@@ -29,9 +29,9 @@ OC.L10N.register(
     "Share with users or groups" : "Deel met gebruikers of groepe",
     "No users or groups" : "Geen gebruikers of groepe",
     "Save" : "Stoor",
+    "Cancel" : "Kanselleer",
     "View" : "Bekyk",
     "Filename" : "Lêernaam",
-    "Cancel" : "Kanselleer",
     "Automatic" : "Outomaties",
     "Automatic ({timezone})" : "Outomaties ({timezone})",
     "Timezone" : "Tydsone",

l10n/af.json

@@ -27,9 +27,9 @@
     "Share with users or groups" : "Deel met gebruikers of groepe",
     "No users or groups" : "Geen gebruikers of groepe",
     "Save" : "Stoor",
+    "Cancel" : "Kanselleer",
     "View" : "Bekyk",
     "Filename" : "Lêernaam",
-    "Cancel" : "Kanselleer",
     "Automatic" : "Outomaties",
     "Automatic ({timezone})" : "Outomaties ({timezone})",
     "Timezone" : "Tydsone",

l10n/ar.js

@@ -84,7 +84,6 @@ OC.L10N.register(
     "_Deleting the calendar in {countdown} second_::_Deleting the calendar in {countdown} seconds_" : ["حذف التقويم في {countdown} ثواني","حذف التقويم في {countdown} ثانية","حذف التقويم في {countdown} ثواني","حذف التقويم في {countdown} ثواني","حذف التقويم في {countdown} ثواني","حذف التقويم في {countdown} ثواني"],
     "An error occurred, unable to create the calendar." : "حدث خطأ، يتعذّر إنشاء التقويم.",
     "Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "يرجى ادخال رابطٍ صحيحٍ (يبدأ بـ https://, http://, webcals://, webcal://)",
-    "Calendars" : "التقاويم",
     "Add new" : "إضافة جديد",
     "New calendar" : "تقويم جديد",
     "Name for new calendar" : "اسم التقويم الجديد",
@@ -147,12 +146,12 @@ OC.L10N.register(
     "Unshare from me" : "أنت ألغيت المشاركة",
     "Save" : "حفظ",
     "No title" : "بدون عنوان",
+    "Cancel" : "إلغاء",
     "View" : "عرض",
     "Import calendars" : "استيراد التقويم",
     "Please select a calendar to import into …" : "يرجى اختيار تقويم للاستيراد اليه  …",
     "Filename" : "اسم الملف",
     "Calendar to import into" : "تقويم للاستيراد اليه",
-    "Cancel" : "إلغاء",
     "_Import calendar_::_Import calendars_" : ["استيراد التقويم","استيراد التقويم","استيراد التقويم","استيراد التقويم","استيراد التقويم","استيراد التقويم"],
     "Select the default location for attachments" : "عيّن موقع المُرفقات التلقائي",
     "Pick" : "إختر",
@@ -561,6 +560,7 @@ OC.L10N.register(
     "Appointment not found" : "الموعد غير موجود",
     "User not found" : "المستخدم غير موجود",
     "%1$s - %2$s" : "%1$s - %2$s",
+    "Calendars" : "التقاويم",
     "Hidden" : "مخفي",
     "can edit" : "يمكن التحرير",
     "Calendar name …" : "اسم التقويم ...",

l10n/ar.json

@@ -82,7 +82,6 @@
     "_Deleting the calendar in {countdown} second_::_Deleting the calendar in {countdown} seconds_" : ["حذف التقويم في {countdown} ثواني","حذف التقويم في {countdown} ثانية","حذف التقويم في {countdown} ثواني","حذف التقويم في {countdown} ثواني","حذف التقويم في {countdown} ثواني","حذف التقويم في {countdown} ثواني"],
     "An error occurred, unable to create the calendar." : "حدث خطأ، يتعذّر إنشاء التقويم.",
     "Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "يرجى ادخال رابطٍ صحيحٍ (يبدأ بـ https://, http://, webcals://, webcal://)",
-    "Calendars" : "التقاويم",
     "Add new" : "إضافة جديد",
     "New calendar" : "تقويم جديد",
     "Name for new calendar" : "اسم التقويم الجديد",
@@ -145,12 +144,12 @@
     "Unshare from me" : "أنت ألغيت المشاركة",
     "Save" : "حفظ",
     "No title" : "بدون عنوان",
+    "Cancel" : "إلغاء",
     "View" : "عرض",
     "Import calendars" : "استيراد التقويم",
     "Please select a calendar to import into …" : "يرجى اختيار تقويم للاستيراد اليه  …",
     "Filename" : "اسم الملف",
     "Calendar to import into" : "تقويم للاستيراد اليه",
-    "Cancel" : "إلغاء",
     "_Import calendar_::_Import calendars_" : ["استيراد التقويم","استيراد التقويم","استيراد التقويم","استيراد التقويم","استيراد التقويم","استيراد التقويم"],
     "Select the default location for attachments" : "عيّن موقع المُرفقات التلقائي",
     "Pick" : "إختر",
@@ -559,6 +558,7 @@
     "Appointment not found" : "الموعد غير موجود",
     "User not found" : "المستخدم غير موجود",
     "%1$s - %2$s" : "%1$s - %2$s",
+    "Calendars" : "التقاويم",
     "Hidden" : "مخفي",
     "can edit" : "يمكن التحرير",
     "Calendar name …" : "اسم التقويم ...",

l10n/ast.js

@@ -60,7 +60,6 @@ OC.L10N.register(
     "_Unsharing the calendar in {countdown} second_::_Unsharing the calendar in {countdown} seconds_" : ["Va dexar de compartise'l calendariu en {countdown} segundu","Va dexar de compartise'l calendariu en {countdown} segundos"],
     "_Deleting the calendar in {countdown} second_::_Deleting the calendar in {countdown} seconds_" : ["Va desaniciase'l calendariu en {countdown} segundu","Va desaniciase'l calendariu en {countdown} segundos"],
     "An error occurred, unable to create the calendar." : "Prodúxose un error, nun ye posible crear el calendariu.",
-    "Calendars" : "Calendarios",
     "New calendar" : "Calendariu nuevu",
     "Name for new calendar" : "Nome del calendariu nuevu",
     "Creating calendar …" : "Creando'l calendariu…",
@@ -111,11 +110,11 @@ OC.L10N.register(
     "Failed to save calendar name and color" : "Nun se pue guardar el nome y el color del calendariu",
     "Share calendar" : "Compartir el calendariu",
     "Save" : "Guardar",
+    "Cancel" : "Encaboxar",
     "View" : "Ver",
     "Import calendars" : "Importar calendarios",
     "Please select a calendar to import into …" : "Seleiciona un calendariu al qu'importar …",
     "Filename" : "Nome del ficheru",
-    "Cancel" : "Encaboxar",
     "Invalid location selected" : "Seleicionóse una llocalización inválida",
     "Automatic" : "Automáticu",
     "Navigation" : "Navegación",
@@ -286,6 +285,7 @@ OC.L10N.register(
     "This is an event reminder." : "Esto ye un recordatoriu del eventu.",
     "User not found" : "Nun s'atopó l'usuariu",
     "%1$s - %2$s" : "%1$s - %2$s",
+    "Calendars" : "Calendarios",
     "Hidden" : "Anubrióse",
     "Calendar name …" : "Nome del calendariu…",
     "CalDAV link copied to clipboard." : "L'enllaz CalDAV copióse nel cartafueyu.",

l10n/ast.json

@@ -58,7 +58,6 @@
     "_Unsharing the calendar in {countdown} second_::_Unsharing the calendar in {countdown} seconds_" : ["Va dexar de compartise'l calendariu en {countdown} segundu","Va dexar de compartise'l calendariu en {countdown} segundos"],
     "_Deleting the calendar in {countdown} second_::_Deleting the calendar in {countdown} seconds_" : ["Va desaniciase'l calendariu en {countdown} segundu","Va desaniciase'l calendariu en {countdown} segundos"],
     "An error occurred, unable to create the calendar." : "Prodúxose un error, nun ye posible crear el calendariu.",
-    "Calendars" : "Calendarios",
     "New calendar" : "Calendariu nuevu",
     "Name for new calendar" : "Nome del calendariu nuevu",
     "Creating calendar …" : "Creando'l calendariu…",
@@ -109,11 +108,11 @@
     "Failed to save calendar name and color" : "Nun se pue guardar el nome y el color del calendariu",
     "Share calendar" : "Compartir el calendariu",
     "Save" : "Guardar",
+    "Cancel" : "Encaboxar",
     "View" : "Ver",
     "Import calendars" : "Importar calendarios",
     "Please select a calendar to import into …" : "Seleiciona un calendariu al qu'importar …",
     "Filename" : "Nome del ficheru",
-    "Cancel" : "Encaboxar",
     "Invalid location selected" : "Seleicionóse una llocalización inválida",
     "Automatic" : "Automáticu",
     "Navigation" : "Navegación",
@@ -284,6 +283,7 @@
     "This is an event reminder." : "Esto ye un recordatoriu del eventu.",
     "User not found" : "Nun s'atopó l'usuariu",
     "%1$s - %2$s" : "%1$s - %2$s",
+    "Calendars" : "Calendarios",
     "Hidden" : "Anubrióse",
     "Calendar name …" : "Nome del calendariu…",
     "CalDAV link copied to clipboard." : "L'enllaz CalDAV copióse nel cartafueyu.",

l10n/be.js

@@ -39,7 +39,7 @@ OC.L10N.register(
     "Untitled calendar" : "Каляндар без назвы",
     "Copy public link" : "Скапіяваць публічную спасылку",
     "Edit calendar" : "Рэдагаваць каляндар",
-    "Calendars" : "Календары",
+    "My calendars" : "Мае календары",
     "New calendar with task list" : "Новы каляндар са спісам заданняў",
     "Export" : "Экспарт",
     "Trash bin" : "Сметніца",
@@ -54,9 +54,9 @@ OC.L10N.register(
     "No users or groups" : "Няма карыстальнікаў або груп",
     "Unshare from me" : "Скасаваць абагульванне са мной",
     "Save" : "Захаваць",
+    "Cancel" : "Скасаваць",
     "View" : "Праглядзець",
     "Filename" : "Назва файла",
-    "Cancel" : "Скасаваць",
     "Attachments folder" : "Папка для далучэнняў",
     "Timezone" : "Часавы пояс",
     "Navigation" : "Навігацыя",
@@ -184,6 +184,7 @@ OC.L10N.register(
     "Error while sharing file" : "Памылка пры абагульванні файла",
     "User not found" : "Карыстальнік не знойдзены",
     "%1$s - %2$s" : "%1$s - %2$s",
+    "Calendars" : "Календары",
     "Calendar name …" : "Назва календара …",
     "Enable birthday calendar" : "Уключыць каляндар дзён нараджэння",
     "Show tasks in calendar" : "Паказаць заданні ў календары",