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
17b880335a
Merge pull request #156 from MaZderMind/link-to-public-page
...
Add Links to Public Pages
2021-05-06 22:22:33 +01:00
dfadd3178d
Merge pull request #158 from rymaju/feature/event_type_required_field_validation
...
Perform simple validation for required fields
2021-05-06 22:20:48 +01:00
9032adb9ab
Merge pull request #164 from rberrelleza/split-signup-validation
...
send back a specific message per field
2021-05-06 21:48:04 +01:00
5be885de19
UI improvements to time settings
2021-05-06 21:44:55 +01:00
d4ba855a72
send back a specific message per field
...
Signed-off-by: Ramiro Berrelleza <rberrelleza@gmail.com>
2021-05-06 12:43:00 -07:00
084c7db559
Now a user can choose a timezone to display slots when scheduling a meeting
2021-05-06 19:36:57 +02:00
25c9da1ef2
set modal state to false
2021-05-05 18:14:07 -04:00
03717a0a29
add required attribute to all required <input> tags
2021-05-05 17:58:42 -04:00
15a6799421
add links to public pages
2021-05-05 22:01:56 +02:00
ca1979fac2
- Updated jitsu to 2.0.1
...
- Mask sensitive information (such as page title and IP address)
2021-05-05 18:04:53 +03:00
5cb0e44b00
Merge branch 'main' into fix/calendar-style
2021-05-05 15:42:36 +01:00
e185b57db1
Merge pull request #148 from emrysal/feature/disable-integrations-when-invalid-or-missing-configuration
...
Take server config into account whilst listing integrations, improved…
2021-05-05 15:39:13 +01:00
0f3323aa9d
Merge pull request #141 from emrysal/bugfix/remove-settings-cancel-button
...
Remove the 'Cancel' button from the Settings pages suggested in #140
2021-05-05 15:33:18 +01:00
a445b262ce
Merge pull request #138 from rymaju/add_client_side_email_validation
...
Adding email validation to booking
2021-05-05 15:32:43 +01:00
cc2c3d7673
Merge pull request #136 from emrysal/bugfix/google-eventedit
...
Fixes #134 , invalid add to google calendar link on success page.
2021-05-05 15:31:40 +01:00
f7295afaa2
Merge branch 'main' into main
2021-05-05 15:18:58 +01:00
e036e9b216
fix calendar style and resolve some TS lint errors
2021-05-04 20:42:01 -07:00
4969258e62
Take server config into account whilst listing integrations, improved feedback for installer as per #142
2021-05-04 20:31:15 +00:00
df88919d15
Remove the 'Cancel' button from the Settings pages suggested in #140
2021-05-04 11:36:06 +00:00
acf29cdaa5
make name and email fields required
2021-05-03 16:56:33 -04:00
b8d570c8db
changed input type to email
2021-05-03 16:33:07 -04:00
69f3497658
Fixes #134 , invalid add to google calendar link on success page.
2021-05-03 16:59:49 +00:00
bf672280fe
Merge pull request #124 from emrysal/bugfix/fix-nextauth-webpack5
...
csrfToken->getCsrfToken is required by webpack5 (fixes #123 , thanks @jacobocode)
2021-05-01 09:19:21 +01:00
7b8d0b1119
Implemented getCsrfToken as per auth-next docs, getCsrfToken is required by webpack5 ( fixes #123 , thanks @jacobocode)
2021-04-30 21:15:18 +00:00
27eb9ad95e
Fix cancel link on booking page
2021-04-30 13:06:04 +01:00
ea31607598
Fix a bunch of TypeScript errors
2021-04-29 14:47:01 +01:00
1b7c9cf359
Fix TypeScript ref errors
2021-04-29 14:04:08 +01:00
c2dfbaad88
Set avatar through URL
2021-04-29 13:36:37 +01:00
7d7b627304
Improve settings page redirect
2021-04-29 13:28:25 +01:00
687ab5ad3e
Replace router URL instead of reloading
2021-04-29 13:05:50 +01:00
b2c848d666
Fix logout screen icon
2021-04-29 13:03:49 +01:00
a1eed7c77e
Add URL slugs
2021-04-28 13:24:16 +01:00
4d585505f7
Add view link for hidden event types
2021-04-28 10:27:45 +01:00
c320b0f20d
Add hidden event types
2021-04-28 10:23:30 +01:00
b32a4c75c0
Merge pull request #111 from diegofn/main
...
Update success page calendar icons
2021-04-28 09:28:00 +01:00
5fc433ecdf
Add day labels to calendar
2021-04-28 09:23:42 +01:00
36db7fb4f1
Match formatting
2021-04-27 21:56:30 -04:00
83822c777c
Fix calendar layout and adjust spacing
2021-04-27 21:50:54 -04:00
2c4fe5c3b7
Update success page calendar icons
2021-04-27 09:35:56 -05:00
2894be8689
Added telemetry collection (through jitsu.com)
...
- Introduced useTelemetry() hook
- Telemetry events are sent for page_view, booking_confirmed, time_selected, date_selected events
- Telemetry is configured (and can be disabled) with NEXT_PUBLIC_TELEMETRY_KEY env variable
2021-04-27 17:19:12 +03:00
d482b54fda
Implemented react-timezone-select library, required the installation of 'next-transpile-modules', due to import and export not being natively supported within Next.js.
2021-04-26 12:14:23 +00:00
d867631aee
Combine different timezones to condense the list a little bit. Fixes https://github.com/calendso/calendso/issues/80
2021-04-22 18:03:52 +00:00
6091f7ba86
Merge pull request #87 from emrysal/main
...
Adds Office 365 / Outlook.com Calendar Integration
2021-04-22 15:04:56 +01:00
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
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
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
ce398bd77c
Replace all SVG icons with Heroicons components
2021-04-21 11:10:27 +01:00
d28166a2c3
Switch between 12 and 24 hours
2021-04-20 15:41:36 +01:00
064ddf9fa3
Add confirmation to set times modal
2021-04-20 15:09:31 +01:00
35f7b30097
Add success modal
2021-04-20 13:56:50 +01:00
026e5475f1
Merge pull request #53 from harad1/main
...
Tweaks to the Dashboard UI
2021-04-20 11:36:12 +01:00
6b3ba4edae
Merge pull request #56 from harad1/new-event-validation
...
Basic validation for New Event Type to prevent unexpected behaviour
2021-04-20 11:33:53 +01:00
c09ce2b2b5
Basic validation for New Event Type to prevent unexpected behaviour
...
Previously, when creating a new event type, user was still allowed to create a new event type, even if the event length's field was empty. This would cause a prisma error, since it would receive NaN and no event would have been added, but the page still reloaded. Therefore, a very basic validation to address this, at least in the short-term.
2021-04-20 01:30:38 +01:00
c9b334462b
Fix for a bug when updating an event type
...
- Due to the lack of router object, after clicking "Update" on the Event Type - a response would be printed to the console, but without being routed back to the availability page.
2021-04-20 01:25:35 +01:00
8b4ef30f74
Tweaks to the Dashboard UI
...
- Increasing the padding of "Your integrations" tile to match the height of "Welcome to Calendso!" tile in medium and large size screens.
- Tweaking rounding of corners of the "Welcome to Calendso!" tile so it matches the styling of "Your integrations" tile in all screen sizes.
2021-04-19 18:36:39 +01:00
64d3fcfab2
Merge pull request #45 from emrysal/main
...
Added ics library, added icon to download .ics on the success page.
2021-04-19 16:35:18 +01:00
3e5ed294a5
Fix incorrect modal toggle
2021-04-19 15:04:04 +01:00
3100adfe36
Merge branch 'main' into main
2021-04-19 10:49:42 +01:00
90ebf8a97e
Added ics library, added icon to download .ics on the success page.
2021-04-17 20:18:51 +00:00
Malte Delfs