diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-03-12 11:20:04 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-05-31 07:49:19 +0200 |
| commit | d6d8e9215c69a9e8d4bfa2035c657b0a037f3a2f (patch) | |
| tree | 942254503672d6ab3e0b6c8fca0bd4053db352b9 /apps/dav/appinfo | |
| parent | 9e596dd0cf455dc1639141c695f89c7d936f4c0c (diff) | |
| download | nextcloud-server-d6d8e9215c69a9e8d4bfa2035c657b0a037f3a2f.tar.gz nextcloud-server-d6d8e9215c69a9e8d4bfa2035c657b0a037f3a2f.zip | |
Add a trashbin for calendars and calendar objects
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps/dav/appinfo')
| -rw-r--r-- | apps/dav/appinfo/info.xml | 4 | ||||
| -rw-r--r-- | apps/dav/appinfo/v1/caldav.php | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index ff99623e382..c99d82a798d 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -5,7 +5,7 @@ <name>WebDAV</name> <summary>WebDAV endpoint</summary> <description>WebDAV endpoint</description> - <version>1.17.2</version> + <version>1.18.0</version> <licence>agpl</licence> <author>owncloud.org</author> <namespace>DAV</namespace> @@ -24,6 +24,7 @@ <job>OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob</job> <job>OCA\DAV\BackgroundJob\CleanupInvitationTokenJob</job> <job>OCA\DAV\BackgroundJob\EventReminderJob</job> + <job>OCA\DAV\BackgroundJob\CalendarRetentionJob</job> </background-jobs> <repair-steps> @@ -48,6 +49,7 @@ <command>OCA\DAV\Command\CreateCalendar</command> <command>OCA\DAV\Command\MoveCalendar</command> <command>OCA\DAV\Command\ListCalendars</command> + <command>OCA\DAV\Command\RetentionCleanupCommand</command> <command>OCA\DAV\Command\SendEventReminders</command> <command>OCA\DAV\Command\SyncBirthdayCalendar</command> <command>OCA\DAV\Command\SyncSystemAddressBook</command> diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php index 236d81f66f8..19842c91f09 100644 --- a/apps/dav/appinfo/v1/caldav.php +++ b/apps/dav/appinfo/v1/caldav.php @@ -61,8 +61,20 @@ $random = \OC::$server->getSecureRandom(); $logger = \OC::$server->getLogger(); $dispatcher = \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class); $legacyDispatcher = \OC::$server->getEventDispatcher(); +$config = \OC::$server->get(\OCP\IConfig::class); -$calDavBackend = new CalDavBackend($db, $principalBackend, $userManager, \OC::$server->getGroupManager(), $random, $logger, $dispatcher, $legacyDispatcher, true); +$calDavBackend = new CalDavBackend( + $db, + $principalBackend, + $userManager, + \OC::$server->getGroupManager(), + $random, + $logger, + $dispatcher, + $legacyDispatcher, + $config, + true +); $debugging = \OC::$server->getConfig()->getSystemValue('debug', false); $sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes'; |