Malte Delfs
|
22a009edd2
|
fixes after merge
|
2021-06-21 18:15:05 +02:00 |
|
Malte Delfs
|
88ab985ac4
|
Merge branch 'main' into feature/refresh-tokens-and-error-handling
# Conflicts:
# lib/calendarClient.ts
# pages/[user]/[type].tsx
# pages/[user]/book.tsx
# pages/api/book/[user].ts
|
2021-06-21 17:56:14 +02:00 |
|
Bailey Pumfleet
|
e9b75b90ba
|
Merge branch 'main' into feature/custom-fields-on-the-booking-page
|
2021-06-21 11:35:59 +01:00 |
|
Malte Delfs
|
931e6b26f1
|
error handling WIP
|
2021-06-20 21:02:15 +02:00 |
|
nicolas
|
ebc42f0c96
|
Merge branch 'main' into feature/zoom-integration
# Conflicts:
# lib/calendarClient.ts
# lib/emails/new-event.ts
# pages/[user]/book.tsx
# pages/api/availability/[user].ts
# pages/api/book/[user].ts
# pages/integrations/index.tsx
|
2021-06-20 16:37:51 +02:00 |
|
Malte Delfs
|
6dc5efd6ee
|
fixed additional notes
|
2021-06-19 21:54:22 +02:00 |
|
Malte Delfs
|
653509d655
|
formatting cleanup
|
2021-06-19 21:51:18 +02:00 |
|
Malte Delfs
|
639341f701
|
show custom inputs on booking screen
|
2021-06-19 21:44:36 +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 |
|
femyeda
|
ad0b561cca
|
fix: eventType not defined on [user]/[type]
|
2021-06-19 10:17:23 -05: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 |
|
Alex van Andel
|
cc1b3fa7dd
|
Return 404 when requesting event url that does not exist
|
2021-06-18 20:41:12 +00: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
|
1b1c712c89
|
Merge branch 'main' into feature/add-buffer-times-for-appointments
|
2021-06-18 17:04:05 +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
|
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 |
|
Alex van Andel
|
7584b77811
|
Updated useEffect so it only fires once (added [])
|
2021-06-17 19:29:42 +00:00 |
|
Peer_Rich
|
b3c5752d67
|
updated integration description
|
2021-06-17 17:06:32 +01:00 |
|
nicolas
|
869ba9b97c
|
Implemented reschedule mail and fixed bug that rescheduling weren't saved
|
2021-06-17 02:44:13 +02:00 |
|
nicolas
|
a11641d7b9
|
Implemented common availability
|
2021-06-17 01:41:56 +02:00 |
|
nicolas
|
3366a05c1d
|
Implemented legacy method to send email even if there is no integration
|
2021-06-17 01:04:08 +02:00 |
|
nicolas
|
f56ced0ff1
|
Re-implemented event confirmation mails object based
|
2021-06-17 00:56:02 +02:00 |
|
nicolas
|
04e0b55b51
|
Introduced more classes for event mails
|
2021-06-17 00:26:51 +02:00 |
|
nicolas
|
e37dd017c8
|
Introduced EventOwnerMail and VideoEventOwnerMail as class based implementations
|
2021-06-16 23:40:13 +02:00 |
|
nicolas
|
51a8bafaa7
|
Full zoom integration (except availability check)
|
2021-06-16 22:14:44 +02: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 |
|
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 |
|
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 |
|
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 |
|
nicolas
|
49abf06ce6
|
Deleting zoom also works
|
2021-06-14 19:00:17 +02:00 |
|
nicolas
|
c4455b74ba
|
Rescheduling zoom works
|
2021-06-14 18:55:20 +02:00 |
|
nicolas
|
8e9868db30
|
Properly concat results and properly handle zoom meeting uuids
|
2021-06-14 18:47:05 +02:00 |
|
nicolas
|
7ecb7f22e3
|
Merge branch 'main' into feature/zoom-integration
|
2021-06-14 17:17:09 +02:00 |
|
nicolas
|
2ba98c5dac
|
Test setup to try zoom meeting creation
|
2021-06-13 15:57:01 +02:00 |
|
nicolas
|
30f30d7669
|
Renamed zoom to zoomvideo
|
2021-06-13 14:04:03 +02:00 |
|
nicolas
|
0bb4678bf7
|
Added subtitle to zoom integrations
|
2021-06-13 13:59:40 +02:00 |
|
nicolas
|
8227e733e6
|
Append reschedule/cancel also to event description
|
2021-06-13 00:37:35 +02:00 |
|