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

277 commits

Author SHA1 Message Date
Bailey Pumfleet
9844cf92a8 Temporarily disable checking video busy times 2021-08-24 22:44:29 +01:00
Alex van Andel
bc97237858
Remove image from session, add /api/me, update Avatar component (#493) 
* Remove image from session, add /api/me, update Avatar component

* Fixed Avatar on Desktop

* Added emailMd5 to session + load md5 from props on /settings/profile

* Explicitly select which fields to expose in /api/me

* Abstracted Gravatar, defaults avatar for /api/me, removed session dep from UserDropdown

* Delete md5.js :)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-22 14:16:42 +01:00
Mihai C
3894ee12d1
feat: CustomEventType placeholder and API fixes (#446) 
* feat: add optional placeholder for text/multi-line text custom inputs on event types

* fix: delete associations of event type first

* fix: remove unneeded check

* fix: minor tweak

Co-authored-by: mihaic195 <mihai@sortlist.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-22 14:06:26 +01:00
Alex Johansson
6d158e0c50
fix google auth callback (#500) 
* maybe fix?

* fix

* Update pages/api/integrations/googlecalendar/callback.ts

Co-authored-by: Alex Johansson <alexander@n1s.se>

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2021-08-19 15:37:18 +01:00
Alex Johansson
f63aa5d550
add linting in CI + fix lint errors (#473) 
* run `yarn lint --fix`

* Revert "Revert "add linting to ci""

This reverts commit 0bbbbee4be.

* Fixed some errors

* remove unused code - not sure why this was here?

* assert env var

* more type fixes

* fix typings og gcal callback - needs testing

* rename `md5.ts` to `md5.js`

it is js.

* fix types

* fix types

* fix lint errors

* fix last lint error

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2021-08-19 14:27:01 +02:00
Alex Johansson
aed9757409
fix bad auth commit (#487) 2021-08-18 12:15:22 +00:00
Alex Johansson
a0a0ec86f0
add type-safe getSession() (#486) 
* fix types for auth
* implement safer to use `getSession`
 2021-08-18 11:52:25 +00:00
Alex van Andel
3a00ab0d0e Switched exclusivity, initial bugfix was incorrect 2021-08-16 22:51:52 +00:00
femyeda
49e7cbf803 fix issue where user could not connect to caldav 
Uses base caldav adapter to ensure connectivity

rethrows all errors on CalDavCalendarAdapter
 2021-08-16 09:34:49 -05:00
Bailey Pumfleet
ceacf02383
Merge pull request #449 from kanji-keraliya/office-365-integration-domain 
Fixed: Office 365 integration redirection URL issue
 2021-08-16 10:23:45 +01:00
Bailey Pumfleet
3d725a9573
Merge pull request #412 from emrysal/bugfix/eventType-merge-artifacts 
Removed selectedEventType + fixed missing booking.eventTypeId
 2021-08-16 10:22:38 +01:00
Peer_Rich
83bef7d95e
Merge pull request #448 from femyeda/team-pages 
Team pages
 2021-08-15 18:44:42 +02:00
femyeda
19ef588fa5 fix issue where client side vali 
dation not happening

show error message from server
 2021-08-15 09:22:05 -05:00
Femi Odugbesan
65366b7c5b
cal-101-caldav-integration (#419) 
* add generic calendar icon for caldav

* module for symmetric encrypt/decrypt

* caldav integration

* use Radix dialog

* Move caldav components to /caldav

* remove duplicate cancel button, unused function

* ensure app can connect to caldav server before adding

* fix calendar clients can possibly return null

* fix: add caldav dialog does not close when submitted

* safely attempt all caldav operations

* clarify variable name, fix typo

* use common helper for stripping html

* remove usage of request lib until "completed"

* add types and usage comments to crypto lib

* add encryption key to example env file
 2021-08-14 20:53:59 -05:00
Alex van Andel
03cfd4ba8b Detect conflicts when the time is the same as startTime 2021-08-14 15:01:05 +00:00
Alex van Andel
92d3f08f70 Merge branch 'main' into bugfix/eventType-merge-artifacts 2021-08-14 14:56:34 +00:00
Kanji Keraliya
4c48410e2d Fixed: Office 365 integration redirection url issue 2021-08-14 11:55:43 +05:30
femyeda
216a7c0c48 prevent duplicate team names 2021-08-13 14:50:11 -05:00
Bailey Pumfleet
da98a1ff1d
Merge pull request #413 from emrysal/bugfix/fix-zoom-calendar-conflict 2021-08-13 09:08:04 +01:00
nicolas
5a5e61739b Removed faulty check 2021-08-08 21:41:02 +02:00
nicolas
560bd19472 Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 21:21:33 +02:00
Alex van Andel
8bc209f6d0 Attempts to fix conflict with zoom 2021-08-04 21:04:23 +00:00
Alex van Andel
72b62cd49a Removed selectedEventType + fixed missing booking.eventTypeId 2021-08-04 20:03:20 +00:00
Peer_Rich
6977b74f35
Merge pull request #411 from alishaz-polymath/main 
Added 'Add Guest' button at the confirm booking step
 2021-08-04 20:17:30 +02:00
Syed Ali Shahbaz
00069fa9a7 Added -Add guest- button at confirm booking step, and minor code improvement 2021-08-04 16:09:43 +05:30
Alex van Andel
78de56b7f5 Missing dayjs().isBetween plugin + format Z explicitly 2021-08-03 10:14:20 +00:00
nicolas
bd28636af5 Merge branch 'main' into bugfix/unify-email-sending 2021-07-28 22:01:58 +02:00
nicolas
65fd733751 Use optional udi 2021-07-25 17:08:11 +02:00
nicolas
4fb8e8285e Added location to event 2021-07-25 16:29:06 +02:00
nicolas
df161d5498 Added location to bookings table 2021-07-25 14:37:22 +02:00
nicolas
a97862d4b8 Process event location in EventManager 2021-07-25 14:19:49 +02:00
nicolas
86e2add30f Resolved conflicts; included reference creation into EventManager; use EventManager everywhere 2021-07-24 22:24:00 +02:00
Alex van Andel
9234f74bec Added accompanying frontend 2021-07-23 20:19:23 +00:00
Bailey Pumfleet
02dd0eb8e2
Merge pull request #371 from Malte-D/feature/opt-in-booking 
Feature/opt in booking
 2021-07-22 11:30:48 +01:00
nicolas
e0abbbb2f1 Fixed linting errors 2021-07-20 20:18:26 +02:00
nicolas
7aff32fb50 Only send single mail when booking zoom 2021-07-20 20:07:59 +02:00
Alex van Andel
7098e75841 Fixes 404 issue with slug when trailing whitespaces exist 2021-07-20 13:27:36 +00:00
Malte Delfs
0c975cdcbc fixed codacy issues 2021-07-18 21:22:39 +02:00
Malte Delfs
f5516ed427 added reminder emails for opt-in bookings 2021-07-18 21:12:35 +02:00
Malte Delfs
a2bf242c9e opt in booking 2021-07-18 20:28:54 +02:00
nicolas
81e1287693 Fixed cancellation 2021-07-18 16:03:59 +02:00
nicolas
b4ed8ae87e Merge branch 'main' into bugfix/unify-email-sending 2021-07-18 15:12:18 +02:00
nicolas
b146b80778 Fixed signature 2021-07-15 23:34:55 +02:00
Femi Odugbesan
45689059c7
Feat/cal 95/date range on event types (#353) 
* add edit links to events on dashboard

* fit elements on screen for mobile

* initialize components for consistent text styles

* add more fine grained width/height settings

* add higher level setting for when an event is available

- db: add supporting values to period allow setting an amount of days,
 a range, or unlimited number days an event is available

* fix issue where periodDates are null

* return minimal required data, handle date parsing

* [ui] limit booking days based on user period settings

* api: validate user period settings

* [db] migration for event type period settings
 2021-07-15 09:10:26 -05:00
nicolas
daecc1e0e4 Created EventManager in order to unify event CRUD logic 2021-07-15 03:19:30 +02:00
Alex van Andel
4d7427ad91 Fixes some linting + codacy issues 2021-07-11 19:43:28 +00:00
Alex van Andel
5206fb4f88 Implemented theme through user preferences 2021-07-09 23:13:34 +00:00
Femi Odugbesan
36b258f4b7
safely check user availability (#352) 2021-07-09 10:55:02 -05:00
Femi Odugbesan
5c4a9c32d1
Add application logger (#332) 
* add application logger

* use logger
 2021-07-09 10:49:42 -05:00
Femi Odugbesan
2f73997e72
safely check isAvailable (#331) 
fix issue where checking availability throws an error
 2021-07-07 11:53:33 -05:00
nicolas
3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Bailey Pumfleet
ad00e5fc0c
Merge pull request #333 from mihaic195/fix/teams-create-error-and-unauthenticated-request 
Team API error and page
 2021-07-07 10:56:16 +01:00
Bailey Pumfleet
43f899582f Fix issue where user ID is not fetched 2021-07-06 22:09:53 +01:00
mihaic195
e315b272f5
Merge branch 'main' into fix/teams-create-error-and-unauthenticated-request 2021-07-05 10:18:28 +03:00
mihaic195
6463b3ba37
fix codacy suggestions 2021-07-01 12:47:12 +03:00
Mihai C
b91d021fc8
Update pages/api/teams.ts 
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-07-01 12:29:55 +03:00
mihaic195
e10030e18b
fix api 500 and redirect to login if not authenticated when accessing /settings/team 2021-06-30 16:48:34 +03:00
Alex van Andel
8c589b9dc1 Merge branch 'main' into feature/scheduling 2021-06-30 01:45:24 +00:00
Bailey Pumfleet
3aa1e1716d
Merge pull request #327 from Malte-D/hotfix/book-user 
hotfix for api/book/user
 2021-06-29 17:20:49 +01:00
Malte Delfs
dfb9870894 hotfix 2021-06-29 18:17:09 +02:00
Bailey Pumfleet
51c0556d30 Hide Calendso branding 2021-06-29 17:08:55 +01:00
Bailey Pumfleet
099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token 2021-06-29 16:19:20 +01:00
Alex van Andel
575747bcd3 Final thing to check is timezones, currently if I am in Kuala Lumpur the time is correct, but it jumps 8 hours due to being out of bound on Seoul. 2021-06-29 01:45:58 +00:00
femyeda
d1bdac45eb dont allow user to book a past date 2021-06-28 19:39:08 -05:00
nicolas
f918f220eb Fixed Zoom Auth 2021-06-29 02:21:08 +02:00
Alex van Andel
7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Malte Delfs
b5b480f7e2 hotfix for booking 2021-06-26 19:48:24 +02: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
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
femyeda
a53cdf2660 fix: issue where user could book a meeting when unavailable 2021-06-24 16:21:25 -05: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
1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00:00
Malte Delfs
0ea36cb3f8 added edit/remove for customEventTypeInputs 2021-06-22 17:10:52 +02: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
Alex van Andel
b2812deeff Merge branch 'main' into feature/scheduling 2021-06-21 20:37:19 +00:00
Malte Delfs
22a009edd2 fixes after merge 2021-06-21 18:15:05 +02:00
Malte Delfs
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
Bailey Pumfleet
e9b75b90ba
Merge branch 'main' into feature/custom-fields-on-the-booking-page 2021-06-21 11:35:59 +01:00
Malte Delfs
931e6b26f1 error handling WIP 2021-06-20 21:02:15 +02:00
Alex van Andel
f99729c392 Merged with main 2021-06-20 17:52:18 +00: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
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
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
1b1c712c89
Merge branch 'main' into feature/add-buffer-times-for-appointments 2021-06-18 17:04:05 +01:00
Bailey Pumfleet
90c1ff25bf
Merge branch 'main' into feature/customise-event-names 2021-06-18 17:00:52 +01:00
nicolas
869ba9b97c Implemented reschedule mail and fixed bug that rescheduling weren't saved 2021-06-17 02:44:13 +02:00
nicolas
a11641d7b9 Implemented common availability 2021-06-17 01:41:56 +02:00
nicolas
3366a05c1d Implemented legacy method to send email even if there is no integration 2021-06-17 01:04:08 +02:00
nicolas
f56ced0ff1 Re-implemented event confirmation mails object based 2021-06-17 00:56:02 +02:00
Alex van Andel
9d5186f1e3 Functionality works, only thing left is a bit of cleaning up and all done 2021-06-16 22:27:27 +00:00
nicolas
04e0b55b51 Introduced more classes for event mails 2021-06-17 00:26:51 +02:00
nicolas
e37dd017c8 Introduced EventOwnerMail and VideoEventOwnerMail as class based implementations 2021-06-16 23:40:13 +02:00
nicolas
51a8bafaa7 Full zoom integration (except availability check) 2021-06-16 22:14:44 +02:00
Malte Delfs
68bca9e703 Implemented a configurable buffer between events 2021-06-15 18:19:00 +02:00
Malte Delfs
4fb0fbfe07 Made event name customizable 2021-06-15 17:26:16 +02:00
Alex van Andel
03f583b021 Save WIP 2021-06-14 18:53:20 +00:00
Malte Delfs
ad69feed70 Merge branch 'main' into feature/select-calendars-to-check-for-availability 2021-06-14 20:13:36 +02:00
Malte Delfs
d3b8431699 Implemented calendar selection for availability checking. 
Also upgraded outlook integration to be able to check all calendars instead of only the default one.
 2021-06-14 19:45:24 +02:00
nicolas
49abf06ce6 Deleting zoom also works 2021-06-14 19:00:17 +02:00
nicolas
c4455b74ba Rescheduling zoom works 2021-06-14 18:55:20 +02:00
nicolas
8e9868db30 Properly concat results and properly handle zoom meeting uuids 2021-06-14 18:47:05 +02:00
nicolas
7ecb7f22e3 Merge branch 'main' into feature/zoom-integration 2021-06-14 17:17:09 +02:00
nicolas
2ba98c5dac Test setup to try zoom meeting creation 2021-06-13 15:57:01 +02:00
nicolas
30f30d7669 Renamed zoom to zoomvideo 2021-06-13 14:04:03 +02:00
nicolas
0bb4678bf7 Added subtitle to zoom integrations 2021-06-13 13:59:40 +02:00
nicolas
8227e733e6 Append reschedule/cancel also to event description 2021-06-13 00:37:35 +02:00
Bailey Pumfleet
65c7960b76
Merge branch 'main' into feature/invite-external-users 2021-06-11 22:02:07 +01:00
nicolas
734d9ad243 Save whole JSON 2021-06-11 02:32:07 +02:00
nicolas
a9a569f876 Removed scopes variable 2021-06-11 02:17:22 +02:00
nicolas
f44c8b6326 Potentially first working version of token fetching for zoom 2021-06-11 02:14:36 +02:00
nicolas
697cae9cc9 Very rudimentary development version of zoom auth #6 2021-06-11 02:13:02 +02:00
nicolas
65a029acde Very rudimentary development version of zoom auth #5 2021-06-11 02:10:56 +02:00
nicolas
615e59cde7 Very rudimentary development version of zoom auth #4 2021-06-11 02:08:47 +02:00
nicolas
46474c9c70 Very rudimentary development version of zoom auth #3 2021-06-11 02:07:02 +02:00
nicolas
a2f1462f10 Very rudimentary development version of zoom auth #2 2021-06-11 02:03:48 +02:00
nicolas
b5733716de Very rudimentary development version of zoom auth 2021-06-11 01:37:58 +02:00
nicolas
cb9d749310 Send email when no integrations are present as well 2021-06-10 23:18:57 +02:00
nicolas
3d4222c631 Merge branch 'main' into feature/cancel-reschedule-links 2021-06-10 08:33:39 +02:00
nicolas
01da470664 Removed whitespaces 2021-06-10 01:19:46 +02:00
nicolas
6c92e2fe1b Implemented short UUID as UID 2021-06-10 00:51:09 +02:00
Alex van Andel
40eb9036f4 Implements inviting external users to teams 2021-06-09 21:43:37 +00:00
Alex van Andel
f24ca5b672 Fixed incorrect variable & also clears old errors now 2021-06-09 20:32:02 +00:00
nicolas
af08c74c8a Implemented rescheduling and concurrent usage of all integrations 2021-06-09 21:46:41 +02:00
Alex van Andel
e8a5357a89 Restricted usernames to be unique, removes the potential for username conflicts 2021-06-09 12:26:00 +00:00
nicolas
72a07770e8 Implemented link generation in mails 2021-06-08 17:24:06 +02:00
nicolas
27194ef68c Fixed bug where null email address could occurr in office365 credential key 2021-06-07 20:21:38 +02:00
nicolas
2b84612e5d Request offline_access in first office365 step 2021-06-07 19:30:09 +02:00
Alex van Andel
7df41b519f Use NEXTAUTH_URL to define the BASE_URL, then use that in invite email 2021-06-07 16:57:59 +00:00
Alex van Andel
5d3e39ea6e Better error handling during team member invitation 
Now tells you if you have already added this member / invite is pending.
Behaviour a little bit more predictable during team editting.
 2021-06-07 15:12:00 +00:00
nicolas
1daf9bd3f7 Use id 2021-06-07 09:56:15 +02:00
nicolas
d2934a45ff Use RefUid 2021-06-07 09:44:56 +02:00
nicolas
38b6d1c3e9 Properly get eventId 2021-06-07 09:37:28 +02:00
nicolas
29fef04620 Moved delete request 2021-06-07 09:21:46 +02:00
nicolas
ce8cca8a39 Fix: Check if credentials present 
Fix: Request credentials as well
 2021-06-07 09:18:41 +02:00
nicolas
1e306ef1b0 Use calendar deletion 2021-06-07 08:59:13 +02:00
nicolas
b376e9e5a4 Prepared google calendar deletion 2021-06-07 01:10:56 +02:00
nicolas
d05ae49e8d Made UID unique, implemented cancel API, Prepared mail footer, 2021-06-06 03:51:24 +02:00
nicolas
e32caa68eb Implemented database actions to store bookings in database 2021-06-06 01:32:24 +02:00
Alex van Andel
7a31cb0f6a Implemented the API, split the teams page up into multiple components 2021-06-05 22:53:33 +00:00
Alex van Andel
1f6e3f8f2e Removed calendar scope, we shouldn't need it. 2021-06-03 00:05:54 +00:00
Alex van Andel
c4c5e83499 Disables booking confirmation for Office 365 & enable new event email for all 2021-06-01 19:16:06 +00:00
Alex van Andel
cf3713d3a1 Implemented mailing for Calendso instances 
added two templates, confirm-booked (sent to invitee) and new-event (sent to agent, for the time being only when no calendar integrations exist).
 2021-05-27 22:10:20 +00:00
Heath Daniel
71e50c58d6 Add ability to select first day of week 2021-05-17 18:10:40 -04:00
Fernando Barrios
5f101ca5fc feat: Add support for multiple google calendars 2021-05-11 07:27:06 -06:00