Commit Graph

77 Commits (1dce84fa8f65723456616e047e7838ab44de9353)

Author SHA1 Message Date
Alex van Andel 1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00:00
Alex van Andel 78451a98b1 Updated timeFormat to something more sensible 2021-06-22 14:25:01 +00:00
Bailey Pumfleet 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
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
Alex van Andel b50fe16566 Moved DatePicker and PoweredByCalendso to seperate components 2021-06-21 20:26:04 +00: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
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 639341f701 show custom inputs on booking screen 2021-06-19 21:44:36 +02:00
femyeda ad0b561cca fix: eventType not defined on [user]/[type] 2021-06-19 10:17:23 -05:00
Alex van Andel cc1b3fa7dd Return 404 when requesting event url that does not exist 2021-06-18 20:41:12 +00:00
Bailey Pumfleet 90c1ff25bf
Merge branch 'main' into feature/customise-event-names 2021-06-18 17:00:52 +01:00
Alex van Andel 7584b77811 Updated useEffect so it only fires once (added []) 2021-06-17 19:29:42 +00:00
nicolas 51a8bafaa7 Full zoom integration (except availability check) 2021-06-16 22:14:44 +02:00
Malte Delfs 4fb0fbfe07 Made event name customizable 2021-06-15 17:26:16 +02:00
nicolas e5dc036c50 Replaces nulls with empty strings 2021-06-10 00:50:45 +02: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 3fdc997caa Fixed alignment issue with loading spinner 2021-06-01 18:03:13 +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
Alex van Andel cf06e91e30 Implemented sticky time options based on localStorage 2021-05-26 18:40:22 +00:00
Heath Daniel 71e50c58d6 Add ability to select first day of week 2021-05-17 18:10:40 -04: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 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 5615db5491
Merge branch 'main' into bugfix/crash-when-username-does-not-exist-#144 2021-05-07 20:40:12 +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 9ce82360c0 Check if user exists or return a 404 before proceeding 2021-05-07 15:17:06 +00:00
Bailey Pumfleet 5be885de19 UI improvements to time settings 2021-05-06 21:44:55 +01:00
Leonardo Stenico 084c7db559 Now a user can choose a timezone to display slots when scheduling a meeting 2021-05-06 19:36:57 +02:00
vklimontovich 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
Bailey Pumfleet 5cb0e44b00
Merge branch 'main' into fix/calendar-style 2021-05-05 15:42:36 +01:00