Commit Graph

244 Commits (1dce84fa8f65723456616e047e7838ab44de9353)

Author SHA1 Message Date
Alex van Andel dbd1721405 Fixes #266: ICS event is off by one month 2021-06-14 19:00:37 +00: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 4caac5a88c Layout fix 2021-06-14 19:55:55 +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 00f19bd654 Added integration to UI 2021-06-11 02:29:43 +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
Bailey Pumfleet b7b644998a
Merge pull request #258 from Nico-J/bugfix/no-emails-sent-when-no-integration-added 2021-06-10 22:22:10 +01:00
Bailey Pumfleet 17ccf42976
Merge pull request #257 from Nico-J/feature/button-for-new-integration 2021-06-10 22:21:50 +01:00
nicolas cb9d749310 Send email when no integrations are present as well 2021-06-10 23:18:57 +02:00
nicolas d249c62620 Added button to add integrations 2021-06-10 22:54:48 +02:00
Alex van Andel 16b090efd4 Codestyle adjusted & fixed the column behaviour on mobile 2021-06-10 18:49:11 +00:00
Bailey Pumfleet 4dacf64a18
Merge pull request #253 from Nico-J/feature/cancel-reschedule-links 2021-06-10 07:53:38 +01: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
nicolas e5dc036c50 Replaces nulls with empty strings 2021-06-10 00:50:45 +02:00
Alex van Andel 9aeb996aef Adds a bit of margin to left and right for better mobile display 2021-06-09 21:47:00 +00: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
nicolas e92b2e01fc UI for rescheduling 2021-06-09 20:28:39 +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
Bailey Pumfleet 7d81a1f1fb Minor UI changes to teams 2021-06-08 17:00:06 +01: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 c29c0395ef Implemented cancellation success page 2021-06-06 03:26:14 +02:00
nicolas ec7a84ce22 Implemented request handler and error handling in frontend and added cancellation event to telemetry 2021-06-06 03:12:55 +02:00
nicolas 7045bfc364 Implemented (still actionless) page for cancellation 2021-06-06 02:36:40 +02:00
Alex van Andel 9f12ccf5c1 Teams are now refreshed properly when TeamListItems change 2021-06-05 23:41:05 +00: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 e2942224ab Tracking work in progress changes 2021-06-03 20:55:34 +00:00
Alex van Andel 1f6e3f8f2e Removed calendar scope, we shouldn't need it. 2021-06-03 00:05:54 +00:00
Bailey Pumfleet 6e76cc386c
Merge pull request #232 from emrysal/change-email-sending-moments 2021-06-01 23:38:49 +01: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 3fdc997caa Fixed alignment issue with loading spinner 2021-06-01 18:03:13 +00:00
Alex van Andel 9ba29ab347 Fixes #225 by correctly applying the timezone whilst keeping the original date in UTC 2021-05-29 22:29:04 +00:00
Alex van Andel adbf0476ad Merge branch 'main' into feature/mailings 2021-05-27 22:12:17 +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
Bailey Pumfleet 6023a8a314 Add loading spinner to book button 2021-05-27 21:34:02 +01:00
Bailey Pumfleet 01d150092f Mobile UI fixes 2021-05-26 20:47:06 +01:00
Bailey Pumfleet efa443a912
Merge pull request #216 from emrysal/feature/sticky-time-options
Implemented sticky time options based on localStorage
2021-05-26 19:56:00 +01:00
Alex van Andel cf06e91e30 Implemented sticky time options based on localStorage 2021-05-26 18:40:22 +00:00
Bailey Pumfleet 2726c8c87b Add embed section in Settings 2021-05-26 17:24:10 +01:00
Bailey Pumfleet 7d6a631f5d Round available hours if necessary 2021-05-25 21:34:18 +01:00
Alex van Andel c610874ec4 Removed unnecessary DB calls & changes everything to use session.user.id 2021-05-22 19:12:06 +00:00
Heath Daniel 71e50c58d6 Add ability to select first day of week 2021-05-17 18:10:40 -04:00
Bailey Pumfleet 2d0b5709a1
Merge pull request #199 from jasmeetsohal/different-colors-feature
add random bullet color in user's events list
2021-05-17 10:16:08 +01:00
jasmeetsohal cf13dcc023 add random bullet color in list user's events 2021-05-13 23:05:28 +05:30
Bailey Pumfleet f66a59b7e3 Update donation banner 2021-05-13 15:44:48 +01:00
Peer Richelsen 8fe7de9d02 added donation banner for self-hosted 2021-05-13 14:07:27 +01:00
Bailey Pumfleet 6e300f0db1
Merge pull request #147 from jfernandogt/main
feat: Add support for multiple google calendars
2021-05-11 16:04:31 +01:00
Fernando Barrios 5f101ca5fc feat: Add support for multiple google calendars 2021-05-11 07:27:06 -06:00
Bailey Pumfleet e845673662
Merge pull request #177 from jfernandogt/add-gravatar-support
feat: Add support to use gravatar as a fallback avatar
2021-05-11 14:26:43 +01:00
Bailey Pumfleet 3a6eae8b8f Update dashboard 2021-05-11 14:11:17 +01:00
Bailey Pumfleet 209791d86d Get user ID from session instead of looking it up 2021-05-11 10:21:05 +01:00
Bailey Pumfleet b760ed6ff7
Merge pull request #181 from emrysal/bugfix/ensure-utc-plugin-is-enabled 2021-05-10 18:00:32 +01:00
Alex van Andel 6b38fd7550 Fixes UTC issue to success page when refreshed 2021-05-10 16:35:48 +00:00
Bailey Pumfleet 1ab1dfc669
Merge pull request #180 from parasg1999/feature/overlappingAppointment
fix: check for overlapping appointments
2021-05-10 11:28:57 +01:00
Paras Gupta 977e879406 fix: busy time in slot interval 2021-05-10 02:48:12 +05:30
Paras Gupta 3da430b577 fix: check for overlapping appointments 2021-05-10 02:28:05 +05:30
Alex van Andel e8ed94d849 Default [] value for locations array on booking page 2021-05-08 22:17:25 +00:00
Fernando Barrios ba2feb2c15 feat: Add support to use gravatar as a fallback avatar 2021-05-08 14:26:19 -06:00
Alex van Andel a6c3c7fbb3 Implemented configurable eventType phone or physical locations. 2021-05-08 19:03:47 +00:00
Bailey Pumfleet 640ea4031d
Merge pull request #159 from rymaju/feature/close_modal
Fix bug when dismissing modal on availability page
2021-05-07 20:43:22 +01:00
Bailey Pumfleet c867edcad8
Merge pull request #169 from emrysal/feature/server-side-settings-redirect
Added redirects() entry to next.config.js, changed Settings url to /settings/profile
2021-05-07 20:41:43 +01:00
Bailey Pumfleet 5615db5491
Merge branch 'main' into bugfix/crash-when-username-does-not-exist-#144 2021-05-07 20:40:12 +01:00
Bailey Pumfleet 7cf0504ce6
Merge pull request #171 from emrysal/feature/simplify-code-by-handling-auth-in-shell-component
Removed redirect clientside session logic from pages and moved to shell
2021-05-07 20:39:02 +01:00
Bailey Pumfleet 5553d14631
Merge branch 'main' into main 2021-05-07 20:37:18 +01:00
Bailey Pumfleet edec0226c4
Update branding link to calendso.com 2021-05-07 20:34:03 +01:00
Peer Richelsen a49ac34b7a fixed logo 2021-05-07 19:23:00 +01:00