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
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
Alex van Andel
a6c3c7fbb3
Implemented configurable eventType phone or physical locations.
2021-05-08 19:03:47 +00:00
Bailey Pumfleet
17b880335a
Merge pull request #156 from MaZderMind/link-to-public-page
...
Add Links to Public Pages
2021-05-06 22:22:33 +01:00
Ramiro Berrelleza
d4ba855a72
send back a specific message per field
...
Signed-off-by: Ramiro Berrelleza <rberrelleza@gmail.com>
2021-05-06 12:43:00 -07:00
Peter Körner
15a6799421
add links to public pages
2021-05-05 22:01:56 +02:00
Bailey Pumfleet
c2dfbaad88
Set avatar through URL
2021-04-29 13:36:37 +01:00
Bailey Pumfleet
a1eed7c77e
Add URL slugs
2021-04-28 13:24:16 +01:00
Bailey Pumfleet
c320b0f20d
Add hidden event types
2021-04-28 10:23:30 +01:00
Bailey Pumfleet
6091f7ba86
Merge pull request #87 from emrysal/main
...
Adds Office 365 / Outlook.com Calendar Integration
2021-04-22 15:04:56 +01:00
Alex van Andel
6a9632bb12
Added User.Read explicitly to office 365 oauth scopes, as it seems some setups do not automatically apply this scope.
2021-04-22 13:27:57 +00:00
Alex van Andel
598a86426b
Fixes adding google integration not appearing in the dashboard after adding it. This was due to the credential being added async and the redirect happened before the save has completed.
2021-04-22 11:09:18 +00:00
Alex van Andel
8010abf15a
Adds Office 365 / Outlook.com Calendar Integration
...
* Added MS_GRAPH_CLIENT_* credentials to .env.example.
* Refactored the google integration into an abstraction layer for creating events and getting the user schedule from either Google or Office 365.
* FIX: when re-authorizing the Google Integration the refresh_token would no longer be set and the google integration would stop working.
* Updated Office 365 integration image
2021-04-21 23:10:48 +01:00
Bailey Pumfleet
3100adfe36
Merge branch 'main' into main
2021-04-19 10:49:42 +01:00
Chris Benseler
501f229d0e
refactor: using property assignment
2021-04-17 17:12:09 -03:00
Leonardo Stenico
2b0e8bef7a
Completely rebuilt logic when dealing with timezones. Now all available events should appear when selecting a date.
2021-04-17 02:08:35 +02:00
Leonardo Stenico
96e2b762c6
Now owners can set their time zone and users can see available times relatively to their current time zone
2021-04-16 04:09:22 +02:00
Bailey Pumfleet
167f981522
Change start and end times of day
2021-04-13 17:16:32 +01:00
Bailey Pumfleet
ddd7ccfb01
Standardise semicolons
2021-04-11 18:12:18 +01:00
Bailey Pumfleet
1db4973aee
View and delete integrations
2021-04-10 13:02:35 +01:00
Bailey Pumfleet
2c4b5c2846
Create, edit and delete event types
2021-04-08 15:20:38 +01:00
Bailey Pumfleet
f55f2f6321
Add settings section
2021-04-07 16:03:02 +01:00
Bailey Pumfleet
a758c28fb0
Custom login screen and error page
2021-03-29 22:01:12 +01:00
Bailey Pumfleet
1582cfd43f
Add self-authentication with Google Calendar API
2021-03-26 15:51:19 +00:00
Bailey Pumfleet
388ff394c7
Add base admin interface
2021-03-24 15:03:04 +00:00
Bailey Pumfleet
d769c3943c
Add booking flow
2021-03-22 13:48:48 +00:00
Bailey Pumfleet
f260e295f5
Initial commit from Create Next App
2021-03-10 10:02:39 +00:00
