Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Nextcloud
- Activity
- Members
- Labels
- Service Desk
- Model experiments

Snippets Groups Projects

df99d8f0

Unverified Commit df99d8f0 authored 4 years ago by Roeland Jago Douma Committed by GitHub 4 years ago

Downloads
- Plain Diff

Merge pull request #22134 from nextcloud/merge-calendar-activity-settings

merge activity settings for calendars, events and todos

parents cb2695df 460db942

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

apps/dav/composer/composer/autoload_classmap.php 1 addition, 0 deletions

apps/dav/composer/composer/autoload_classmap.php
apps/dav/composer/composer/autoload_static.php 1 addition, 0 deletions

apps/dav/composer/composer/autoload_static.php
apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php 47 additions, 0 deletions

apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php
apps/dav/lib/CalDAV/Activity/Setting/Calendar.php 1 addition, 15 deletions

apps/dav/lib/CalDAV/Activity/Setting/Calendar.php
apps/dav/lib/CalDAV/Activity/Setting/Event.php 1 addition, 15 deletions

apps/dav/lib/CalDAV/Activity/Setting/Event.php
apps/dav/lib/CalDAV/Activity/Setting/Todo.php 1 addition, 14 deletions

apps/dav/lib/CalDAV/Activity/Setting/Todo.php

with 52 additions and 44 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment