Malte Delfs
b5b480f7e2
hotfix for booking
2021-06-26 19:48:24 +02:00
Bailey Pumfleet
8394b12a71
Merge pull request #307 from femyeda/feat/cal-69/password-reset
...
Feat/cal 69/password reset
2021-06-25 16:52:36 +01:00
femyeda
e883ab591a
simplify expiry calculation, timezone unneccessary
2021-06-25 09:23:32 -05:00
femyeda
6fec24a69d
use lib folder
2021-06-25 09:21:21 -05:00
femyeda
ad657c0261
use proper response code
2021-06-25 09:17:39 -05:00
femyeda
2c29368337
fix: passwordResetLink uses correct page
2021-06-25 09:16:24 -05:00
femyeda
a53cdf2660
fix: issue where user could book a meeting when unavailable
2021-06-24 16:21:25 -05:00
Malte Delfs
646ff4a107
eslint fixes
2021-06-24 18:12:22 +02:00
Malte Delfs
917b2c4821
Merge branch 'main' into feature/refresh-tokens-and-error-handling
2021-06-24 18:03:54 +02:00
femyeda
ab1298e2ca
Allow user to reset password
2021-06-24 11:01:41 -05:00
Malte Delfs
0ea36cb3f8
added edit/remove for customEventTypeInputs
2021-06-22 17:10:52 +02:00
Femi Odugbesan
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
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
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
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
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
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
Malte Delfs
68bca9e703
Implemented a configurable buffer between events
2021-06-15 18:19:00 +02:00
Malte Delfs
4fb0fbfe07
Made event name customizable
2021-06-15 17:26:16 +02: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
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
Bailey Pumfleet
65c7960b76
Merge branch 'main' into feature/invite-external-users
2021-06-11 22:02:07 +01:00
nicolas
734d9ad243
Save whole JSON
2021-06-11 02:32:07 +02:00
nicolas
a9a569f876
Removed scopes variable
2021-06-11 02:17:22 +02:00
nicolas
f44c8b6326
Potentially first working version of token fetching for zoom
2021-06-11 02:14:36 +02:00
nicolas
697cae9cc9
Very rudimentary development version of zoom auth #6
2021-06-11 02:13:02 +02:00
nicolas
65a029acde
Very rudimentary development version of zoom auth #5
2021-06-11 02:10:56 +02:00
nicolas
615e59cde7
Very rudimentary development version of zoom auth #4
2021-06-11 02:08:47 +02:00
nicolas
46474c9c70
Very rudimentary development version of zoom auth #3
2021-06-11 02:07:02 +02:00
nicolas
a2f1462f10
Very rudimentary development version of zoom auth #2
2021-06-11 02:03:48 +02:00
