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

219 commits

Author SHA1 Message Date
nicolas
d2bc02e6fc Further renaming 2021-08-01 23:38:38 +02:00
nicolas
19374d38f7 Renamed isVideo to isDedicated; hard-coded logic for zoom meetings for now 2021-08-01 23:29:15 +02:00
nicolas
c8a53d7f29 Merge branch 'main' into bugfix/unify-email-sending 2021-08-01 22:59:43 +02:00
Jan Vereecken
04d7a280ef Use calendarView instead of events 
When calling Microsoft Graph use calendars/calendarView instead of calendars/events to allow occurences to be returned.
 2021-07-31 15:00:27 +02:00
Alex van Andel
e3ad889c54 Fixes Shifting the selected working days 2021-07-29 16:08:35 +00:00
nicolas
082281bdd0 Added type for credential 2021-07-28 22:44:52 +02:00
nicolas
f948370bef Fixed codacy issues 2021-07-28 22:05:37 +02:00
nicolas
bd28636af5 Merge branch 'main' into bugfix/unify-email-sending 2021-07-28 22:01:58 +02:00
Peer Richelsen
a08e502d01 changed hardcoded email reminders to 10 vs 60 minutes. adding ability to change reminder time soon 2021-07-27 13:45:53 +02:00
Bailey Pumfleet
5df4fe413e
Merge pull request #343 from emrysal/feature/minimize-o365-calls-batching-list-events 
Minimized msgraph calls while event listing by batching
 2021-07-26 12:56:08 +01:00
Bailey Pumfleet
3c55660537
Merge pull request #384 from emrysal/feature/minimum-booking-notice 
Feature/minimum booking notice
 2021-07-26 11:54:22 +01:00
Bailey Pumfleet
ca5fac4203
Merge pull request #378 from Nico-J/bugfix/remove-fancy-html 
(Conditionally) remove HTML from event description
 2021-07-26 10:15:44 +01:00
nicolas
47ee0334db Use better Regex to strip down html 2021-07-25 23:22:34 +02:00
nicolas
2b38638d84 Added maybeUid to CalEventParser 2021-07-25 19:15:31 +02:00
nicolas
b0ac65b0f6 Added maybeUid to createEvent and createMeeting 2021-07-25 17:05:18 +02:00
nicolas
4dd8359a15 Made location optional 2021-07-25 14:40:02 +02:00
nicolas
a97862d4b8 Process event location in EventManager 2021-07-25 14:19:49 +02:00
nicolas
d7d1b79d0e Added JSDoc 2021-07-24 22:30:14 +02:00
nicolas
86e2add30f Resolved conflicts; included reference creation into EventManager; use EventManager everywhere 2021-07-24 22:24:00 +02:00
nicolas
749693b6bf Always use plain text event descriptions for now 2021-07-24 21:23:15 +02:00
Alex van Andel
9234f74bec Added accompanying frontend 2021-07-23 20:19:23 +00:00
Alex van Andel
4368ad0289 Implement minimum booking notice 2021-07-22 22:52:27 +00:00
nicolas
936338db3e Added condition when updating event 2021-07-22 01:11:25 +02:00
nicolas
0a60a62910 Conditionally use HTML 2021-07-22 00:46:31 +02:00
nicolas
13a6b9b549 Use regex to remove br tag 2021-07-21 18:20:08 +02:00
nicolas
39f16d95cb Properly replace a link tags 2021-07-21 14:25:28 +02:00
nicolas
e5d94e74a2 No HTMl in rich event description 2021-07-21 14:01:48 +02:00
nicolas
cf52df5662 Use entrypoint to make zoom location more beautiful 2021-07-20 20:40:41 +02:00
nicolas
7aff32fb50 Only send single mail when booking zoom 2021-07-20 20:07:59 +02:00
nicolas
a40a5c04fe Retain rescheduleUid when picking a date 2021-07-18 22:17:18 +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
270e6b2d4f Merge branch 'main' into bugfix/unify-email-sending 2021-07-18 15:12:57 +02:00
nicolas
b4ed8ae87e Merge branch 'main' into bugfix/unify-email-sending 2021-07-18 15:12:18 +02:00
Bailey Pumfleet
5ccefac758 Redesign organizer confirmation email 2021-07-16 22:23:29 +01:00
Bailey Pumfleet
f9da8eb12c Redesign invitee confirmation email 2021-07-16 21:57:44 +01:00
nicolas
b146b80778 Fixed signature 2021-07-15 23:34:55 +02:00
nicolas
daecc1e0e4 Created EventManager in order to unify event CRUD logic 2021-07-15 03:19:30 +02:00
Peer Richelsen
61fd300bc8 re-added last two commits (<br> fix and dark mode for all booked today text 2021-07-13 15:11:01 +02:00
Peer Richelsen
de14b2de33 wip 2021-07-13 14:38:54 +02:00
Peer Richelsen
949fcf8884 fixed amoount of line breaks (<br>) in new organizer email 2021-07-13 14:32:25 +02:00
Malte Delfs
3283eb422c Fixed a bug that selected the following day on the booking page, when the selected time is smaller than the utc offset of the current timezone. Also fixed the reloading of the last 24h/12h selection 2021-07-11 18:05:49 +02:00
Femi Odugbesan
5c4a9c32d1
Add application logger (#332) 
* add application logger

* use logger
 2021-07-09 10:49:42 -05:00
Alex van Andel
be102b1b09 Fixes #347 & some other minor things when timezones differ 2021-07-08 21:14:29 +00:00
nicolas
9371e6192c Use auto-generated types 2021-07-07 14:07:18 +02:00
nicolas
3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Bailey Pumfleet
5112347293
Merge branch 'main' into google-meet 2021-07-07 10:46:42 +01:00
Alex van Andel
e08815ce78 Added support for deep selecting 2021-07-06 18:20:25 +00:00
Alex van Andel
47d7634638 Adds prisma helper function whereAndSelect 2021-07-06 16:51:34 +00:00
Alex van Andel
496fcdfabc Minimized msgraph calls while event listing by batching 2021-07-05 19:50:54 +00:00
Alex van Andel
bfc7cce688 Make sure the slots equal the month and date of the invitee so we can check isSame with freebusy 2021-06-30 15:27:49 +00:00
Alex van Andel
e78a34e2ce Implements slot logic with the DatePicker, more tests for slots 2021-06-30 01:35:08 +00:00
nicolas
313ee0376e Fixed padding 2021-06-30 00:53:37 +02:00
nicolas
8accc3b775 Fixed padding 2021-06-30 00:50:34 +02:00
Alex van Andel
0da99f0d07 Removed code bloat, fixed tests 2021-06-29 22:35:13 +00:00
nicolas
88db124f47 Fixed padding 2021-06-30 00:35:05 +02:00
nicolas
e49c636a13 Fixed padding 2021-06-30 00:31:30 +02:00
nicolas
ae3aa275f7 fixed padding 2021-06-30 00:16:25 +02:00
nicolas
7568071334 removed div 2021-06-30 00:11:16 +02:00
nicolas
f91fdd16cf Use HTML to allow line breaks in outlook 2021-06-29 23:47:50 +02:00
nicolas
098b95ef55 Introduced CalEventParser to acquire rich descriptions for events in integrations 2021-06-29 23:43:18 +02:00
femyeda
726d211f27 attach hangouts location to invitee and organizer email notification 2021-06-29 07:16:20 -05:00
femyeda
e714bd5b8e use google events conference data version 1 
- fix issue where google meet details were no longer add to the created event
 2021-06-29 07:16:20 -05: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
Alex van Andel
1eba242820 Compare busyTimes in UTC, re-implement hasErrors 2021-06-27 22:30:11 +00:00
Alex van Andel
7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Bailey Pumfleet
aa2e35d68e
Merge pull request #311 from Nico-J/feature/zoom-event-location 
Added zoom as an event location and fixed linting
 2021-06-25 16:52:52 +01: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
6fec24a69d use lib folder 2021-06-25 09:21:21 -05:00
nicolas
bc47975316 Added zoom as an event location and fixed ESLint 2021-06-25 00:26:55 +02:00
Alex van Andel
ef3274d8f3 Working version ready for testing 
* More tests to be added to verify slots logic
* Adds Jest
* Implements logic to the booking code to take into account grayed days
* Slots take workhours into account

TODO: Improve the tests, evaluate the structure, small re-orgs here and
there for improved readability / better code
 2021-06-24 22:15:18 +00:00
Malte Delfs
2f20cf2968 made sendEmail async 2021-06-24 19:30:39 +02: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
Peer Richelsen
a1ddb873f0 minor change to reschedule info in email 2021-06-24 11:01:41 -05:00
Peer Richelsen
20cd3bc52e minor change to reschedule info in email 2021-06-23 23:45:07 +01:00
Alex van Andel
1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00: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
Alex van Andel
b2812deeff Merge branch 'main' into feature/scheduling 2021-06-21 20:37:19 +00:00
Alex van Andel
4c62c7c97f Included missing dayjs plugins 2021-06-21 19:30:00 +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
Alex van Andel
88fc22ddd4 Updated to latest 2021-06-21 10:39:01 +00:00
Bailey Pumfleet
e9b75b90ba
Merge branch 'main' into feature/custom-fields-on-the-booking-page 2021-06-21 11:35:59 +01:00
Alex van Andel
f99729c392 Merged with main 2021-06-20 17:52:18 +00:00
Malte Delfs
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
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
Alex van Andel
b423f2894a WIP to save progress 2021-06-19 22:50:47 +00: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
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
76b72f64d8 event type custom input WIP 2021-06-18 21:58:42 +02: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
90c1ff25bf
Merge branch 'main' into feature/customise-event-names 2021-06-18 17:00:52 +01:00