Commit Graph

211 Commits

Author SHA1 Message Date
Christoph Wurst 9efe190f72
Merge pull request #4573 from ibpl/main-IB#1126265
Added parameter to hide option for calendar subscription via link
2022-10-31 12:06:21 +01:00
Pawel Boguslawski 15e41c2f5a Param renamed to dav.allow_calendar_link_subscriptions
Fixes: 613f90a0cb
Related: https://github.com/nextcloud/server/pull/34387#discussion_r1008131871
Author-Change-Id: IB#1126265
Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
2022-10-28 16:40:36 +02:00
Pawel Boguslawski 613f90a0cb Param renamed to dav.allow_calendar_subscriptions
Fixes: ef4c1f920b
Related: https://github.com/nextcloud/server/pull/34387#discussion_r1008131871
Author-Change-Id: IB#1126265
Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
2022-10-28 16:35:04 +02:00
Anna 7edbe4c399
Merge pull request #4690 from e-foundation/enable-app-slowness-fix
Remove current view repair step
2022-10-28 12:02:16 +02:00
Anna Larch a5448476a3 Fix search results returning past events
for calendar widget

Signed-off-by: Anna Larch <anna@nextcloud.com>
2022-10-27 21:31:20 +02:00
Avinash Gusain 2c084474ba repair step removed
Signed-off-by: Avinash Gusain <avinashg@e.email>
2022-10-27 21:45:19 +05:30
tobiasKaminsky 6af5da5130
round-icons: true for clients
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-10-27 14:17:00 +02:00
Anna Larch 39cc2c818b Remove duplicate location in booking confirmation email
Fixes #4681

Signed-off-by: Anna Larch <anna@nextcloud.com>
2022-10-25 10:22:44 +02:00
Anna Larch 9c9eac4a61 Add error handling for Widget SVG generation
Signed-off-by: Anna Larch <anna@nextcloud.com>
2022-10-20 11:34:46 +02:00
Julien Veyssier 97681912d3 implement IButtonWidget and IIconWidget
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2022-10-17 13:02:49 +02:00
Julien Veyssier 5cc15312cc start to implement IAPIWidget interface
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2022-10-17 13:02:49 +02:00
Julien Veyssier 24e033c42d fix the widget icon in the dashboard app
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2022-10-17 13:02:49 +02:00
Anna Larch cabc0f7634 Add booking email with ics attachment
Signed-off-by: Anna Larch <anna@nextcloud.com>
2022-10-03 21:17:31 +02:00
Pawel Boguslawski ef4c1f920b Added parameter to hide option for calendar subscription via link
Added calendar application config parameter `allow_subscribe_link` to hide option for
calendar subscription via link  (i.e. for internal Nextcloud setups). Use

```
occ config:app:set calendar allow_subscribe_link --value 'yes'
```

to show (default if not set) and

```
occ config:app:set calendar allow_subscribe_link --value 'no'
```

to hide calendar subscription via link option. Should be applied together with
https://github.com/nextcloud/server/pull/34387

Related: https://github.com/nextcloud/server/pull/34387
Author-Change-Id: IB#1126265
Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
2022-10-02 17:11:26 +02:00
Joas Schilling 74e64c8ecc
Fix coding style
Signed-off-by: Joas Schilling <coding@schilljs.com>
2022-08-05 08:59:41 +02:00
Thomas Citharel c3aa892167
Add a config setting to disable appointments
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2022-06-14 16:54:26 +02:00
Christoph Wurst 4b5156c2ec
Add PHP8.1 compatibility
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2022-03-21 20:03:42 +01:00
Christoph Wurst 91a863d4b1
Merge pull request #4074 from nextcloud/fix/remove-unthrown-exception
Remove excpetion that is never thrown
2022-03-17 10:12:24 +01:00
Anna Larch dc2be81d1d Add email validation and testing for booking
Signed-off-by: Anna Larch <anna@nextcloud.com>
2022-03-16 09:42:40 +01:00
Anna Larch 0a75fa5dae Remove excpetion that is never thrown
Signed-off-by: Anna Larch <anna@nextcloud.com>
2022-03-15 17:12:45 +01:00
Raimund Schlüßler 81dc334038
Fix alarm type selection if forceAlarmType is null
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
2022-03-14 15:05:52 +01:00
Maximilian Martin 3523ee4329 add initial state for hide_event_export
Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
2022-03-10 02:58:56 -05:00
Christoph Wurst dfa5e8fa18
Allow admins to force an event type
Any other value set by another client still shows up. This only
"enforces" the alarm type for those who only use the Calendar app.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2022-03-03 18:08:43 +01:00
Christoph Wurst 6bf4d07a3c
Allow admins to hide event exports
occ config:app:set calendar hide_event_download --value=yes

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2022-03-03 17:13:07 +01:00
Christoph Wurst ab11a0819d
Mark background jobs as time sensitive/insensitive
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2022-02-18 17:36:25 +01:00
Richard Steinmetz 1d6abdb7bd
Limit how far in the future appointments can be booked
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2022-01-11 15:49:34 +01:00
Joas Schilling bd26c24850
Fix SQL error when deleting a user 2021-12-04 13:44:22 +01:00
Anna Larch 82acd3afd1 Check for TRANSP and CANCELLED property when conflict checking
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-12-02 15:15:51 +01:00
Richard Steinmetz 8b14bc738f
Fix freebusyUris naming inconsistencies
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2021-12-01 16:49:45 +01:00
Christoph Wurst b92fc6731d
Merge pull request #3755 from nextcloud/fix/lint-for-php-72
Add php 7.2 linter and fix errors
2021-12-01 09:28:00 +01:00
Anna Larch 358659bfb8 Add php 7.2 linter and fix errors
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-30 15:42:38 +01:00
Thomas Citharel 8a962b030f
Remove usages of executeStatement
executeStatement is available only in Nextcloud 22

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2021-11-30 15:08:16 +01:00
Anna Larch 38fc863412 Add Metadata for Appointments Pre- and Post Events
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-29 16:10:36 +01:00
Christoph Wurst 693b1fb8a5
Log debug infos of appointment slots
The logic is a black box otherwise and impossible to debug in
production.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-29 14:15:40 +01:00
Anna Larch 06d2ae37ae Add preparation and followup duration events to calendar
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-29 11:34:50 +01:00
rakekniven 31e505899e
l10n: Changed case of word
Reported at Transifex.

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
2021-11-27 16:50:47 +01:00
Christoph Wurst 04a051ac97
Merge pull request #3732 from nextcloud/fix/appointment-status-typo
Fix appointment event status typo
2021-11-26 22:21:02 +01:00
Christoph Wurst c1b2ffd0cc
Fix appointment event status typo
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-26 19:55:12 +01:00
Christoph Wurst 48bb1555da
Add default reminders to appointments
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-26 16:47:03 +01:00
Christoph Wurst ce258e13e8
Do not multiple event length x60
The length is in seconds already.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-26 10:43:14 +01:00
Christoph Wurst f88e39f507
Delete appointment configs when the user is deleted
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:34 +01:00
Anna Larch 508618780e
Change rounding logic to use interval instead of lenght
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:34 +01:00
Christoph Wurst c5bdbd4b36
Fix wrong identifier for the target calendar
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:34 +01:00
Christoph Wurst 8812eb7e88
Catch null HTTP status
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:34 +01:00
Christoph Wurst 26e40b684f
Fix tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:33 +01:00
Christoph Wurst 8d71b7955f
Drop dead code
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:33 +01:00
Christoph Wurst 69d6225dd5
Drop dead code
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:33 +01:00
Christoph Wurst 09ddffbe52
Drop dead code
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:33 +01:00
Christoph Wurst 0364647289
Use routes via name
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:33 +01:00
Christoph Wurst a10fc3ddd8
Filter appointment configs on a db level
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:33 +01:00
Christoph Wurst 50393bb0f4
Fix time before next slot
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:33 +01:00
Christoph Wurst 233aadf1ff
Set the time zone on availability start and end time stamps
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:32 +01:00
Christoph Wurst 3d29295091
Add appointments availability settings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:32 +01:00
Christoph Wurst 8c63dc09f2
Format code
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:32 +01:00
Anna Larch fdac0052a5
Modify data structure of availability
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:32 +01:00
Anna Larch 34743dbb1a
Removed times 60 multiplier for appointments
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:32 +01:00
Anna Larch 3fe1fe790a
Add interval logic
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:32 +01:00
Anna Larch 9b21971a27
Add booking mechanism for apptments
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:32 +01:00
Christoph Wurst ad9ad0ecd5
Do not conflict appointments with cancelled or free events
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:31 +01:00
Christoph Wurst 1d9dcb436c
Fix appointments daily max filter
* Look into all of the principal's calendars
* Do the filtering for our special property in PHP

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:31 +01:00
Christoph Wurst 2d163a05d2
Fix appointments availability handling: start, end and preparation time
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:31 +01:00
Richard Steinmetz ea317651e3
Implement CRUD UI for appointment configs
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2021-11-25 16:06:30 +01:00
Christoph Wurst 13b3ed4a63
Apply php-cs-fixer auto fixes
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:30 +01:00
Christoph Wurst 26965e9713
Do not switch to midnight time twice
Otherwise timezones with large offsets will make the day shift away by
two full days.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:30 +01:00
Christoph Wurst 6dad5d9d61
Fix appointments daily max filter if there is no limit
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:30 +01:00
Anna Larch 544157fc76
Add booking mechanism
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:30 +01:00
Anna Larch 450fb6b08d
Add new properties to appointment config entity
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:29 +01:00
Anna Larch d39f1dad78
Modify Migration for Appointments
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:29 +01:00
Christoph Wurst 40d21302a0
Add REST API for appointment configs
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:29 +01:00
Christoph Wurst ef2b3d56eb
Prefill visitor name and email
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:29 +01:00
Christoph Wurst a902e1aa46
Add an appointment booking page
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:29 +01:00
Christoph Wurst e1e97a7dcf
Add profile page integration for appointments
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:29 +01:00
Christoph Wurst 3104adcf81
Add appointments overview page
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:29 +01:00
Anna Larch 9087968333
Appointments Slot Support
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-11-25 16:06:29 +01:00
Joas Schilling c28f61c63f
Fix Talk conversation creation with NC22
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-07-09 20:15:07 +02:00
John Molakvoæ (skjnldsv) c6709c7f32 Bump deps and use npm7
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2021-06-25 14:38:07 +02:00
Thomas Citharel 43cd3d1108
Redirect public view to public calendar ics endpoint if requested with Accept: 'text/calendar'
The server already does the request with the following header `Accept: 'text/calendar, application/calendar+json, application/calendar+xml'`. `text/calendar` isn't a MIME type requested by common browsers.

Closes https://github.com/nextcloud/server/issues/17746

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2021-06-22 18:33:27 +02:00
Valdnet 85cc0e87d4
l10n: Extract a space from the translation
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2021-05-16 16:31:54 +02:00
Matteo Settenvini bea17a7109 Add defaultReminder setting
Add a setting to the app state that can be reused
when creating new events to set a default alarm / reminder.

Signed-off-by: Matteo Settenvini <matteo@member.fsf.org>
2021-04-08 12:42:50 +02:00
Christoph Wurst 8db55b6710
Test against php8
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-01-14 16:13:24 +01:00
dependabot[bot] 0de6d3862d
Bump nextcloud/coding-standard from 0.3.0 to 0.5.0
Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard) from 0.3.0 to 0.5.0.
- [Release notes](https://github.com/nextcloud/coding-standard/releases)
- [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/coding-standard/compare/v0.3.0...v0.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-01-11 15:54:28 +01:00
Jean-Guilhem Rouel 1a8cc8fd79
Add list views per week and month
Signed-off-by: Jean-Guilhem Rouel <jean-gui@w3.org>

Translation of buttons for list views

Signed-off-by: Jean-Guilhem Rouel <jean-gui@w3.org>

Show location in list views when available

Signed-off-by: Jean-Guilhem Rouel <jean-gui@w3.org>

Remove unneeded code per https://github.com/nextcloud/calendar/pull/2476#discussion_r479793226

Signed-off-by: Jean-Guilhem Rouel <jean-gui@w3.org>

Fix location, parent class changed

Signed-off-by: Jean-Guilhem Rouel <jean-gui@w3.org>

Show start of description in list views, if available.

Signed-off-by: Jean-Guilhem Rouel <jean-gui@w3.org>

Add start of description if available in list view

Signed-off-by: Jean-Guilhem Rouel <jean-gui@w3.org>

Remove week list view

Signed-off-by: Jean-Guilhem Rouel <jean-gui@w3.org>
2020-09-03 15:55:19 +02:00
Julius Härtl eb1c1aab7b
Implement Calendar Dashboard Widget
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-28 18:53:14 +02:00
Georg Ehrke 2b419f05c8
Fix route for public link emails
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-21 10:45:44 +02:00
Georg Ehrke 32c1e9e95a
Add tasks_enabled to Initial State Service
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-16 17:53:30 +02:00
Georg Ehrke ef1826b6f5
Apply composer cs:fix
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-16 10:24:21 +02:00
Boris Fritscher 4de349503c
add show_tasks to php test
Signed-off-by: Boris Fritscher <boris@fritscher.ch>
2020-04-16 10:18:07 +02:00
Boris Fritscher e96f559fd4
Show tasks in calendar
- supports taks in mixed calendars or on task only calendars
- feature can be toggled in settings
- checkbox icon adapts to light and dark text and is checked if task is
done
- if start date is available event duration is set from start to due
date
- clicking on event redirects to task app

Signed-off-by: Boris Fritscher <boris@fritscher.ch>
2020-04-16 10:18:02 +02:00
Georg Ehrke 5402ea8949
Automatic code-style fix
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-15 13:06:37 +02:00
Roeland Jago Douma 6a94f1c396
Merge pull request #2087 from nextcloud/fix/embeded-csp
Allow embedding in the CSP
2020-03-18 19:22:26 +01:00
Roeland Jago Douma c92f57679d
Allow embedding in the CSP
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-03-18 16:32:30 +01:00
Georg Ehrke 33b40ada06
Readd @NoSameSiteCookieRequired to embedding route
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-18 12:30:02 +01:00
Georg Ehrke 953d4220eb
Add slotDuration to ConfigController and ViewControllers
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-02-28 16:04:21 +01:00
Georg Ehrke 109c7cf7e5
Add eventLimit option in View and ConfigController
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-02-24 14:12:59 +01:00
Georg Ehrke cc171a31ce
fixes #1759: Use InitialState service
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-02-24 13:40:41 +01:00
Thomas Citharel 61bbb79550
Move navigation to appinfo
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-02-10 22:47:47 +01:00
Georg Ehrke d5bcb558a7
replace old views in case migration didn't run correctly
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-17 19:00:39 +01:00
Georg Ehrke 313b795775
Respect appvalue settings for public routes
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-16 11:54:35 +01:00
Georg Ehrke 7d2902143b
Also set talk_enabled in PublicViewController
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-16 10:50:46 +01:00
Georg Ehrke babcc11d13
Allow to override defaults of calendar-app
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-15 11:01:29 +01:00