mythic-insight/calcom
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5
377 commits 1 branch 0 tags 57 MiB
Commit graph

377 commits

This branch
This branch
All branches
Author SHA1 Message Date
Malte Delfs
0ea36cb3f8 added edit/remove for customEventTypeInputs 2021-06-22 17:10:52 +02:00
Bailey Pumfleet
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
Femi Odugbesan
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
Bailey Pumfleet
2a11bcc7f5
Merge pull request #297 from emrysal/hotfix/dayjs-plugins-missing-in-emails 2021-06-21 22:33:23 +01:00
Bailey Pumfleet
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
Alex van Andel
4c62c7c97f Included missing dayjs plugins 2021-06-21 19:30:00 +00:00
Femi Odugbesan
bc8f2980d3
Add linting and precommits (#295) 
* chore: prefer yarn

* dx: linting configurations, and pre-commit hook
 2021-06-21 12:34:01 -05:00
femyeda
f2265fdbd7 Revert "Revert "Fixed cancellation bug: "cannot read property 'length' of null""" 
This reverts commit de4c8f75e0.
 2021-06-21 07:31:39 -05:00
Alex van Andel
88fc22ddd4 Updated to latest 2021-06-21 10:39:01 +00:00
Bailey Pumfleet
b0d00e4c70
Merge pull request #291 from calendso/jit 
upgraded tailwindcss to support jit
 2021-06-21 11:36:58 +01:00
Bailey Pumfleet
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
Bailey Pumfleet
e9b75b90ba
Merge branch 'main' into feature/custom-fields-on-the-booking-page 2021-06-21 11:35:59 +01:00
Bailey Pumfleet
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
Bailey Pumfleet
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
Alex van Andel
881ba671d5 Change to run getSlots() every time so it updates when selectedDate changes 2021-06-20 21:01:41 +00:00
nicolas
9007bbed29 Added links to iCal again 2021-06-20 17:04:00 +02:00
nicolas
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
Alex van Andel
d407ba0fe7 Make sure all dayjs() plugins are there 2021-06-20 14:37:33 +00:00
Alex van Andel
a463fded8f Added <AvailableTimes /> and <TimeOptions /> components 2021-06-20 14:19:41 +00:00
Peer Richelsen
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
Malte Delfs
6dc5efd6ee fixed additional notes 2021-06-19 21:54:22 +02:00
Malte Delfs
653509d655 formatting cleanup 2021-06-19 21:51:18 +02:00
Malte Delfs
639341f701 show custom inputs on booking screen 2021-06-19 21:44:36 +02:00
Malte Delfs
50d325d20a added schema for EventTypeCustomInput 2021-06-19 20:55:40 +02:00
Malte Delfs
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
Bailey Pumfleet
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
femyeda
ad0b561cca fix: eventType not defined on [user]/[type] 2021-06-19 10:17:23 -05:00
Peer_Rich
fbc504f670
Merge pull request #288 from femyeda/revert-286-bugfix/cancellation-eventtype-null 2021-06-19 15:55:37 +01:00
Femi Odugbesan
de4c8f75e0
Revert "Fixed cancellation bug: "cannot read property 'length' of null"" 2021-06-19 09:14:24 -05:00
Bailey Pumfleet
11fc0f0d2a
Merge pull request #286 from Nico-J/bugfix/cancellation-eventtype-null 2021-06-19 09:24:19 +01:00
nicolas
11ba59be9c Fixes #281 2021-06-19 03:40:38 +02:00
Bailey Pumfleet
440bee0a5f
Merge pull request #285 from emrysal/bugfix/throw-404-when-eventType-missing 2021-06-18 23:35:42 +01:00
Alex van Andel
cc1b3fa7dd Return 404 when requesting event url that does not exist 2021-06-18 20:41:12 +00:00
Bailey Pumfleet
aed5af0f5e
Merge pull request #284 from Malte-D/hotfix/selected-calendars 2021-06-18 21:27:10 +01:00
Malte Delfs
95a99c620e selected calendars hotfix 2021-06-18 22:11:13 +02:00
Malte Delfs
76b72f64d8 event type custom input WIP 2021-06-18 21:58:42 +02:00
Bailey Pumfleet
2441f47c10 Fix layout issue with event types 2021-06-18 17:21:39 +01:00
Bailey Pumfleet
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
Bailey Pumfleet
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
Bailey Pumfleet
1b1c712c89
Merge branch 'main' into feature/add-buffer-times-for-appointments 2021-06-18 17:04:05 +01:00
Bailey Pumfleet
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
Bailey Pumfleet
159a7e20a5
Merge pull request #272 from Malte-D/feature/customise-event-names 
Feature/customise event names
 2021-06-18 17:01:00 +01:00
Bailey Pumfleet
90c1ff25bf
Merge branch 'main' into feature/customise-event-names 2021-06-18 17:00:52 +01:00
Bailey Pumfleet
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
Malte Delfs
d2466440f9 removed debug logging 2021-06-18 14:03:31 +02:00
Malte Delfs
50bc6b480e minor change 2021-06-18 14:00:53 +02:00
Peer_Rich
8bf556c742
Merge pull request #279 from emrysal/bugfix/useEffect-fires-twice 
Updated useEffect so it only fires once (added [])
 2021-06-18 11:35:41 +01:00
Peer_Rich
066032a219
Merge pull request #276 from calendso/manage-subscription 2021-06-18 09:31:08 +01:00
nicolas
46bff28f0d Merge remote-tracking branch 'origin/feature/zoom-integration' into feature/zoom-integration 2021-06-18 02:48:04 +02:00
nicolas
c662c97d14 Refactored EventOwner to EventOrganizer 2021-06-18 02:44:41 +02:00