Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7295960c authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/calendar-4-6-6-new' into 'murena-main'

Calendar Update to 4.6.7

See merge request !56
parents 7dcefd83 dde74461
Loading
Loading
Loading
Loading
Loading
+33 −1
Original line number Diff line number Diff line

# Changelog

## 4.6.7 - 2024-03-19
### Fixed
- Missing events in week view

## 4.6.6 - 2024-03-04
### Fixed
- Outdated holiday calendars
- FreeBusy - free for all blocks
- Appointment rounding

## 4.6.5 - 2024-02-15
### Fixed
- "Send Email" checkbox renamed to "Request reply"
- "Invitation sent" rephrased to "Awaiting response"
- Disabled resharing of incoming calendar shares
- Booking date not displayed in appointment booking popover
- Appointment slots not being bookable when the time doesn't fit into duration or increment

## 4.6.4 - 2024-01-18
### Fixed
- Guests being added to talk rooms not open for guests

## 4.6.3 - 2024-01-10
### Fixed
- Rate limit appointment booking and config creation
- Apointment confirmation modal button style
- Filtering in sharing search
- Attachment folder picker opening twice

## 4.6.2 - 2024-01-03
### Fixed
- Uploading attachments in Firefox

## 4.6.1 - 2023-12-21
### Fixed
- Localisation for month view
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
* ☑️ Tasks! See tasks with a due date directly in the calendar
* 🙈 **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.
	]]></description>
	<version>4.6.1</version>
	<version>4.6.7</version>
	<licence>agpl</licence>
	<author>Anna Larch</author>
	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
+1 −37
Original line number Diff line number Diff line
@@ -13,11 +13,8 @@ OC.L10N.register(
    "Cheers!" : "Ha de fint!",
    "Upcoming events" : "Kommande händelser",
    "More events" : "Fler händelser",
<<<<<<< HEAD
=======
    "No more events today" : "Inga fler händelser idag",
    "No upcoming events" : "Inga kommande händelser",
>>>>>>> a05a13fec008e7f7c13a2bb31304277ce587c11d
    "%1$s with %2$s" : "%1$s med %2$s",
    "Calendar" : "Kalender",
    "New booking {booking}" : "Ny bokning {booking}",
@@ -42,27 +39,6 @@ OC.L10N.register(
    "Comment:" : "Kommentar:",
    "You have a new appointment booking \"%s\" from %s" : "Du har en ny mötesbokning \"%s\" från %s",
    "Dear %s, %s (%s) booked an appointment with you." : "%s, %s (%s) bokade ett möte med dig.",
<<<<<<< HEAD
    "Anniversary" : "Jubileum",
    "Appointment" : "Bokning",
    "Business" : "Företag",
    "Education" : "Utbildning",
    "Holiday" : "Ledighet",
    "Meeting" : "Möte",
    "Miscellaneous" : "Diverse",
    "Non-working hours" : "Icke-arbetstid",
    "Not in office" : "Inte på kontoret",
    "Personal" : "Privat",
    "Phone call" : "Telefonsamtal",
    "Sick day" : "Sjukdag",
    "Special occasion" : "Speciellt tillfälle",
    "Travel" : "Resa",
    "Vacation" : "Semester",
    "Custom Categories" : "Anpassade kategorier",
    "Collaborative Tags" : "Samarbetstaggar",
    "Standard Categories" : "Standardkategorier",
=======
>>>>>>> a05a13fec008e7f7c13a2bb31304277ce587c11d
    "A Calendar app for Nextcloud" : "En kalender-app för 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." : "Kalendar-appen är ett gränssnitt till Nextclouds CalDAV server. Synkronisera händelser enkelt från diverse enheter till Nextcloud samt redigera dem online.\n\n* 🚀 **Integrerad med andra Nextcloud-appar!** För tillfället Kontakter - fler på väg.\n* 🌐 **WebCal Support!** Vill du se ditt favoritlags matchdagar i din kalender? Inga problem!\n* 🙋 **Deltagare!** Bjud in andra deltagare till dina aktiviteter\n* ⌚️ **Ledig/Upptagen!** Se när andra deltagare har ledig tid\n* ⏰ **Påminnelser!** Få påminnelser för aktiviteter i webbläsaren och på e-mail.\n* 🔍 Sök! Hitta dina event lätt!\n* ☑️ Uppgifter! Se dina uppgifters slutdatum direkt i kalendern\n* 🙈 **Vi uppfinner inte hjulet igen!** Appen är baserad på de fantastiska biblioteken [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) och [fullcalendar](https://github.com/fullcalendar/fullcalendar).",
    "Previous day" : "Föregående dag",
@@ -322,10 +298,7 @@ OC.L10N.register(
    "Create Talk room for this event" : "Skapa ett rum i Talk för denna händelse",
    "Show busy times" : "Visa upptagna tider",
    "No attendees yet" : "Inga deltagare ännu",
<<<<<<< HEAD
=======
    "You do not own this calendar, so you cannot add attendees to this event" : "Du äger inte den här kalendern, så du kan inte lägga till deltagare till denna händelse",
>>>>>>> a05a13fec008e7f7c13a2bb31304277ce587c11d
    "Successfully appended link to talk room to location." : "Länk till rum i Talk tillagd i plats.",
    "Successfully appended link to talk room to description." : "Länk till rum i Talk tillagd i beskrivningen.",
    "Error creating Talk room" : "Kunde inte skapa rum i Talk",
@@ -418,10 +391,7 @@ OC.L10N.register(
    "Select date" : "Välj datum",
    "Select slot" : "Välj tid",
    "No slots available" : "Inga tider tillgängliga",
<<<<<<< HEAD
=======
    "Could not fetch slots" : "Det gick inte att hämta platser",
>>>>>>> a05a13fec008e7f7c13a2bb31304277ce587c11d
    "The slot for your appointment has been confirmed" : "Tiden för ditt möte har bekräftats",
    "Appointment Details:" : "Mötesdetaljer:",
    "Time:" : "Tid:",
@@ -433,10 +403,7 @@ OC.L10N.register(
    "Please book a different slot:" : "Vänligen boka en annan tid:",
    "Book an appointment with {name}" : "Boka ett möte med {name}",
    "No public appointments found for {name}" : "Inga offentliga möten hittades för {name}",
<<<<<<< HEAD
=======
    "Personal" : "Privat",
>>>>>>> a05a13fec008e7f7c13a2bb31304277ce587c11d
    "The automatic time zone detection determined your time zone to be UTC.\nThis is most likely the result of security measures of your web browser.\nPlease set your time zone manually in the calendar settings." : "Den automatiska tidszon-detekteringen fastställde din tidszon till UTC.\nDetta är troligtvis resultatet av säkerhetsinställningar i din webbläsare.\nVänligen ställ in din tidszon manuellt i kalenderinställningarna.",
    "Your configured time zone ({timezoneId}) was not found. Falling back to UTC.\nPlease change your time zone in the settings and report this issue." : "Din tidszon ({timezoneId}) hittades inte. Återgår till UTC.\nVänligen ändra din tidszon i inställningarna och rapportera detta problem.",
    "Create a new event" : "Skapa en ny händelse",
@@ -460,8 +427,6 @@ OC.L10N.register(
    "Show more details" : "Visa mer information",
    "Subscribe to {name}" : "Prenumerera på {name}",
    "Export {name}" : "Exportera {name}",
<<<<<<< HEAD
=======
    "Anniversary" : "Jubileum",
    "Appointment" : "Bokning",
    "Business" : "Företag",
@@ -476,7 +441,6 @@ OC.L10N.register(
    "Special occasion" : "Speciellt tillfälle",
    "Travel" : "Resa",
    "Vacation" : "Semester",
>>>>>>> a05a13fec008e7f7c13a2bb31304277ce587c11d
    "Midnight on the day the event starts" : "Midnatt den dagen evenemanget börjar",
    "_%n day before the event at {formattedHourMinute}_::_%n days before the event at {formattedHourMinute}_" : ["%n dagar före händelsen klockan {formattedHourMinute}","%n dag före händelsen klockan {formattedHourMinute}"],
    "_%n week before the event at {formattedHourMinute}_::_%n weeks before the event at {formattedHourMinute}_" : ["%n veckor före händelsen klockan {formattedHourMinute}","%n vecka före händelsen klockan {formattedHourMinute}"],
+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ use OCA\Calendar\Http\JsonResponse;
use OCA\Calendar\Service\Appointments\AppointmentConfigService;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\UserRateLimit;
use OCP\IRequest;
use Psr\Log\LoggerInterface;
use function array_keys;
@@ -147,7 +148,9 @@ class AppointmentConfigController extends Controller {
	 * @param int|null $end
	 * @param int|null $futureLimit
	 * @return JsonResponse
	 * @UserRateThrottle(limit=10, period=1200)
	 */
	#[UserRateLimit(limit: 10, period: 1200)]
	public function create(
		string $name,
		string $description,
+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ use OCA\Calendar\Service\Appointments\AppointmentConfigService;
use OCA\Calendar\Service\Appointments\BookingService;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\AnonRateLimit;
use OCP\AppFramework\Http\Attribute\UserRateLimit;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\AppFramework\Utility\ITimeFactory;
@@ -162,7 +164,12 @@ class BookingController extends Controller {
	 * @param string $description
	 * @param string $timeZone
	 * @return JsonResponse
	 *
	 * @AnonRateThrottle(limit=10, period=1200)
	 * @UserRateThrottle(limit=10, period=300)
	 */
	#[AnonRateLimit(limit: 10, period: 1200)]
	#[UserRateLimit(limit: 10, period: 300)]
	public function bookSlot(int $appointmentConfigId,
		int $start,
		int $end,
Loading