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
Bailey Pumfleet
b12198e3a6
Merge pull request #303 from emrysal/bugfix/prevent-uppercase-usernames-going-forward
...
Prevent users from entering mixed case usernames
2021-06-23 17:18:33 +01:00
Bailey Pumfleet
c036e757d2
Merge pull request #302 from femyeda/superjson
...
dep: superjson, plays nice with prisma dates
2021-06-23 17:15:49 +01:00
Alex van Andel
1668785678
Prevent users from entering mixed case usernames
...
Booking pages are case insensitive new, so no more case sensitive
usernames.
2021-06-23 16:10:58 +00:00
femyeda
7a8222a5ca
dep: superjson
2021-06-23 09:42:52 -05:00
Peer Richelsen
afa2e19f03
added more meta data to booking page
2021-06-23 12:14:19 +01:00
Bailey Pumfleet
4d0e32d81e
Merge pull request #301 from emrysal/bugfix/lowercase-usernames
...
Lowercase the router.query.user & some typescript fixes
2021-06-23 11:30:02 +01:00
Bailey Pumfleet
629a34262e
Merge branch 'main' into bugfix/lowercase-usernames
2021-06-23 11:29:56 +01:00
Peer_Rich
c428c3f80e
Merge pull request #300 from Malte-D/feature/og-image
...
Added og-image to booking pages
2021-06-22 19:24:45 +01:00
Malte Delfs
0e27e7e3d9
changed og-image link
2021-06-22 20:14:28 +02:00
Alex van Andel
892ba8a335
Lowercase the router.query.user & some typescript fixes
2021-06-22 17:42:32 +00:00
Malte Delfs
e4b977c001
fix for single quotes
2021-06-22 18:01:03 +02:00
Malte Delfs
a3b4cbeadd
use https://github.com/calendso/og-image to show dynamic og-image of booking links with avatar and title of booking.
2021-06-22 17:52:52 +02:00
Alex van Andel
1dce84fa8f
Merge branch 'main' into feature/scheduling
2021-06-22 15:19:28 +00:00
Bailey Pumfleet
6c6d262184
Merge pull request #299 from Malte-D/bugfix/edit-custom-inputs
...
added edit/remove for customEventTypeInputs
2021-06-22 16:15:45 +01:00
Malte Delfs
0ea36cb3f8
added edit/remove for customEventTypeInputs
2021-06-22 17:10:52 +02:00
Bailey Pumfleet
68912ac290
Merge pull request #298 from emrysal/hotfix/fix-default-timeFormat
...
Updated timeFormat to something more sensible
2021-06-22 15:26:15 +01:00
Alex van Andel
78451a98b1
Updated timeFormat to something more sensible
2021-06-22 14:25:01 +00:00