Malte Delfs
|
50d325d20a
|
added schema for EventTypeCustomInput
|
2021-06-19 20:55:40 +02:00 |
|
Malte Delfs
|
543482ca52
|
Merge branch 'main' into feature/custom-fields-on-the-booking-page
# Conflicts:
# pages/api/availability/eventtype.ts
# pages/availability/event/[type].tsx
|
2021-06-19 20:47:31 +02:00 |
|
Bailey Pumfleet
|
6d7ec7fa66
|
Merge pull request #289 from femyeda/hotfix/500-on-type-page
fix: eventType not defined on [user]/[type]
|
2021-06-19 16:19:39 +01:00 |
|
femyeda
|
ad0b561cca
|
fix: eventType not defined on [user]/[type]
|
2021-06-19 10:17:23 -05:00 |
|
Peer_Rich
|
fbc504f670
|
Merge pull request #288 from femyeda/revert-286-bugfix/cancellation-eventtype-null
|
2021-06-19 15:55:37 +01:00 |
|
Femi Odugbesan
|
de4c8f75e0
|
Revert "Fixed cancellation bug: "cannot read property 'length' of null""
|
2021-06-19 09:14:24 -05:00 |
|
Bailey Pumfleet
|
11fc0f0d2a
|
Merge pull request #286 from Nico-J/bugfix/cancellation-eventtype-null
|
2021-06-19 09:24:19 +01:00 |
|
nicolas
|
11ba59be9c
|
Fixes #281
|
2021-06-19 03:40:38 +02:00 |
|
Bailey Pumfleet
|
440bee0a5f
|
Merge pull request #285 from emrysal/bugfix/throw-404-when-eventType-missing
|
2021-06-18 23:35:42 +01:00 |
|
Alex van Andel
|
cc1b3fa7dd
|
Return 404 when requesting event url that does not exist
|
2021-06-18 20:41:12 +00:00 |
|
Bailey Pumfleet
|
aed5af0f5e
|
Merge pull request #284 from Malte-D/hotfix/selected-calendars
|
2021-06-18 21:27:10 +01:00 |
|
Malte Delfs
|
95a99c620e
|
selected calendars hotfix
|
2021-06-18 22:11:13 +02:00 |
|
Malte Delfs
|
76b72f64d8
|
event type custom input WIP
|
2021-06-18 21:58:42 +02:00 |
|
Bailey Pumfleet
|
2441f47c10
|
Fix layout issue with event types
|
2021-06-18 17:21:39 +01:00 |
|
Bailey Pumfleet
|
81246edab2
|
Merge pull request #268 from emrysal/hotfix/ics-month-error
Fixes #266: ICS event is off by one month
|
2021-06-18 17:04:37 +01:00 |
|
Bailey Pumfleet
|
9f0a80ac87
|
Merge pull request #275 from Malte-D/feature/add-buffer-times-for-appointments
Implemented a configurable buffer between events
|
2021-06-18 17:04:12 +01:00 |
|
Bailey Pumfleet
|
1b1c712c89
|
Merge branch 'main' into feature/add-buffer-times-for-appointments
|
2021-06-18 17:04:05 +01:00 |
|
Bailey Pumfleet
|
ecc36a5a0c
|
Merge pull request #273 from emrysal/bugfix/add-email-verification-to-migrations
Added migrations for adding external users
|
2021-06-18 17:01:31 +01:00 |
|
Bailey Pumfleet
|
159a7e20a5
|
Merge pull request #272 from Malte-D/feature/customise-event-names
Feature/customise event names
|
2021-06-18 17:01:00 +01:00 |
|
Bailey Pumfleet
|
90c1ff25bf
|
Merge branch 'main' into feature/customise-event-names
|
2021-06-18 17:00:52 +01:00 |
|
Bailey Pumfleet
|
2960463f77
|
Merge pull request #267 from Malte-D/feature/select-calendars-to-check-for-availability
Feature: select calendars to check for availability
|
2021-06-18 17:00:05 +01:00 |
|
Malte Delfs
|
d2466440f9
|
removed debug logging
|
2021-06-18 14:03:31 +02:00 |
|
Malte Delfs
|
50bc6b480e
|
minor change
|
2021-06-18 14:00:53 +02:00 |
|
Peer_Rich
|
8bf556c742
|
Merge pull request #279 from emrysal/bugfix/useEffect-fires-twice
Updated useEffect so it only fires once (added [])
|
2021-06-18 11:35:41 +01:00 |
|
Peer_Rich
|
066032a219
|
Merge pull request #276 from calendso/manage-subscription
|
2021-06-18 09:31:08 +01:00 |
|
Alex van Andel
|
7584b77811
|
Updated useEffect so it only fires once (added [])
|
2021-06-17 19:29:42 +00:00 |
|
Peer Richelsen
|
1de9ccff3a
|
minor changes
|
2021-06-16 14:04:04 +01:00 |
|
Peer Richelsen
|
ea75e8974d
|
added getinitialprops
|
2021-06-16 13:44:25 +01:00 |
|
Peer Richelsen
|
87f7984d76
|
added billing to settings
|
2021-06-16 13:42:30 +01:00 |
|
Malte Delfs
|
68bca9e703
|
Implemented a configurable buffer between events
|
2021-06-15 18:19:00 +02:00 |
|
Alex van Andel
|
13d318f4e3
|
Added migrations for adding external users
|
2021-06-15 15:41:45 +00:00 |
|
Malte Delfs
|
738d91787b
|
changed naming
|
2021-06-15 17:27:56 +02:00 |
|
Malte Delfs
|
4fb0fbfe07
|
Made event name customizable
|
2021-06-15 17:26:16 +02:00 |
|
Malte Delfs
|
0dce92d4ae
|
added migration
|
2021-06-15 16:03:41 +02:00 |
|
Alex van Andel
|
dbd1721405
|
Fixes #266: ICS event is off by one month
|
2021-06-14 19:00:37 +00:00 |
|
Malte Delfs
|
ad69feed70
|
Merge branch 'main' into feature/select-calendars-to-check-for-availability
|
2021-06-14 20:13:36 +02:00 |
|
Bailey Pumfleet
|
49cb191254
|
Merge pull request #261 from Nico-J/fix/add-migration-to-current-state
|
2021-06-14 19:06:56 +01:00 |
|
Malte Delfs
|
4caac5a88c
|
Layout fix
|
2021-06-14 19:55:55 +02:00 |
|
Malte Delfs
|
d3b8431699
|
Implemented calendar selection for availability checking.
Also upgraded outlook integration to be able to check all calendars instead of only the default one.
|
2021-06-14 19:45:24 +02:00 |
|
Bailey Pumfleet
|
8d6b30398b
|
Merge pull request #260 from Nico-J/feature/cancel-reschedule-in-event-description
|
2021-06-13 19:54:37 +01:00 |
|
nicolas
|
c66af610e5
|
Added migration for current db schema
|
2021-06-13 15:37:13 +02:00 |
|
nicolas
|
8227e733e6
|
Append reschedule/cancel also to event description
|
2021-06-13 00:37:35 +02:00 |
|
Bailey Pumfleet
|
a231ee6c0d
|
Merge pull request #251 from emrysal/feature/invite-external-users
Implements inviting external users to teams
|
2021-06-11 22:02:14 +01:00 |
|
Bailey Pumfleet
|
65c7960b76
|
Merge branch 'main' into feature/invite-external-users
|
2021-06-11 22:02:07 +01:00 |
|
Bailey Pumfleet
|
b7b644998a
|
Merge pull request #258 from Nico-J/bugfix/no-emails-sent-when-no-integration-added
|
2021-06-10 22:22:10 +01:00 |
|
Bailey Pumfleet
|
17ccf42976
|
Merge pull request #257 from Nico-J/feature/button-for-new-integration
|
2021-06-10 22:21:50 +01:00 |
|
nicolas
|
cb9d749310
|
Send email when no integrations are present as well
|
2021-06-10 23:18:57 +02:00 |
|
nicolas
|
d249c62620
|
Added button to add integrations
|
2021-06-10 22:54:48 +02:00 |
|
Bailey Pumfleet
|
6590775dd3
|
Merge pull request #256 from emrysal/main
|
2021-06-10 21:16:58 +01:00 |
|
Alex van Andel
|
16b090efd4
|
Codestyle adjusted & fixed the column behaviour on mobile
|
2021-06-10 18:49:11 +00:00 |
|