Commit Graph

400 Commits

Author SHA1 Message Date
Julien Veyssier 97681912d3 implement IButtonWidget and IIconWidget
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
Richard Steinmetz c5b5f162e0
Fix missing events in week view
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2022-08-23 10:33:56 +02:00
Joas Schilling 74e64c8ecc
Fix coding style
Signed-off-by: Joas Schilling <coding@schilljs.com>
2022-08-05 08:59:41 +02:00
Christoph Wurst ca2abbb2e8
Revert "Move event rendering to vue"
This reverts commit 5237a42fc1.
2022-07-06 10:35:20 +02:00
Christoph Wurst 7582e1c75f
Revert "Show icon for events with attendees"
This reverts commit 5ecaffefed.
2022-07-06 10:35:18 +02:00
Richard Steinmetz ad9c3fd870
Revert #4305
Reintroduces #4290

I tried hacking this and preventing the endless loop but I didn't
succeed. Let's revert this for now until we find a better solution.

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2022-07-01 11:30:51 +02:00
Richard Steinmetz de2b23e9f6
Fix color dot and event alignment
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2022-06-21 16:02:17 +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 5ecaffefed
Show icon for events with attendees
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2022-06-03 16:51:53 +02:00
julia.kirschenheuter 5237a42fc1 Move event rendering to vue
Fix tests
Fix styles
Fix linter

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
2022-06-01 16:35:51 +02:00
szaimen 8cb6b98d48 fix tests
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-04-03 15:28:04 +02: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
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
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
Richard Steinmetz a93466d5c7
Merge pull request #3871 from nextcloud/dependabot/npm_and_yarn/ical.js-1.5.0
Bump ical.js from 1.4.0 to 1.5.0
2022-01-14 11:41:13 +01:00
Richard Steinmetz bbfb7ea490
Fix reminder time zone picker and formatting
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2022-01-12 09:06:46 +01:00
Richard Steinmetz 91ba5c13eb
Remove obsolete recurrence rule test
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2022-01-11 16:38:39 +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
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
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 26e40b684f
Fix tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-11-25 16:06:33 +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 a902e1aa46
Add an appointment booking 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
Richard Steinmetz e5a502798f Merge alarm, repeat and details tabs
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2021-10-13 14:24:02 +02:00
Raimund Schlüßler 9f79bb3e27
Replace all icons with material design variant
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
2021-09-19 12:26:28 +02:00
Richard Steinmetz 1fa42566f5
Show more information about rooms/resources while searching
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2021-09-08 13:53:22 +02:00
Richard Steinmetz e057fe1c17
Use bundled version of calendar-js
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2021-09-05 08:43:34 +02:00
Christoph Wurst ecdd794832
Use tz data from @nextcloud/calendar-js v1.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-07-28 09:01:05 +02:00
Christoph Wurst 205a2e1d4c
Install @nextcloud/calendar-js via the npm registry
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-07-27 08:55:52 +02: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
Richard Steinmetz d09b74f3ca
Move resource list and search to a separate tab
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2021-07-05 16:39:02 +02:00
Christoph Wurst 1b9535d3a9
Merge pull request #3232 from nextcloud/fix/noid/properly-decode-uris
Properly decode escaped principal urls
2021-06-25 13:53:42 +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
Richard Steinmetz 8c294b12e1
Properly decode escaped principal urls
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2021-06-20 16:51:47 +02:00
Andreas Demmelbauer fc45b65645 make shared calendars visible/enabled by default
Signed-off-by: Andreas Demmelbauer <git@notice.at>
2021-06-11 20:40:21 +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 e0ceafc2be
Improve free/busy colors
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-03-11 16:08:23 +01:00
Robert Spencer 57763ea988 Vary illustration when multiple images match
Randomly select an illustration from the images that match the
title of the event.  The illustration is chosen on a hash of the
event title so is the same for the same event every time.

Signed-off-by: Robert Spencer <general@robertandrewspencer.com>
2021-02-01 14:38:17 +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
Georg Ehrke c6e52a879c
Replace fragile moment mocks with snapshot testing
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-09-04 14:44:49 +02:00
Georg Ehrke bf855750c7
Hide extra description with CSS
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-09-03 16:04:09 +02:00
Georg Ehrke c90dff705e
Merge pull request #2520 from nextcloud/bugfix/noid/stop_highlighting_weekends
Remove highlighting of weekends
2020-09-02 19:51:53 +02:00
Georg Ehrke 0a57dea010
Remove highlighting of weekends
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-28 19:39:30 +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 ba76437f46
Adapt our handlers / plugins to FC 5
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-28 15:20:37 +02:00
Georg Ehrke 20bac588ce
Restructure src/fullcalendar
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-28 09:01:30 +02:00
Georg Ehrke 974c367572
Merge pull request #2497 from nextcloud/bugfix/noid/event_source_readonly_regression
Fix read-only property of fullcalendar event sources
2020-08-25 10:51:15 +02:00
Georg Ehrke 56d9de23ee
Cancelled -> Canceled
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-22 22:37:31 +02:00
Georg Ehrke ec69fa3db5
Fix read-only property of fullcalendar event sources
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-22 12:10:54 +02:00
Georg Ehrke 4d1a456340
Merge pull request #2483 from nextcloud/bugfix/noid/better_external_routes
Add routes to allow creating / editing events from outside
2020-08-21 17:06:30 +02:00
Georg Ehrke a699f6b862
Add routes to allow creating / editing events from outside
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-21 14:43:16 +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 e2237b6ba0
Cleanup and tests for some Stores
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-06-11 15:33:04 +02:00
Thomas Citharel c37f76282b
Fix timezone names
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-05-29 21:49:14 +02:00
Georg Ehrke 8785e4fbb0
Increase test coverage for new Show tasks feature
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-16 20:18:10 +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
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
Georg Ehrke 5402ea8949
Automatic code-style fix
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-15 13:06:37 +02:00
Georg Ehrke 70e5e37057
Do not allow multiline summaries in Calendar-grid
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-09 12:02:59 +02:00
Georg Ehrke 6f5966a2b4
Cleanup models and add full unit test coverage
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-01 17:48:23 +02:00
Georg Ehrke ccfa924035
Add custom color picker to sidebar editor
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-02 10:39:52 +01:00
Georg Ehrke 8b872d207f
Add getHexForColorName and getClosestCSS3ColorNameForHex to utils/color.js
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-02 10:16:28 +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 b22e8f6f58
Merge pull request #2017 from nextcloud/bugfix/1944/fix_parsing_of_firstdayParam
Fix parsing of First day parameter
2020-02-24 18:56:05 +01:00
Georg Ehrke 567e71c36c
Merge pull request #2020 from nextcloud/bugfix/1963/display_issue_equal_dtstart_dtend
Bugfix/1963/display issue equal dtstart dtend
2020-02-24 18:10:03 +01:00
Georg Ehrke 17f924c09c
Check for NaN components in getDateFromFirstdayParam
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-02-24 18:09:16 +01:00
Georg Ehrke f36433818b
Handle events where DTSTART is equal to DTEND
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-02-24 17:53:29 +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
Georg Ehrke 803118c1f1
Fix parsing of First day parameter
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-02-24 03:31:25 -08:00
Georg Ehrke 8ac724ebb3
Stop hardcoding saturday and sunday as weekend, change it based on locale
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-02-24 11:17:12 +01:00
Georg Ehrke 953aa4bb47
Fallback to calendarUri if displayname is undefined
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-31 15:30:49 +01:00
Georg Ehrke dd5c94ac49
Properly localize date in document title
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-29 15:54:23 +01:00
Georg Ehrke cdc76c2764
Replace Illustration matching with Regex to match word only, not substrings
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-26 18:55:35 +01:00
Georg Ehrke 494ab6070c
Position new event popover based on .fc-event for day and week view
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-20 17:09:55 +01:00
Georg Ehrke 270ced9b5c
Merge pull request #1864 from nextcloud/bugfix/1841/timezone_alias
Fix resolving timezone alias
2020-01-20 14:52:07 +01:00
Georg Ehrke 29c43f18e9
Fix resolving timezone alias
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-20 14:04:46 +01:00
Georg Ehrke e2c72b9339
Fallback value should be dayGridMonth, not month
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-17 19:25:00 +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 17104d6010
Merge pull request #1816 from nextcloud/feature/1787/defaults_for_usersettings
Allow to override defaults of calendar-app
2020-01-15 12:47:32 +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
Georg Ehrke ca50ef8a86
Merge pull request #1806 from nextcloud/bugfix/noid/window_resize
Handle window resize on our own instead of relying on fullcalendar
2020-01-15 10:27:57 +01:00
Justin Sleep 45640767b8 Add a reminder icon for events with notifications
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
2020-01-14 10:27:55 -06:00
Georg Ehrke 0c908e9238
Handle window resize on our own instead of relying on fullcalendar
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-01-14 14:20:25 +01:00