From c413f8d1776924c1ba9c8994b80e60fc4e9734c8 Mon Sep 17 00:00:00 2001 From: SebastianKrupinski Date: Fri, 18 Oct 2024 23:07:02 -0400 Subject: [PATCH 1/8] fix: Entity parameter types Signed-off-by: SebastianKrupinski --- lib/Db/AppointmentConfig.php | 21 +++++++++++---------- lib/Db/Booking.php | 13 +++++++------ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/lib/Db/AppointmentConfig.php b/lib/Db/AppointmentConfig.php index 2bdd4778fe..b2a72cb8b8 100644 --- a/lib/Db/AppointmentConfig.php +++ b/lib/Db/AppointmentConfig.php @@ -11,6 +11,7 @@ use JsonSerializable; use OCP\AppFramework\Db\Entity; +use OCP\DB\Types; use ReturnTypeWillChange; use function json_decode; use function json_encode; @@ -122,16 +123,16 @@ class AppointmentConfig extends Entity implements JsonSerializable { public const VISIBILITY_PRIVATE = 'PRIVATE'; public function __construct() { - $this->addType('start', 'int'); - $this->addType('end', 'int'); - $this->addType('length', 'int'); - $this->addType('increment', 'int'); - $this->addType('preparationDuration', 'int'); - $this->addType('followupDuration', 'int'); - $this->addType('timeBeforeNextSlot', 'int'); - $this->addType('dailyMax', 'int'); - $this->addType('futureLimit', 'int'); - $this->addType('createTalkRoom', 'boolean'); + $this->addType('start', Types::INTEGER); + $this->addType('end', Types::INTEGER); + $this->addType('length', Types::INTEGER); + $this->addType('increment', Types::INTEGER); + $this->addType('preparationDuration', Types::INTEGER); + $this->addType('followupDuration', Types::INTEGER); + $this->addType('timeBeforeNextSlot', Types::INTEGER); + $this->addType('dailyMax', Types::INTEGER); + $this->addType('futureLimit', Types::INTEGER); + $this->addType('createTalkRoom', Types::BOOLEAN); } /** diff --git a/lib/Db/Booking.php b/lib/Db/Booking.php index d3bfe6dd0c..54c92cd221 100644 --- a/lib/Db/Booking.php +++ b/lib/Db/Booking.php @@ -9,6 +9,7 @@ use JsonSerializable; use OCP\AppFramework\Db\Entity; +use OCP\DB\Types; use ReturnTypeWillChange; /** @@ -74,12 +75,12 @@ class Booking extends Entity implements JsonSerializable { private $talkUrl; public function __construct() { - $this->addType('id', 'integer'); - $this->addType('apptConfigId', 'integer'); - $this->addType('createdAt', 'integer'); - $this->addType('start', 'integer'); - $this->addType('end', 'integer'); - $this->addType('confirmed', 'boolean'); + $this->addType('id', Types::INTEGER); + $this->addType('apptConfigId', Types::INTEGER); + $this->addType('createdAt', Types::INTEGER); + $this->addType('start', Types::INTEGER); + $this->addType('end', Types::INTEGER); + $this->addType('confirmed', Types::BOOLEAN); } #[ReturnTypeWillChange] From ad6102cf7f9d8c361fcae11a2ebd381122ec6804 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 27 Oct 2024 00:33:50 +0000 Subject: [PATCH 2/8] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- l10n/ar.js | 2 +- l10n/ar.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n/ar.js b/l10n/ar.js index 20ab4a88be..17d8e9a64f 100644 --- a/l10n/ar.js +++ b/l10n/ar.js @@ -423,7 +423,7 @@ OC.L10N.register( "No valid public calendars configured" : "لا توجد أيّ تقاويم عمومية مُهيّأة بالشكل الصحيح", "Speak to the server administrator to resolve this issue." : "تحدّث مع مسؤول النظام لحل هذا الإشكال.", "Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "يتم توفير تقاويم العطلات العامة من موقع ثندربرد Thunderbird. سوف يتم تنزيل بيانات التقويم من {website}", - "These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "هذه التقاويم العامة تمّ اقتراحها من قِبل مسؤول النظام. بيانات التقويم سيتم تحميلها من موقع الويب المعنِي.", + "These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "يتم اقتراح هذه التقويمات العامة بواسطة مسؤول القسم. سيتم تنزيل بيانات التقويم من موقع الويب المعني.", "By {authors}" : "من قِبَل {authors}", "Subscribed" : "مُشترِك subscribed", "Subscribe" : "إشترك subscribe", diff --git a/l10n/ar.json b/l10n/ar.json index 79d2488268..85e395920c 100644 --- a/l10n/ar.json +++ b/l10n/ar.json @@ -421,7 +421,7 @@ "No valid public calendars configured" : "لا توجد أيّ تقاويم عمومية مُهيّأة بالشكل الصحيح", "Speak to the server administrator to resolve this issue." : "تحدّث مع مسؤول النظام لحل هذا الإشكال.", "Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "يتم توفير تقاويم العطلات العامة من موقع ثندربرد Thunderbird. سوف يتم تنزيل بيانات التقويم من {website}", - "These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "هذه التقاويم العامة تمّ اقتراحها من قِبل مسؤول النظام. بيانات التقويم سيتم تحميلها من موقع الويب المعنِي.", + "These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "يتم اقتراح هذه التقويمات العامة بواسطة مسؤول القسم. سيتم تنزيل بيانات التقويم من موقع الويب المعني.", "By {authors}" : "من قِبَل {authors}", "Subscribed" : "مُشترِك subscribed", "Subscribe" : "إشترك subscribe", From 497c943235a9cfa2755c6ec4ae8fd7120410c3ee Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 29 Oct 2024 00:30:58 +0000 Subject: [PATCH 3/8] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- l10n/lv.js | 4 ++-- l10n/lv.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/l10n/lv.js b/l10n/lv.js index e1179cbb2e..c420e98647 100644 --- a/l10n/lv.js +++ b/l10n/lv.js @@ -39,7 +39,7 @@ OC.L10N.register( "You have a new appointment booking \"%s\" from %s" : "Jums ir jauna tikšanās rezervācija \"%s\" no %s", "Dear %s, %s (%s) booked an appointment with you." : " %s, %s (%s) rezervēja tikšanos ar Jums.", "A Calendar app for Nextcloud" : "Kalendāra lietotne priekš Nextcloud", - "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries." : "Kalendāra lietotne ir lietotāja saskarne Nextcloud CalDAV serverim. Vienkārši sinhronizējiet notikumus no dažādām ierīcēm ar savu Nextcloud un rediģējiet tos tiešsaistē.\n\n* 🚀 **Integrācija ar citām Nextcloud lietotnēm!** Pašlaik ir pieejams Kontaktu saraksts - vairāk nākotnē.\n* 🌐 **WebCal atbalsts!** Vai vēlaties redzēt savas mīļākās komandas spēļu dienas kalendārā? Nav problēmu!\n* 🙋 **Dalībnieki!** Ielūdziet cilvēkus uz savām notikumiem.\n* ⌚️ **Brīvas/Aizņemtas laika vietas!** Redziet, kad jūsu dalībnieki ir pieejami tikšanās.\n* ⏰ **Atgādinājumi!** Saņemiet brīdinājumus par notikumiem pārlūkprogrammā un e-pastā.\n* 🔍 Meklēšana! Atrast savus notikumus viegli.\n* ☑️ Uzdevumi! Redziet uzdevumus ar termiņu tieši kalendārā.\n* 🙈 **Mēs neizgudrojam jaunu riteni!** Balstīts uz lielisko [c-dav bibliotēku](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) un [fullcalendar](https://github.com/fullcalendar/fullcalendar) bibliotēkām.", + "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries." : "Kalendāra lietotne ir lietotāja saskarne Nextcloud CalDAV serverim. Vienkārša notikumus sinhronizēšana dažādās ierīcēs ar savu Nextcloud un to labošana tiešsaistē.\n\n* 🚀 **Iekļaušana ar citām Nextcloud lietotnēm.** Pašlaik Kontaktpersonas - vairāk nākotnē.\n* 🌐 **WebCal atbalsts.** Vai vēlies redzēt savas mīļākās komandas spēļu dienas kalendārā? Bez sarežģijumiem.\n* 🙋 **Dalībnieki.** Uzaicini cilvēkus uz saviem notikumiem.\n* ⌚️ **Brīvs/Aizņemts.** Redzi, kad dalībniekiem ir pieejams brīvs laiks.\n* ⏰ **Atgādinājumi.** Saņem savā pārlūkprogrammā un e-pastā paziņojumus par notikumiem!\n* 🔍 Meklēšana. Viegli atrodi savus notikumus!\n* ☑️ Uzdevumi. Redzi uzdevumus ar beigu datumu tieši kalendārā!\n* 🙈 **Mēs neizgudrojam jaunu riteni!** Balstīts uz lielisko [c-dav bibliotēku](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) un [fullcalendar](https://github.com/fullcalendar/fullcalendar) bibliotēku.", "Previous day" : "Iepriekšējā diena", "Previous week" : "Iepriekšējā nedēļa", "Previous year" : "Iepriekšējais gads", @@ -306,7 +306,7 @@ OC.L10N.register( "weekday" : "darba diena", "weekend day" : "brīvdiena", "Does not repeat" : "Neatkārtojas", - "The recurrence definition of this event is not fully supported by Nextcloud. If you edit the recurrence-options, certain recurrences may be lost." : "Atkārtojuma definīcija šim notikumam Nextcloud nav pilnībā atbalstīta. Ja jūs rediģēsiet atkārtojuma opcijas, daži atkārtojumi var tikt zaudēti.", + "The recurrence definition of this event is not fully supported by Nextcloud. If you edit the recurrence-options, certain recurrences may be lost." : "Atkārtošanās definīcija šim notikumam Nextcloud nav pilnībā atbalstīta. Ja tiek labotas atkārtošanās iespējas, noteikti atkārtojošies notikumi var tikt zaudēti.", "Suggestions" : "Ieteikumi", "No rooms or resources yet" : "Vēl nav telpu vai resursu.", "Add resource" : "Pievienot resursu", diff --git a/l10n/lv.json b/l10n/lv.json index f2f4e0898e..6f735d2dc3 100644 --- a/l10n/lv.json +++ b/l10n/lv.json @@ -37,7 +37,7 @@ "You have a new appointment booking \"%s\" from %s" : "Jums ir jauna tikšanās rezervācija \"%s\" no %s", "Dear %s, %s (%s) booked an appointment with you." : " %s, %s (%s) rezervēja tikšanos ar Jums.", "A Calendar app for Nextcloud" : "Kalendāra lietotne priekš Nextcloud", - "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries." : "Kalendāra lietotne ir lietotāja saskarne Nextcloud CalDAV serverim. Vienkārši sinhronizējiet notikumus no dažādām ierīcēm ar savu Nextcloud un rediģējiet tos tiešsaistē.\n\n* 🚀 **Integrācija ar citām Nextcloud lietotnēm!** Pašlaik ir pieejams Kontaktu saraksts - vairāk nākotnē.\n* 🌐 **WebCal atbalsts!** Vai vēlaties redzēt savas mīļākās komandas spēļu dienas kalendārā? Nav problēmu!\n* 🙋 **Dalībnieki!** Ielūdziet cilvēkus uz savām notikumiem.\n* ⌚️ **Brīvas/Aizņemtas laika vietas!** Redziet, kad jūsu dalībnieki ir pieejami tikšanās.\n* ⏰ **Atgādinājumi!** Saņemiet brīdinājumus par notikumiem pārlūkprogrammā un e-pastā.\n* 🔍 Meklēšana! Atrast savus notikumus viegli.\n* ☑️ Uzdevumi! Redziet uzdevumus ar termiņu tieši kalendārā.\n* 🙈 **Mēs neizgudrojam jaunu riteni!** Balstīts uz lielisko [c-dav bibliotēku](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) un [fullcalendar](https://github.com/fullcalendar/fullcalendar) bibliotēkām.", + "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries." : "Kalendāra lietotne ir lietotāja saskarne Nextcloud CalDAV serverim. Vienkārša notikumus sinhronizēšana dažādās ierīcēs ar savu Nextcloud un to labošana tiešsaistē.\n\n* 🚀 **Iekļaušana ar citām Nextcloud lietotnēm.** Pašlaik Kontaktpersonas - vairāk nākotnē.\n* 🌐 **WebCal atbalsts.** Vai vēlies redzēt savas mīļākās komandas spēļu dienas kalendārā? Bez sarežģijumiem.\n* 🙋 **Dalībnieki.** Uzaicini cilvēkus uz saviem notikumiem.\n* ⌚️ **Brīvs/Aizņemts.** Redzi, kad dalībniekiem ir pieejams brīvs laiks.\n* ⏰ **Atgādinājumi.** Saņem savā pārlūkprogrammā un e-pastā paziņojumus par notikumiem!\n* 🔍 Meklēšana. Viegli atrodi savus notikumus!\n* ☑️ Uzdevumi. Redzi uzdevumus ar beigu datumu tieši kalendārā!\n* 🙈 **Mēs neizgudrojam jaunu riteni!** Balstīts uz lielisko [c-dav bibliotēku](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) un [fullcalendar](https://github.com/fullcalendar/fullcalendar) bibliotēku.", "Previous day" : "Iepriekšējā diena", "Previous week" : "Iepriekšējā nedēļa", "Previous year" : "Iepriekšējais gads", @@ -304,7 +304,7 @@ "weekday" : "darba diena", "weekend day" : "brīvdiena", "Does not repeat" : "Neatkārtojas", - "The recurrence definition of this event is not fully supported by Nextcloud. If you edit the recurrence-options, certain recurrences may be lost." : "Atkārtojuma definīcija šim notikumam Nextcloud nav pilnībā atbalstīta. Ja jūs rediģēsiet atkārtojuma opcijas, daži atkārtojumi var tikt zaudēti.", + "The recurrence definition of this event is not fully supported by Nextcloud. If you edit the recurrence-options, certain recurrences may be lost." : "Atkārtošanās definīcija šim notikumam Nextcloud nav pilnībā atbalstīta. Ja tiek labotas atkārtošanās iespējas, noteikti atkārtojošies notikumi var tikt zaudēti.", "Suggestions" : "Ieteikumi", "No rooms or resources yet" : "Vēl nav telpu vai resursu.", "Add resource" : "Pievienot resursu", From dac1c2677bc9301fef88629e97128ac6fa9e4500 Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Tue, 29 Oct 2024 08:34:54 +0000 Subject: [PATCH 4/8] fix(deps): Fix npm audit Signed-off-by: GitHub --- package-lock.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index cc27c83ef6..6eabfb2c25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3572,9 +3572,9 @@ } }, "node_modules/@nextcloud/files": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.9.0.tgz", - "integrity": "sha512-GKlD8PESRgpP3Rz7xgLbRPXvk1EKStkN8zwM3/L2Dl70g2qkUh1IdEAPZO2KlCdJPD8QxcdK4ib0KClk/ounpA==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.9.1.tgz", + "integrity": "sha512-eureE0Hi13QhC7detUUlp5B7NjLLu1JnVLDF0yuNv/My5ETbe3SuWjulAXQ2KH3lvqVjhjgbNoEjH5wHemIG+g==", "license": "AGPL-3.0-or-later", "dependencies": { "@nextcloud/auth": "^2.4.0", @@ -8342,9 +8342,9 @@ "integrity": "sha512-yWh1otcs3OKUWDvu/IxyI36ZI3WNaRZlI0uG/DK6fu0pap0VYZ0J5pEGTk1zakme+hT0OKHwhlHc0N5TJhY6yQ==" }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz", + "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==", "dev": true, "license": "MIT", "peer": true, @@ -20311,9 +20311,10 @@ "dev": true }, "node_modules/vue2-datepicker": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.11.0.tgz", - "integrity": "sha512-zbMkAjYwDTXZozZtkpSwqxq7nEeBt7zoHL+oQcdjEXAqzJHhmatE6sl6JSr58PMIx2WOK0c6QBXozSqT32iQAQ==", + "version": "3.11.1", + "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.11.1.tgz", + "integrity": "sha512-6PU/+pnp2mgZAfnSXmbdwj9516XsEvTiw61Q5SNrvvdy8W/FCxk1GAe9UZn/m9YfS5A47yK6XkcjMHbp7aFApA==", + "license": "MIT", "dependencies": { "date-format-parse": "^0.2.7" }, From 4f88b3c0e9104ebcea017105dd5f724fa9f3e347 Mon Sep 17 00:00:00 2001 From: Hamza Mahjoubi Date: Fri, 11 Oct 2024 16:06:07 +0200 Subject: [PATCH 5/8] fix(rtl): navigation buttons Signed-off-by: Hamza Mahjoubi --- css/app-navigation.scss | 10 ++++- .../AppNavigationHeaderDatePicker.vue | 40 +++++++++++-------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/css/app-navigation.scss b/css/app-navigation.scss index be3319668f..1f24ce3a7c 100644 --- a/css/app-navigation.scss +++ b/css/app-navigation.scss @@ -58,13 +58,19 @@ } } - &__previous, - &__next { + &__left, + &__right { background-size: 10px; flex-grow: 0 !important; width: 34px; padding: 0 6px !important; } + &__left{ + border-radius: var(--border-radius-element) 0 0 var(--border-radius-element) !important; + } + &__right{ + border-radius: 0 var(--border-radius-element) var(--border-radius-element) 0 !important; + } } .app-navigation__body { diff --git a/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue b/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue index 85f15017c0..1e5e95d44f 100644 --- a/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue +++ b/src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue @@ -6,14 +6,16 @@