Commit Graph

62 Commits (663a9f7bcc274bbe1144d4a5a71c4d7608ade0c6)

Author SHA1 Message Date
Bailey Pumfleet 06dce130b2
Merge pull request #450 from emrysal/bugfix/custom-inputs 2021-08-16 10:35:28 +01:00
Alex van Andel 252a329f09 Fixed issues relating to custom-inputs
* Don't duplicate custom input when editing before db persist
* Remove correct custom input during delete pre db persist (id undefined)
* Moved typings to prisma, keeping backwards compatibility with @map
* Updated all usages of the enum
2021-08-14 17:03:50 +00:00
Syed Ali Shahbaz 0c3ec98062 added image-uploader component and refactored profile settings page 2021-08-12 10:14:11 +05:30
Peer Richelsen 6e7893d1a8 fixed add guest input for darkmode 2021-08-08 23:44:11 +02:00
Peer_Rich f664afb371
Merge branch 'main' into main 2021-08-08 23:19:31 +02:00
Peer Richelsen ded399e8f6 removed unused import 2021-08-08 18:17:17 +02:00
Syed Ali Shahbaz 81a3f7f3fc cleaned up code 2021-08-05 10:31:32 +05:30
Syed Ali Shahbaz 6102feec1f improved styling and dark mode for add-guest button 2021-08-05 10:03:08 +05:30
Peer_Rich 6977b74f35
Merge pull request #411 from alishaz-polymath/main
Added 'Add Guest' button at the confirm booking step
2021-08-04 20:17:30 +02:00
Syed Ali Shahbaz 183386848a cleaning up code 2021-08-04 16:20:38 +05:30
Syed Ali Shahbaz 8e277ef800 fixed merge conflict in globals.css 2021-08-04 16:16:53 +05:30
Syed Ali Shahbaz 00069fa9a7 Added -Add guest- button at confirm booking step, and minor code improvement 2021-08-04 16:09:43 +05:30
Malte Delfs ea22741153 fixed #398 2021-08-03 12:45:19 +02:00
Bailey Pumfleet fd535fc308
Merge pull request #379 from mihaic195/fix/settings-page-and-theme-on-booking-page
Fix: Settings page bug and dark theme adjustments
2021-08-03 08:27:29 +01:00
Peer Richelsen bd7443017a fixed layout for react-select 2021-08-02 17:24:01 +02:00
Peer Richelsen d3569978f5 added dark mode classes for custom input fields 2021-07-26 22:08:53 +02:00
mihaic195 394be8612b
fix: settings page was missing value prop and restyled dark theme elements on booking page 2021-07-22 15:16:21 +03:00
Femi Odugbesan 45689059c7
Feat/cal 95/date range on event types (#353)
* add edit links to events on dashboard

* fit elements on screen for mobile

* initialize components for consistent text styles

* add more fine grained width/height settings

* add higher level setting for when an event is available

- db: add supporting values to period allow setting an amount of days,
 a range, or unlimited number days an event is available

* fix issue where periodDates are null

* return minimal required data, handle date parsing

* [ui] limit booking days based on user period settings

* api: validate user period settings

* [db] migration for event type period settings
2021-07-15 09:10:26 -05:00
Alex van Andel 4d7427ad91 Fixes some linting + codacy issues 2021-07-11 19:43:28 +00:00
Alex van Andel 5206fb4f88 Implemented theme through user preferences 2021-07-09 23:13:34 +00:00
Peer Richelsen bf85cff76d added dark mode for profile page 2021-07-09 13:34:00 +02:00
Peer Richelsen 01fc00b92f added darkmode classs to ¢[type] and /book 2021-07-07 21:58:18 +02:00
Peer Richelsen 749978798b fixed layout for confirmation screen on mobile 2021-07-03 22:27:56 +02:00
Alex van Andel 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
nicolas bc47975316 Added zoom as an event location and fixed ESLint 2021-06-25 00:26:55 +02:00
Malte Delfs 9c3eea5257 booking hotfix 2021-06-24 20:41:26 +02:00
Malte Delfs 917b2c4821 Merge branch 'main' into feature/refresh-tokens-and-error-handling 2021-06-24 18:03:54 +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
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
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 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
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
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
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
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
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