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
de4c8f75e0
Revert "Fixed cancellation bug: "cannot read property 'length' of null""
2021-06-19 09:14:24 -05:00
11fc0f0d2a
Merge pull request #286 from Nico-J/bugfix/cancellation-eventtype-null
2021-06-19 09:24:19 +01:00
11ba59be9c
Fixes #281
2021-06-19 03:40:38 +02:00
440bee0a5f
Merge pull request #285 from emrysal/bugfix/throw-404-when-eventType-missing
2021-06-18 23:35:42 +01:00
cc1b3fa7dd
Return 404 when requesting event url that does not exist
2021-06-18 20:41:12 +00:00
aed5af0f5e
Merge pull request #284 from Malte-D/hotfix/selected-calendars
2021-06-18 21:27:10 +01:00
95a99c620e
selected calendars hotfix
2021-06-18 22:11:13 +02:00
76b72f64d8
event type custom input WIP
2021-06-18 21:58:42 +02:00
2441f47c10
Fix layout issue with event types
2021-06-18 17:21:39 +01:00
81246edab2
Merge pull request #268 from emrysal/hotfix/ics-month-error
...
Fixes #266 : ICS event is off by one month
2021-06-18 17:04:37 +01:00
9f0a80ac87
Merge pull request #275 from Malte-D/feature/add-buffer-times-for-appointments
...
Implemented a configurable buffer between events
2021-06-18 17:04:12 +01:00
1b1c712c89
Merge branch 'main' into feature/add-buffer-times-for-appointments
2021-06-18 17:04:05 +01:00
ecc36a5a0c
Merge pull request #273 from emrysal/bugfix/add-email-verification-to-migrations
...
Added migrations for adding external users
2021-06-18 17:01:31 +01:00
159a7e20a5
Merge pull request #272 from Malte-D/feature/customise-event-names
...
Feature/customise event names
2021-06-18 17:01:00 +01:00
90c1ff25bf
Merge branch 'main' into feature/customise-event-names
2021-06-18 17:00:52 +01:00
2960463f77
Merge pull request #267 from Malte-D/feature/select-calendars-to-check-for-availability
...
Feature: select calendars to check for availability
2021-06-18 17:00:05 +01:00
d2466440f9
removed debug logging
2021-06-18 14:03:31 +02:00
Alex van Andel