917b2c4821
Merge branch 'main' into feature/refresh-tokens-and-error-handling
2021-06-24 18:03:54 +02:00
ab1298e2ca
Allow user to reset password
2021-06-24 11:01:41 -05:00
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
ea5692c20c
Add bookings page
2021-06-24 11:01:41 -05:00
a1ddb873f0
minor change to reschedule info in email
2021-06-24 11:01:41 -05:00
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
ebb3e87284
Add bookings page
2021-06-24 14:36:31 +01:00
20cd3bc52e
minor change to reschedule info in email
2021-06-23 23:45:07 +01:00
173d4cda77
dep: nodemailer types
2021-06-23 16:16:41 -05:00
2ccbd61a31
dep: handlebars
2021-06-23 16:11:38 -05:00
2f7e303bcf
Revert "dep: superjson, plays nice with prisma dates" ( #305 )
2021-06-23 14:15:52 -05:00
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
c036e757d2
Merge pull request #302 from femyeda/superjson
...
dep: superjson, plays nice with prisma dates
2021-06-23 17:15:49 +01:00
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
7a8222a5ca
dep: superjson
2021-06-23 09:42:52 -05:00
afa2e19f03
added more meta data to booking page
2021-06-23 12:14:19 +01:00
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
629a34262e
Merge branch 'main' into bugfix/lowercase-usernames
2021-06-23 11:29:56 +01:00
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
0e27e7e3d9
changed og-image link
2021-06-22 20:14:28 +02:00
892ba8a335
Lowercase the router.query.user & some typescript fixes
2021-06-22 17:42:32 +00:00
e4b977c001
fix for single quotes
2021-06-22 18:01:03 +02:00
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
1dce84fa8f
Merge branch 'main' into feature/scheduling
2021-06-22 15:19:28 +00:00
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
0ea36cb3f8
added edit/remove for customEventTypeInputs
2021-06-22 17:10:52 +02:00
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
78451a98b1
Updated timeFormat to something more sensible
2021-06-22 14:25:01 +00:00
24a8440111
Disable React in JSX ESLint rule
2021-06-22 15:08:48 +01:00
a486d1eb02
Add some extra states
2021-06-22 15:05:15 +01:00
0c8d2c74de
Merge pull request #292 from emrysal/feature/decrease-conflicts-booking-page-by-component-splitting
...
Added <AvailableTimes /> and <TimeOptions /> components
2021-06-22 09:24:19 +01:00
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
2a11bcc7f5
Merge pull request #297 from emrysal/hotfix/dayjs-plugins-missing-in-emails
2021-06-21 22:33:23 +01:00
2471dcc402
Merge pull request #294 from femyeda/readd-286-bugfix/cancellation-eventtype-null
...
Revert "Revert "Fixed cancellation bug: "cannot read property 'length…
2021-06-21 22:00:19 +01:00
b2812deeff
Merge branch 'main' into feature/scheduling
2021-06-21 20:37:19 +00:00
b50fe16566
Moved DatePicker and PoweredByCalendso to seperate components
2021-06-21 20:26:04 +00:00
4c62c7c97f
Included missing dayjs plugins
2021-06-21 19:30:00 +00:00
bc8f2980d3
Add linting and precommits ( #295 )
...
* chore: prefer yarn
* dx: linting configurations, and pre-commit hook
2021-06-21 12:34:01 -05:00
22a009edd2
fixes after merge
2021-06-21 18:15:05 +02:00
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
f2265fdbd7
Revert "Revert "Fixed cancellation bug: "cannot read property 'length' of null"""
...
This reverts commit de4c8f75e0
2021-06-21 07:31:39 -05:00
88fc22ddd4
Updated to latest
2021-06-21 10:39:01 +00:00
b0d00e4c70
Merge pull request #291 from calendso/jit
...
upgraded tailwindcss to support jit
2021-06-21 11:36:58 +01:00
cd0974d8a6
Merge pull request #290 from Malte-D/feature/custom-fields-on-the-booking-page
...
Feature/custom fields on the booking page
2021-06-21 11:36:05 +01:00
e9b75b90ba
Merge branch 'main' into feature/custom-fields-on-the-booking-page
2021-06-21 11:35:59 +01:00
47b39a58e7
Merge pull request #278 from sourceinteractive/fix/gravatar-url
...
fix: Use proper url parameter for profile img placeholder
2021-06-21 11:35:05 +01:00
c5bdf4603f
Merge pull request #277 from Nico-J/feature/zoom-integration
...
Zoom integration and major architecture upgrades
2021-06-21 11:32:37 +01:00
881ba671d5
Change to run getSlots() every time so it updates when selectedDate changes
2021-06-20 21:01:41 +00:00
931e6b26f1
error handling WIP
2021-06-20 21:02:15 +02:00
f99729c392
Merged with main
2021-06-20 17:52:18 +00:00
Malte Delfs