Commit Graph

130 Commits (36b258f4b792a8b24168764691bd590d6869a10c)

Author SHA1 Message Date
Femi Odugbesan 36b258f4b7
safely check user availability (#352) 2021-07-09 10:55:02 -05:00
Femi Odugbesan 5c4a9c32d1
Add application logger (#332)
* add application logger

* use logger
2021-07-09 10:49:42 -05:00
Femi Odugbesan 2f73997e72
safely check isAvailable (#331)
fix issue where checking availability throws an error
2021-07-07 11:53:33 -05:00
nicolas 3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Bailey Pumfleet ad00e5fc0c
Merge pull request #333 from mihaic195/fix/teams-create-error-and-unauthenticated-request
Team API error and page
2021-07-07 10:56:16 +01:00
Bailey Pumfleet 43f899582f Fix issue where user ID is not fetched 2021-07-06 22:09:53 +01:00
mihaic195 e315b272f5
Merge branch 'main' into fix/teams-create-error-and-unauthenticated-request 2021-07-05 10:18:28 +03:00
mihaic195 6463b3ba37
fix codacy suggestions 2021-07-01 12:47:12 +03:00
Mihai C b91d021fc8
Update pages/api/teams.ts
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:29:55 +03:00
mihaic195 e10030e18b
fix api 500 and redirect to login if not authenticated when accessing /settings/team 2021-06-30 16:48:34 +03:00
Alex van Andel 8c589b9dc1 Merge branch 'main' into feature/scheduling 2021-06-30 01:45:24 +00:00
Bailey Pumfleet 3aa1e1716d
Merge pull request #327 from Malte-D/hotfix/book-user
hotfix for api/book/user
2021-06-29 17:20:49 +01:00
Malte Delfs dfb9870894 hotfix 2021-06-29 18:17:09 +02:00
Bailey Pumfleet 51c0556d30 Hide Calendso branding 2021-06-29 17:08:55 +01:00
Bailey Pumfleet 099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token 2021-06-29 16:19:20 +01:00
Alex van Andel 575747bcd3 Final thing to check is timezones, currently if I am in Kuala Lumpur the time is correct, but it jumps 8 hours due to being out of bound on Seoul. 2021-06-29 01:45:58 +00:00
femyeda d1bdac45eb dont allow user to book a past date 2021-06-28 19:39:08 -05:00
nicolas f918f220eb Fixed Zoom Auth 2021-06-29 02:21:08 +02:00
Alex van Andel 7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
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
Alex van Andel 1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00: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
Alex van Andel b2812deeff Merge branch 'main' into feature/scheduling 2021-06-21 20:37:19 +00: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
Alex van Andel f99729c392 Merged with main 2021-06-20 17:52:18 +00: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
Alex van Andel 9d5186f1e3 Functionality works, only thing left is a bit of cleaning up and all done 2021-06-16 22:27:27 +00:00
nicolas 04e0b55b51 Introduced more classes for event mails 2021-06-17 00:26:51 +02:00