Commit Graph

7358 Commits (92ad6526668dd2499769e6de521c3b4a5edaea6e)

Author SHA1 Message Date
femyeda e714bd5b8e use google events conference data version 1
- fix issue where google meet details were no longer add to the created event
2021-06-29 07:16:20 -05:00
Bailey Pumfleet 113185e089
Merge pull request #323 from mihaic195/fix/add-login-link-on-forgot-password-page 2021-06-29 09:50:56 +01:00
Bailey Pumfleet 9ad1d4fcda
Merge pull request #322 from femyeda/hotfix/user-can-book-a-day-in-past 2021-06-29 09:49:49 +01:00
mihaic195 39df7d61bc
fix: add login link on forgot password page 2021-06-29 11:45:54 +03: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
femyeda 8020576b06 update message for not available 2021-06-28 19:31:58 -05:00
nicolas f918f220eb Fixed Zoom Auth 2021-06-29 02:21:08 +02:00
Bailey Pumfleet f853865600
Merge pull request #319 from emrysal/hotfix/temporarily-recommend-NEXTAUTH_URL-for-vercel 2021-06-28 23:13:54 +01:00
Alex van Andel b4272ad7aa Merge branch 'main' of github.com:calendso/calendso into feature/scheduling 2021-06-28 19:53:07 +00:00
Bailey Pumfleet 588caa6394
Merge pull request #318 from emrysal/bugfix/add-migration-password-reset 2021-06-28 18:48:11 +01:00
Alex van Andel a17d477d20 Added NEXTAUTH_URL back to .env.example as it is required on Vercel 2021-06-28 17:47:40 +00:00
Alex van Andel e6ce82867c Added migration for ResetPasswordRequest 2021-06-28 15:39:45 +00:00
Bailey Pumfleet 5ebd9d5270
Merge pull request #315 from emrysal/bugfix/fixes-phoneinput-crashing
onChange callback got removed in eslint cleanups
2021-06-28 15:11:54 +01:00
Alex van Andel 52e68b682c Removed isOverride boolean, renamed 'Schedule' to 'Availability' 2021-06-28 04:24:15 +00:00
Alex van Andel 1eba242820 Compare busyTimes in UTC, re-implement hasErrors 2021-06-27 22:30:11 +00:00
Alex van Andel 698c64e657 Re-implemented * is all booked today in Slots() component 2021-06-27 22:02:27 +00:00
Alex van Andel 7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Alex van Andel 383ec64a7f onChange callback got removed in eslint cleanups
Triggered eslint:no-empty-function, this PR circumvents this by adding
a comment as part of the function body.
2021-06-27 13:51:06 +00:00
Malte Delfs c13e067f72
Merge pull request #314 from Malte-D/hotfix/booking
hotfix for booking
2021-06-26 19:53:45 +02:00
Malte Delfs b5b480f7e2 hotfix for booking 2021-06-26 19:48:24 +02:00
Bailey Pumfleet aa2e35d68e
Merge pull request #311 from Nico-J/feature/zoom-event-location
Added zoom as an event location and fixed linting
2021-06-25 16:52:52 +01: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
Bailey Pumfleet cc02558ac6
Merge pull request #310 from femyeda/fix-244-can-book-when-not-available
Fix 244 can book when not available
2021-06-25 16:51:28 +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
Alex van Andel 28edb86c14 Don't render location if there is none for now 2021-06-24 22:48:01 +00:00
nicolas bc47975316 Added zoom as an event location and fixed ESLint 2021-06-25 00:26:55 +02:00
Alex van Andel ef3274d8f3 Working version ready for testing
* More tests to be added to verify slots logic
* Adds Jest
* Implements logic to the booking code to take into account grayed days
* Slots take workhours into account

TODO: Improve the tests, evaluate the structure, small re-orgs here and
there for improved readability / better code
2021-06-24 22:15:18 +00:00
femyeda a53cdf2660 fix: issue where user could book a meeting when unavailable 2021-06-24 16:21:25 -05:00
femyeda 3c8b9da54d fix: busy times are shown on booking 2021-06-24 16:21:25 -05:00
Malte Delfs dada6a3a79
Merge pull request #309 from Malte-D/hotfix/booking-no-await
booking hotfix
2021-06-24 20:42:06 +02:00
Malte Delfs 9c3eea5257 booking hotfix 2021-06-24 20:41:26 +02:00
Malte Delfs c7bdecbad1
Merge pull request #308 from Malte-D/hotfix/mail-async
hotfix: made sendEmail async
2021-06-24 19:36:34 +02:00
Malte Delfs 2f20cf2968 made sendEmail async 2021-06-24 19:30:39 +02:00
Bailey Pumfleet 24f10e4f29
Merge pull request #296 from Malte-D/feature/refresh-tokens-and-error-handling
Feature/refresh tokens and error handling
2021-06-24 17:32:38 +01: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 ed92451126 The page was being rendered during the async router.replace call (#306)
* The page was being rendered during the async router.replace call

* Adding a different, slightly smaller fix
2021-06-24 11:01:41 -05:00
Bailey Pumfleet ea5692c20c Add bookings page 2021-06-24 11:01:41 -05:00
Peer Richelsen a1ddb873f0 minor change to reschedule info in email 2021-06-24 11:01:41 -05:00
Alex van Andel 5334c350e2
The page was being rendered during the async router.replace call (#306)
* The page was being rendered during the async router.replace call

* Adding a different, slightly smaller fix
2021-06-24 08:46:35 -05:00
Bailey Pumfleet ebb3e87284 Add bookings page 2021-06-24 14:36:31 +01:00
Peer Richelsen 20cd3bc52e minor change to reschedule info in email 2021-06-23 23:45:07 +01:00
femyeda 173d4cda77 dep: nodemailer types 2021-06-23 16:16:41 -05:00
femyeda 2ccbd61a31 dep: handlebars 2021-06-23 16:11:38 -05:00
Femi Odugbesan 2f7e303bcf
Revert "dep: superjson, plays nice with prisma dates" (#305) 2021-06-23 14:15:52 -05:00