Commit Graph

4 Commits (02dd0eb8e2c4cf25031c2d5dacd7514d2f1db974)

Author SHA1 Message Date
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 68bca9e703 Implemented a configurable buffer between events 2021-06-15 18:19:00 +02:00
Bailey Pumfleet 209791d86d Get user ID from session instead of looking it up 2021-05-11 10:21:05 +01:00
Bailey Pumfleet 167f981522 Change start and end times of day 2021-04-13 17:16:32 +01:00