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
ded27d17ea
- save refreshed tokens of both calendar integrations
...
- Office365 expiry check was off by *1000
- log errors from calendar integrations with console.error
- improved google calendar integration performance further when calendars are selected
2021-06-20 17:33:02 +02:00
9007bbed29
Added links to iCal again
2021-06-20 17:04:00 +02:00
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
d407ba0fe7
Make sure all dayjs() plugins are there
2021-06-20 14:37:33 +00:00
a463fded8f
Added <AvailableTimes /> and <TimeOptions /> components
2021-06-20 14:19:41 +00:00
39fde7874d
upgraded tailwindcss to support jit https://tailwindcss.com/docs/just-in-time-mode , moved css components into global.css to support jit
2021-06-20 10:57:33 +01:00
d904dd7a00
AvailableTimes refactor complete, it all seems much simpler now
2021-06-20 00:10:08 +00:00
01eacedde8
Timezone should never be unless it has no state yet, so used that to simplify TimeOptions
2021-06-20 00:08:48 +00:00
b423f2894a
WIP to save progress
2021-06-19 22:50:47 +00:00
6dc5efd6ee
fixed additional notes
2021-06-19 21:54:22 +02:00
653509d655
formatting cleanup
2021-06-19 21:51:18 +02:00
639341f701
show custom inputs on booking screen
2021-06-19 21:44:36 +02:00
50d325d20a
added schema for EventTypeCustomInput
2021-06-19 20:55:40 +02:00
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
6d7ec7fa66
Merge pull request #289 from femyeda/hotfix/500-on-type-page
...
fix: eventType not defined on [user]/[type]
2021-06-19 16:19:39 +01:00
ad0b561cca
fix: eventType not defined on [user]/[type]
2021-06-19 10:17:23 -05:00
fbc504f670
Merge pull request #288 from femyeda/revert-286-bugfix/cancellation-eventtype-null
2021-06-19 15:55:37 +01:00
Bailey Pumfleet