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 |
|
femyeda
|
f2265fdbd7
|
Revert "Revert "Fixed cancellation bug: "cannot read property 'length' of null"""
This reverts commit de4c8f75e0.
|
2021-06-21 07:31:39 -05: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 |
|
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 |
|
Alex van Andel
|
a463fded8f
|
Added <AvailableTimes /> and <TimeOptions /> components
|
2021-06-20 14:19:41 +00:00 |
|
Alex van Andel
|
d904dd7a00
|
AvailableTimes refactor complete, it all seems much simpler now
|
2021-06-20 00:10:08 +00:00 |
|
Alex van Andel
|
b423f2894a
|
WIP to save progress
|
2021-06-19 22:50:47 +00:00 |
|
Malte Delfs
|
6dc5efd6ee
|
fixed additional notes
|
2021-06-19 21:54:22 +02: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 |
|
femyeda
|
ad0b561cca
|
fix: eventType not defined on [user]/[type]
|
2021-06-19 10:17:23 -05:00 |
|
Femi Odugbesan
|
de4c8f75e0
|
Revert "Fixed cancellation bug: "cannot read property 'length' of null""
|
2021-06-19 09:14:24 -05:00 |
|
Bailey Pumfleet
|
11fc0f0d2a
|
Merge pull request #286 from Nico-J/bugfix/cancellation-eventtype-null
|
2021-06-19 09:24:19 +01:00 |
|
nicolas
|
11ba59be9c
|
Fixes #281
|
2021-06-19 03:40:38 +02:00 |
|
Alex van Andel
|
cc1b3fa7dd
|
Return 404 when requesting event url that does not exist
|
2021-06-18 20:41:12 +00: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
|
2441f47c10
|
Fix layout issue with event types
|
2021-06-18 17:21:39 +01: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
|
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 |
|
Bailey Pumfleet
|
2960463f77
|
Merge pull request #267 from Malte-D/feature/select-calendars-to-check-for-availability
Feature: select calendars to check for availability
|
2021-06-18 17:00:05 +01:00 |
|
Malte Delfs
|
50bc6b480e
|
minor change
|
2021-06-18 14:00:53 +02:00 |
|
Peer_Rich
|
8bf556c742
|
Merge pull request #279 from emrysal/bugfix/useEffect-fires-twice
Updated useEffect so it only fires once (added [])
|
2021-06-18 11:35:41 +01:00 |
|
Alex van Andel
|
7584b77811
|
Updated useEffect so it only fires once (added [])
|
2021-06-17 19:29:42 +00:00 |
|
Peer_Rich
|
b3c5752d67
|
updated integration description
|
2021-06-17 17:06:32 +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
|
e3dbc52676
|
Cleaned up loading the availability schedule
|
2021-06-16 22:50:58 +00: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 |
|
Peer Richelsen
|
1de9ccff3a
|
minor changes
|
2021-06-16 14:04:04 +01:00 |
|
Peer Richelsen
|
ea75e8974d
|
added getinitialprops
|
2021-06-16 13:44:25 +01:00 |
|
Peer Richelsen
|
87f7984d76
|
added billing to settings
|
2021-06-16 13:42:30 +01:00 |
|
Malte Delfs
|
68bca9e703
|
Implemented a configurable buffer between events
|
2021-06-15 18:19:00 +02:00 |
|
Malte Delfs
|
738d91787b
|
changed naming
|
2021-06-15 17:27:56 +02:00 |
|
Malte Delfs
|
4fb0fbfe07
|
Made event name customizable
|
2021-06-15 17:26:16 +02:00 |
|
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 |
|
Peer Richelsen
|
52d9f94711
|
inverted color
|
2021-05-07 19:21:42 +01:00 |
|
Peer Richelsen
|
44e5158941
|
added powered by calendso
|
2021-05-07 19:18:41 +01:00 |
|
vklimontovich
|
db05c587a3
|
collect pageview for pages not wrapped in Shell
|
2021-05-07 20:07:36 +03:00 |
|
vklimontovich
|
3739d7752d
|
Telemetry enhancements (mainly, data masking improvements)
- data masking is moved to a separate function;
- hostnames and urls are masked now
- collect pageview for pages not wrapped in Shell
|
2021-05-07 20:05:33 +03:00 |
|
Alex van Andel
|
880c4e91a3
|
Removed redirect clientside session logic from pages and moved to shell
|
2021-05-07 16:01:29 +00:00 |
|