3a00ab0d0e
Switched exclusivity, initial bugfix was incorrect
2021-08-16 22:51:52 +00:00
03cfd4ba8b
Detect conflicts when the time is the same as startTime
2021-08-14 15:01:05 +00:00
92d3f08f70
Merge branch 'main' into bugfix/eventType-merge-artifacts
2021-08-14 14:56:34 +00:00
5a5e61739b
Removed faulty check
2021-08-08 21:41:02 +02:00
560bd19472
Merge branch 'main' into bugfix/unify-email-sending
2021-08-08 21:21:33 +02:00
72b62cd49a
Removed selectedEventType + fixed missing booking.eventTypeId
2021-08-04 20:03:20 +00:00
6977b74f35
Merge pull request #411 from alishaz-polymath/main
...
Added 'Add Guest' button at the confirm booking step
2021-08-04 20:17:30 +02:00
00069fa9a7
Added -Add guest- button at confirm booking step, and minor code improvement
2021-08-04 16:09:43 +05:30
78de56b7f5
Missing dayjs().isBetween plugin + format Z explicitly
2021-08-03 10:14:20 +00:00
df161d5498
Added location to bookings table
2021-07-25 14:37:22 +02:00
a97862d4b8
Process event location in EventManager
2021-07-25 14:19:49 +02:00
86e2add30f
Resolved conflicts; included reference creation into EventManager; use EventManager everywhere
2021-07-24 22:24:00 +02:00
7aff32fb50
Only send single mail when booking zoom
2021-07-20 20:07:59 +02:00
0c975cdcbc
fixed codacy issues
2021-07-18 21:22:39 +02:00
a2bf242c9e
opt in booking
2021-07-18 20:28:54 +02:00
b4ed8ae87e
Merge branch 'main' into bugfix/unify-email-sending
2021-07-18 15:12:18 +02:00
45689059c7
Feat/cal 95/date range on event types ( #353 )
...
* add edit links to events on dashboard
* fit elements on screen for mobile
* initialize components for consistent text styles
* add more fine grained width/height settings
* add higher level setting for when an event is available
- db: add supporting values to period allow setting an amount of days,
a range, or unlimited number days an event is available
* fix issue where periodDates are null
* return minimal required data, handle date parsing
* [ui] limit booking days based on user period settings
* api: validate user period settings
* [db] migration for event type period settings
2021-07-15 09:10:26 -05:00
daecc1e0e4
Created EventManager in order to unify event CRUD logic
2021-07-15 03:19:30 +02:00
36b258f4b7
safely check user availability ( #352 )
2021-07-09 10:55:02 -05:00
5c4a9c32d1
Add application logger ( #332 )
...
* add application logger
* use logger
2021-07-09 10:49:42 -05:00
2f73997e72
safely check isAvailable ( #331 )
...
fix issue where checking availability throws an error
2021-07-07 11:53:33 -05:00
dfb9870894
hotfix
2021-06-29 18:17:09 +02:00
099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token
2021-06-29 16:19:20 +01:00
d1bdac45eb
dont allow user to book a past date
2021-06-28 19:39:08 -05:00
f918f220eb
Fixed Zoom Auth
2021-06-29 02:21:08 +02:00
b5b480f7e2
hotfix for booking
2021-06-26 19:48:24 +02:00
a53cdf2660
fix: issue where user could book a meeting when unavailable
2021-06-24 16:21:25 -05:00
646ff4a107
eslint fixes
2021-06-24 18:12:22 +02:00
917b2c4821
Merge branch 'main' into feature/refresh-tokens-and-error-handling
2021-06-24 18:03:54 +02:00
7690350124
feat: allow users to set google meet as a location for events ( #287 )
...
* feat: allow users to set google meet as a location for events
- add google meet location with support for other integrations
* return location types from server
also avoids potential leaks of user credentials
* chore: remove unused variable
* fix: return minimal required data from server
2021-06-21 18:15:29 -05:00
22a009edd2
fixes after merge
2021-06-21 18:15:05 +02:00
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
931e6b26f1
error handling WIP
2021-06-20 21:02:15 +02:00
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
869ba9b97c
Implemented reschedule mail and fixed bug that rescheduling weren't saved
2021-06-17 02:44:13 +02:00
3366a05c1d
Implemented legacy method to send email even if there is no integration
2021-06-17 01:04:08 +02:00
f56ced0ff1
Re-implemented event confirmation mails object based
2021-06-17 00:56:02 +02:00
04e0b55b51
Introduced more classes for event mails
2021-06-17 00:26:51 +02:00
e37dd017c8
Introduced EventOwnerMail and VideoEventOwnerMail as class based implementations
2021-06-16 23:40:13 +02:00
51a8bafaa7
Full zoom integration (except availability check)
2021-06-16 22:14:44 +02:00
4fb0fbfe07
Made event name customizable
2021-06-15 17:26:16 +02:00
c4455b74ba
Rescheduling zoom works
2021-06-14 18:55:20 +02:00
8e9868db30
Properly concat results and properly handle zoom meeting uuids
2021-06-14 18:47:05 +02:00
7ecb7f22e3
Merge branch 'main' into feature/zoom-integration
2021-06-14 17:17:09 +02:00
2ba98c5dac
Test setup to try zoom meeting creation
2021-06-13 15:57:01 +02:00
8227e733e6
Append reschedule/cancel also to event description
2021-06-13 00:37:35 +02:00
cb9d749310
Send email when no integrations are present as well
2021-06-10 23:18:57 +02:00
01da470664
Removed whitespaces
2021-06-10 01:19:46 +02:00
6c92e2fe1b
Implemented short UUID as UID
2021-06-10 00:51:09 +02:00
af08c74c8a
Implemented rescheduling and concurrent usage of all integrations
2021-06-09 21:46:41 +02:00
Alex van Andel