270e6b2d4f
Merge branch 'main' into bugfix/unify-email-sending
2021-07-18 15:12:57 +02:00
b4ed8ae87e
Merge branch 'main' into bugfix/unify-email-sending
2021-07-18 15:12:18 +02:00
5ccefac758
Redesign organizer confirmation email
2021-07-16 22:23:29 +01:00
f9da8eb12c
Redesign invitee confirmation email
2021-07-16 21:57:44 +01:00
b146b80778
Fixed signature
2021-07-15 23:34:55 +02:00
daecc1e0e4
Created EventManager in order to unify event CRUD logic
2021-07-15 03:19:30 +02:00
61fd300bc8
re-added last two commits (<br> fix and dark mode for all booked today text
2021-07-13 15:11:01 +02:00
de14b2de33
wip
2021-07-13 14:38:54 +02:00
949fcf8884
fixed amoount of line breaks (<br>) in new organizer email
2021-07-13 14:32:25 +02:00
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
5c4a9c32d1
Add application logger ( #332 )
...
* add application logger
* use logger
2021-07-09 10:49:42 -05:00
be102b1b09
Fixes #347 & some other minor things when timezones differ
2021-07-08 21:14:29 +00:00
9371e6192c
Use auto-generated types
2021-07-07 14:07:18 +02:00
3c09837104
Resolved conflicts
2021-07-07 12:43:13 +02:00
5112347293
Merge branch 'main' into google-meet
2021-07-07 10:46:42 +01:00
e08815ce78
Added support for deep selecting
2021-07-06 18:20:25 +00:00
47d7634638
Adds prisma helper function whereAndSelect
2021-07-06 16:51:34 +00:00
496fcdfabc
Minimized msgraph calls while event listing by batching
2021-07-05 19:50:54 +00:00
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
e78a34e2ce
Implements slot logic with the DatePicker, more tests for slots
2021-06-30 01:35:08 +00:00
313ee0376e
Fixed padding
2021-06-30 00:53:37 +02:00
8accc3b775
Fixed padding
2021-06-30 00:50:34 +02:00
0da99f0d07
Removed code bloat, fixed tests
2021-06-29 22:35:13 +00:00
88db124f47
Fixed padding
2021-06-30 00:35:05 +02:00
e49c636a13
Fixed padding
2021-06-30 00:31:30 +02:00
ae3aa275f7
fixed padding
2021-06-30 00:16:25 +02:00
7568071334
removed div
2021-06-30 00:11:16 +02:00
f91fdd16cf
Use HTML to allow line breaks in outlook
2021-06-29 23:47:50 +02:00
098b95ef55
Introduced CalEventParser to acquire rich descriptions for events in integrations
2021-06-29 23:43:18 +02:00
726d211f27
attach hangouts location to invitee and organizer email notification
2021-06-29 07:16:20 -05:00
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
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
1eba242820
Compare busyTimes in UTC, re-implement hasErrors
2021-06-27 22:30:11 +00:00
7030851efb
Merged with main, fixed issue that caused multiple AvailableTimes refreshes.
2021-06-27 21:34:38 +00:00
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
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
6fec24a69d
use lib folder
2021-06-25 09:21:21 -05:00
bc47975316
Added zoom as an event location and fixed ESLint
2021-06-25 00:26:55 +02:00
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
2f20cf2968
made sendEmail async
2021-06-24 19:30:39 +02:00
646ff4a107
eslint fixes
2021-06-24 18:12:22 +02:00
917b2c4821
Merge branch 'main' into feature/refresh-tokens-and-error-handling
2021-06-24 18:03:54 +02:00
ab1298e2ca
Allow user to reset password
2021-06-24 11:01:41 -05:00
a1ddb873f0
minor change to reschedule info in email
2021-06-24 11:01:41 -05:00
20cd3bc52e
minor change to reschedule info in email
2021-06-23 23:45:07 +01:00
1dce84fa8f
Merge branch 'main' into feature/scheduling
2021-06-22 15:19:28 +00: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
b2812deeff
Merge branch 'main' into feature/scheduling
2021-06-21 20:37:19 +00:00
4c62c7c97f
Included missing dayjs plugins
2021-06-21 19:30:00 +00: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
88fc22ddd4
Updated to latest
2021-06-21 10:39:01 +00:00
e9b75b90ba
Merge branch 'main' into feature/custom-fields-on-the-booking-page
2021-06-21 11:35:59 +01: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
b423f2894a
WIP to save progress
2021-06-19 22:50:47 +00: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
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
76b72f64d8
event type custom input WIP
2021-06-18 21:58:42 +02: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
90c1ff25bf
Merge branch 'main' into feature/customise-event-names
2021-06-18 17:00:52 +01:00
d2466440f9
removed debug logging
2021-06-18 14:03:31 +02:00
c662c97d14
Refactored EventOwner to EventOrganizer
2021-06-18 02:44:41 +02:00
869ba9b97c
Implemented reschedule mail and fixed bug that rescheduling weren't saved
2021-06-17 02:44:13 +02:00
a11641d7b9
Implemented common availability
2021-06-17 01:41:56 +02:00
9b4cf088c0
Added line break
2021-06-17 00:57:59 +02:00
f56ced0ff1
Re-implemented event confirmation mails object based
2021-06-17 00:56:02 +02:00
9d5186f1e3
Functionality works, only thing left is a bit of cleaning up and all done
2021-06-16 22:27:27 +00:00
04e0b55b51
Introduced more classes for event mails
2021-06-17 00:26:51 +02:00
e37dd017c8
Introduced EventOwnerMail and VideoEventOwnerMail as class based implementations
2021-06-16 23:40:13 +02:00
51a8bafaa7
Full zoom integration (except availability check)
2021-06-16 22:14:44 +02:00
4fb0fbfe07
Made event name customizable
2021-06-15 17:26:16 +02:00
dbd1721405
Fixes #266 : ICS event is off by one month
2021-06-14 19:00:37 +00:00
03f583b021
Save WIP
2021-06-14 18:53:20 +00:00
ad69feed70
Merge branch 'main' into feature/select-calendars-to-check-for-availability
2021-06-14 20:13:36 +02:00
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
9ff8e9bd00
Calculate proper duration
2021-06-14 19:18:53 +02:00
3cf00043b1
Persist new refresh token
2021-06-14 18:13:54 +02:00
7ecb7f22e3
Merge branch 'main' into feature/zoom-integration
2021-06-14 17:17:09 +02:00
31670d37b8
Fixed api urls and env variable names
2021-06-13 16:18:55 +02:00
bc8c58e57c
Fixed integration identifier
2021-06-13 16:07:41 +02:00
3cf7ffd6a7
First test implementation of video client
2021-06-13 15:22:17 +02:00
0bb4678bf7
Added subtitle to zoom integrations
2021-06-13 13:59:40 +02:00
124086d1ca
Added zoom to list
2021-06-13 01:24:13 +02:00
8227e733e6
Append reschedule/cancel also to event description
2021-06-13 00:37:35 +02:00
65c7960b76
Merge branch 'main' into feature/invite-external-users
2021-06-11 22:02:07 +01:00
96d4a9bd6d
Set Reply-To header to allow replying to bookings
2021-06-10 18:04:59 +00:00
3d4222c631
Merge branch 'main' into feature/cancel-reschedule-links
2021-06-10 08:33:39 +02:00
abae62f30e
Removed sha256
2021-06-10 01:14:38 +02:00
40eb9036f4
Implements inviting external users to teams
2021-06-09 21:43:37 +00:00
749427cab3
Fixed update method
2021-06-09 22:04:57 +02:00
3e338aaa05
Fixed update method
2021-06-09 22:03:05 +02:00
bd1cb474c5
Fixed update call
2021-06-09 21:59:29 +02:00
b9d1dd1059
Potentially working update method for google calendar
2021-06-09 21:47:03 +02:00
nicolas