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

Commit 7d40384a authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/3.5.4' into 'murena-main' 

Calendar 3.5.4

See merge request !37
parents f458986a 31518f5e

CHANGELOG.md

+10 −0
Original line number Diff line number Diff line 


# Changelog



## 3.5.4 - 2022-12-22

### Fixed

- Handling of Email VALARMs



## 3.5.3 - 2022-12-15

### Fixed

- Delete X-ALT-DESC property on changing description

- Contrast issue with share icon

- Location in booking VEVENT



## 3.5.2 - 2022-10-27

### Fixed

- Event calendar picker out of sync after moving event

appinfo/info.xml

+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>3.5.2</version>

	<version>3.5.4</version>

	<licence>agpl</licence>

	<author>Anna Larch</author>

	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>

lib/Service/Appointments/BookingCalendarWriter.php

+4 −0
Original line number Diff line number Diff line
@@ -166,6 +166,10 @@ class BookingCalendarWriter { 
			$vcalendar->VEVENT->add($alarm);

		}



		if ($config->getLocation() !== null) {

			$vcalendar->VEVENT->add('LOCATION', $config->getLocation());

		}



		$vcalendar->VEVENT->add('X-NC-APPOINTMENT', $config->getToken());



		$filename = $this->random->generate(32, ISecureRandom::CHAR_ALPHANUMERIC);

package-lock.json

+2 −2
Original line number Diff line number Diff line 
{

  "name": "calendar",

  "version": "3.5.2",

  "version": "3.5.4",

  "lockfileVersion": 2,

  "requires": true,

  "packages": {

    "": {

      "name": "calendar",

      "version": "3.5.2",

      "version": "3.5.4",

      "license": "agpl",

      "dependencies": {

        "@fullcalendar/core": "5.11.0",

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "calendar",

  "description": "A calendar app for Nextcloud. Easily sync events from various devices, share and edit them online.",

  "version": "3.5.2",

  "version": "3.5.4",

  "author": "Georg Ehrke <oc.list@georgehrke.com>",

  "contributors": [

    "Georg Ehrke <oc.list@georgehrke.com>",