Commit Graph

473 Commits (bfc7cce6888382b5bbccc04b316d15b5bc11deba)

Author SHA1 Message Date
Alex van Andel bfc7cce688 Make sure the slots equal the month and date of the invitee so we can check isSame with freebusy 2021-06-30 15:27:49 +00:00
Alex van Andel 9fe11ea10d Make sure the currently selected date is active 2021-06-30 02:41:22 +00:00
Alex van Andel f7f5e2cc17 Re-instated ResetPasswordRequest, almost oops 2021-06-30 02:05:24 +00:00
Alex van Andel 90e4091b06 Rehydrated yarn.lock file 2021-06-30 01:55:06 +00:00
Alex van Andel fdee619fbf Removed changes to calendso.yaml 2021-06-30 01:50:10 +00:00
Alex van Andel ee603a0a27 Added migration for Availability and related 2021-06-30 01:48:23 +00:00
Alex van Andel 8c589b9dc1 Merge branch 'main' into feature/scheduling 2021-06-30 01:45:24 +00:00
Alex van Andel e78a34e2ce Implements slot logic with the DatePicker, more tests for slots 2021-06-30 01:35:08 +00:00
Alex van Andel 0da99f0d07 Removed code bloat, fixed tests 2021-06-29 22:35:13 +00:00
Alex van Andel 5d30586a24 Heavily simplified the startTime and endTime display by removing dayjs from SetTimesModal 2021-06-29 22:00:25 +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 89abba1d53
Merge pull request #320 from Nico-J/bugfix/zoom-invalid-token
Fixed Zoom Auth
2021-06-29 16:19:28 +01:00
Bailey Pumfleet 099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token 2021-06-29 16:19:20 +01:00
Bailey Pumfleet 0f840ac859
Merge pull request #325 from FarazPatankar/main 2021-06-29 14:13:04 +01:00
Faraz Patankar 272cee28d1 add railway button 2021-06-29 16:28:42 +04: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
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