dfb9870894
hotfix
2021-06-29 18:17:09 +02:00
51c0556d30
Hide Calendso branding
2021-06-29 17:08:55 +01:00
099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token
2021-06-29 16:19:20 +01:00
113185e089
Merge pull request #323 from mihaic195/fix/add-login-link-on-forgot-password-page
2021-06-29 09:50:56 +01:00
39df7d61bc
fix: add login link on forgot password page
2021-06-29 11:45:54 +03: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
d1bdac45eb
dont allow user to book a past date
2021-06-28 19:39:08 -05:00
f918f220eb
Fixed Zoom Auth
2021-06-29 02:21:08 +02:00
b4272ad7aa
Merge branch 'main' of github.com:calendso/calendso into feature/scheduling
2021-06-28 19:53:07 +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
383ec64a7f
onChange callback got removed in eslint cleanups
...
Triggered eslint:no-empty-function, this PR circumvents this by adding
a comment as part of the function body.
2021-06-27 13:51:06 +00:00
b5b480f7e2
hotfix for booking
2021-06-26 19:48:24 +02: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
cc02558ac6
Merge pull request #310 from femyeda/fix-244-can-book-when-not-available
...
Fix 244 can book when not available
2021-06-25 16:51:28 +01:00
e883ab591a
simplify expiry calculation, timezone unneccessary
2021-06-25 09:23:32 -05:00
6fec24a69d
use lib folder
2021-06-25 09:21:21 -05:00
ad657c0261
use proper response code
2021-06-25 09:17:39 -05:00
2c29368337
fix: passwordResetLink uses correct page
2021-06-25 09:16:24 -05:00
28edb86c14
Don't render location if there is none for now
2021-06-24 22:48:01 +00: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
a53cdf2660
fix: issue where user could book a meeting when unavailable
2021-06-24 16:21:25 -05:00
9c3eea5257
booking hotfix
2021-06-24 20:41:26 +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
ea5692c20c
Add bookings page
2021-06-24 11:01:41 -05:00
ebb3e87284
Add bookings page
2021-06-24 14:36:31 +01:00
1668785678
Prevent users from entering mixed case usernames
...
Booking pages are case insensitive new, so no more case sensitive
usernames.
2021-06-23 16:10:58 +00:00
afa2e19f03
added more meta data to booking page
2021-06-23 12:14:19 +01:00
629a34262e
Merge branch 'main' into bugfix/lowercase-usernames
2021-06-23 11:29:56 +01:00
c428c3f80e
Merge pull request #300 from Malte-D/feature/og-image
...
Added og-image to booking pages
2021-06-22 19:24:45 +01:00
0e27e7e3d9
changed og-image link
2021-06-22 20:14:28 +02:00
892ba8a335
Lowercase the router.query.user & some typescript fixes
2021-06-22 17:42:32 +00:00
e4b977c001
fix for single quotes
2021-06-22 18:01:03 +02:00
a3b4cbeadd
use https://github.com/calendso/og-image to show dynamic og-image of booking links with avatar and title of booking.
2021-06-22 17:52:52 +02:00
1dce84fa8f
Merge branch 'main' into feature/scheduling
2021-06-22 15:19:28 +00:00
6c6d262184
Merge pull request #299 from Malte-D/bugfix/edit-custom-inputs
...
added edit/remove for customEventTypeInputs
2021-06-22 16:15:45 +01:00
0ea36cb3f8
added edit/remove for customEventTypeInputs
2021-06-22 17:10:52 +02:00
78451a98b1
Updated timeFormat to something more sensible
2021-06-22 14:25:01 +00:00
a486d1eb02
Add some extra states
2021-06-22 15:05:15 +01: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
b50fe16566
Moved DatePicker and PoweredByCalendso to seperate components
2021-06-21 20:26:04 +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
f2265fdbd7
Revert "Revert "Fixed cancellation bug: "cannot read property 'length' of null"""
...
This reverts commit de4c8f75e0
2021-06-21 07:31:39 -05: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
931e6b26f1
error handling WIP
2021-06-20 21:02:15 +02:00
f99729c392
Merged with main
2021-06-20 17:52:18 +00: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
a463fded8f
Added <AvailableTimes /> and <TimeOptions /> components
2021-06-20 14:19:41 +00:00
d904dd7a00
AvailableTimes refactor complete, it all seems much simpler now
2021-06-20 00:10:08 +00:00
b423f2894a
WIP to save progress
2021-06-19 22:50:47 +00:00
6dc5efd6ee
fixed additional notes
2021-06-19 21:54:22 +02: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
ad0b561cca
fix: eventType not defined on [user]/[type]
2021-06-19 10:17:23 -05:00
de4c8f75e0
Revert "Fixed cancellation bug: "cannot read property 'length' of null""
2021-06-19 09:14:24 -05:00
11fc0f0d2a
Merge pull request #286 from Nico-J/bugfix/cancellation-eventtype-null
2021-06-19 09:24:19 +01:00
11ba59be9c
Fixes #281
2021-06-19 03:40:38 +02:00
cc1b3fa7dd
Return 404 when requesting event url that does not exist
2021-06-18 20:41:12 +00:00
95a99c620e
selected calendars hotfix
2021-06-18 22:11:13 +02:00
76b72f64d8
event type custom input WIP
2021-06-18 21:58:42 +02:00
2441f47c10
Fix layout issue with event types
2021-06-18 17:21:39 +01: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
1b1c712c89
Merge branch 'main' into feature/add-buffer-times-for-appointments
2021-06-18 17:04:05 +01:00
90c1ff25bf
Merge branch 'main' into feature/customise-event-names
2021-06-18 17:00:52 +01:00
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
50bc6b480e
minor change
2021-06-18 14:00:53 +02:00
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
7584b77811
Updated useEffect so it only fires once (added [])
2021-06-17 19:29:42 +00:00
b3c5752d67
updated integration description
2021-06-17 17:06:32 +01: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
3366a05c1d
Implemented legacy method to send email even if there is no integration
2021-06-17 01:04:08 +02:00
f56ced0ff1
Re-implemented event confirmation mails object based
2021-06-17 00:56:02 +02:00
e3dbc52676
Cleaned up loading the availability schedule
2021-06-16 22:50:58 +00: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
1de9ccff3a
minor changes
2021-06-16 14:04:04 +01:00
ea75e8974d
added getinitialprops
2021-06-16 13:44:25 +01:00
87f7984d76
added billing to settings
2021-06-16 13:42:30 +01:00
68bca9e703
Implemented a configurable buffer between events
2021-06-15 18:19:00 +02:00
738d91787b
changed naming
2021-06-15 17:27:56 +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
4caac5a88c
Layout fix
2021-06-14 19:55:55 +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
49abf06ce6
Deleting zoom also works
2021-06-14 19:00:17 +02:00
c4455b74ba
Rescheduling zoom works
2021-06-14 18:55:20 +02:00
8e9868db30
Properly concat results and properly handle zoom meeting uuids
2021-06-14 18:47:05 +02:00
7ecb7f22e3
Merge branch 'main' into feature/zoom-integration
2021-06-14 17:17:09 +02:00
2ba98c5dac
Test setup to try zoom meeting creation
2021-06-13 15:57:01 +02:00
30f30d7669
Renamed zoom to zoomvideo
2021-06-13 14:04:03 +02:00
0bb4678bf7
Added subtitle to zoom integrations
2021-06-13 13:59:40 +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
734d9ad243
Save whole JSON
2021-06-11 02:32:07 +02:00
00f19bd654
Added integration to UI
2021-06-11 02:29:43 +02:00
a9a569f876
Removed scopes variable
2021-06-11 02:17:22 +02:00
f44c8b6326
Potentially first working version of token fetching for zoom
2021-06-11 02:14:36 +02:00
697cae9cc9
Very rudimentary development version of zoom auth #6
2021-06-11 02:13:02 +02:00
65a029acde
Very rudimentary development version of zoom auth #5
2021-06-11 02:10:56 +02:00
615e59cde7
Very rudimentary development version of zoom auth #4
2021-06-11 02:08:47 +02:00
46474c9c70
Very rudimentary development version of zoom auth #3
2021-06-11 02:07:02 +02:00
a2f1462f10
Very rudimentary development version of zoom auth #2
2021-06-11 02:03:48 +02:00
b5733716de
Very rudimentary development version of zoom auth
2021-06-11 01:37:58 +02:00
b7b644998a
Merge pull request #258 from Nico-J/bugfix/no-emails-sent-when-no-integration-added
2021-06-10 22:22:10 +01:00
17ccf42976
Merge pull request #257 from Nico-J/feature/button-for-new-integration
2021-06-10 22:21:50 +01:00
cb9d749310
Send email when no integrations are present as well
2021-06-10 23:18:57 +02:00
d249c62620
Added button to add integrations
2021-06-10 22:54:48 +02:00
16b090efd4
Codestyle adjusted & fixed the column behaviour on mobile
2021-06-10 18:49:11 +00:00
4dacf64a18
Merge pull request #253 from Nico-J/feature/cancel-reschedule-links
2021-06-10 07:53:38 +01:00
3d4222c631
Merge branch 'main' into feature/cancel-reschedule-links
2021-06-10 08:33:39 +02:00
01da470664
Removed whitespaces
2021-06-10 01:19:46 +02:00
6c92e2fe1b
Implemented short UUID as UID
2021-06-10 00:51:09 +02:00
e5dc036c50
Replaces nulls with empty strings
2021-06-10 00:50:45 +02:00
9aeb996aef
Adds a bit of margin to left and right for better mobile display
2021-06-09 21:47:00 +00:00
40eb9036f4
Implements inviting external users to teams
2021-06-09 21:43:37 +00:00
f24ca5b672
Fixed incorrect variable & also clears old errors now
2021-06-09 20:32:02 +00:00
af08c74c8a
Implemented rescheduling and concurrent usage of all integrations
2021-06-09 21:46:41 +02:00
e92b2e01fc
UI for rescheduling
2021-06-09 20:28:39 +02:00
e8a5357a89
Restricted usernames to be unique, removes the potential for username conflicts
2021-06-09 12:26:00 +00:00
7d81a1f1fb
Minor UI changes to teams
2021-06-08 17:00:06 +01:00
72a07770e8
Implemented link generation in mails
2021-06-08 17:24:06 +02:00
27194ef68c
Fixed bug where null email address could occurr in office365 credential key
2021-06-07 20:21:38 +02:00
2b84612e5d
Request offline_access in first office365 step
2021-06-07 19:30:09 +02:00
7df41b519f
Use NEXTAUTH_URL to define the BASE_URL, then use that in invite email
2021-06-07 16:57:59 +00:00
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
1daf9bd3f7
Use id
2021-06-07 09:56:15 +02:00
d2934a45ff
Use RefUid
2021-06-07 09:44:56 +02:00
38b6d1c3e9
Properly get eventId
2021-06-07 09:37:28 +02:00
29fef04620
Moved delete request
2021-06-07 09:21:46 +02:00
ce8cca8a39
Fix: Check if credentials present
...
Fix: Request credentials as well
2021-06-07 09:18:41 +02:00
1e306ef1b0
Use calendar deletion
2021-06-07 08:59:13 +02:00
b376e9e5a4
Prepared google calendar deletion
2021-06-07 01:10:56 +02:00
d05ae49e8d
Made UID unique, implemented cancel API, Prepared mail footer,
2021-06-06 03:51:24 +02:00
c29c0395ef
Implemented cancellation success page
2021-06-06 03:26:14 +02:00
ec7a84ce22
Implemented request handler and error handling in frontend and added cancellation event to telemetry
2021-06-06 03:12:55 +02:00
7045bfc364
Implemented (still actionless) page for cancellation
2021-06-06 02:36:40 +02:00
9f12ccf5c1
Teams are now refreshed properly when TeamListItems change
2021-06-05 23:41:05 +00:00
e32caa68eb
Implemented database actions to store bookings in database
2021-06-06 01:32:24 +02:00
7a31cb0f6a
Implemented the API, split the teams page up into multiple components
2021-06-05 22:53:33 +00:00
e2942224ab
Tracking work in progress changes
2021-06-03 20:55:34 +00:00
1f6e3f8f2e
Removed calendar scope, we shouldn't need it.
2021-06-03 00:05:54 +00:00
6e76cc386c
Merge pull request #232 from emrysal/change-email-sending-moments
2021-06-01 23:38:49 +01:00
c4c5e83499
Disables booking confirmation for Office 365 & enable new event email for all
2021-06-01 19:16:06 +00:00
3fdc997caa
Fixed alignment issue with loading spinner
2021-06-01 18:03:13 +00:00
9ba29ab347
Fixes #225 by correctly applying the timezone whilst keeping the original date in UTC
2021-05-29 22:29:04 +00:00
adbf0476ad
Merge branch 'main' into feature/mailings
2021-05-27 22:12:17 +00:00
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
6023a8a314
Add loading spinner to book button
2021-05-27 21:34:02 +01:00
01d150092f
Mobile UI fixes
2021-05-26 20:47:06 +01:00
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
cf06e91e30
Implemented sticky time options based on localStorage
2021-05-26 18:40:22 +00:00
2726c8c87b
Add embed section in Settings
2021-05-26 17:24:10 +01:00
7d6a631f5d
Round available hours if necessary
2021-05-25 21:34:18 +01:00
c610874ec4
Removed unnecessary DB calls & changes everything to use session.user.id
2021-05-22 19:12:06 +00:00
71e50c58d6
Add ability to select first day of week
2021-05-17 18:10:40 -04:00
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
cf13dcc023
add random bullet color in list user's events
2021-05-13 23:05:28 +05:30
f66a59b7e3
Update donation banner
2021-05-13 15:44:48 +01:00
8fe7de9d02
added donation banner for self-hosted
2021-05-13 14:07:27 +01:00
6e300f0db1
Merge pull request #147 from jfernandogt/main
...
feat: Add support for multiple google calendars
2021-05-11 16:04:31 +01:00
5f101ca5fc
feat: Add support for multiple google calendars
2021-05-11 07:27:06 -06:00
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
3a6eae8b8f
Update dashboard
2021-05-11 14:11:17 +01:00
209791d86d
Get user ID from session instead of looking it up
2021-05-11 10:21:05 +01:00
b760ed6ff7
Merge pull request #181 from emrysal/bugfix/ensure-utc-plugin-is-enabled
2021-05-10 18:00:32 +01:00
6b38fd7550
Fixes UTC issue to success page when refreshed
2021-05-10 16:35:48 +00:00
1ab1dfc669
Merge pull request #180 from parasg1999/feature/overlappingAppointment
...
fix: check for overlapping appointments
2021-05-10 11:28:57 +01:00
977e879406
fix: busy time in slot interval
2021-05-10 02:48:12 +05:30
3da430b577
fix: check for overlapping appointments
2021-05-10 02:28:05 +05:30
e8ed94d849
Default [] value for locations array on booking page
2021-05-08 22:17:25 +00:00
ba2feb2c15
feat: Add support to use gravatar as a fallback avatar
2021-05-08 14:26:19 -06:00
a6c3c7fbb3
Implemented configurable eventType phone or physical locations.
2021-05-08 19:03:47 +00:00
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
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
5615db5491
Merge branch 'main' into bugfix/crash-when-username-does-not-exist-#144
2021-05-07 20:40:12 +01:00
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
5553d14631
Merge branch 'main' into main
2021-05-07 20:37:18 +01:00
edec0226c4
Update branding link to calendso.com
2021-05-07 20:34:03 +01:00
a49ac34b7a
fixed logo
2021-05-07 19:23:00 +01:00
52d9f94711
inverted color
2021-05-07 19:21:42 +01:00
44e5158941
added powered by calendso
2021-05-07 19:18:41 +01:00
db05c587a3
collect pageview for pages not wrapped in Shell
2021-05-07 20:07:36 +03:00
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
880c4e91a3
Removed redirect clientside session logic from pages and moved to shell
2021-05-07 16:01:29 +00:00
9ce82360c0
Check if user exists or return a 404 before proceeding
2021-05-07 15:17:06 +00:00
d2ca59adb8
Added redirects() function to next.config.js, changed Settings url
2021-05-07 15:04:56 +00:00
Malte Delfs