c8d6c0dbdd
Add seats to event types ( #2485 )
...
* Add seatsPerTimeSlot to event type schema
* Add seats per time slot to event type form
* Book event and render seats
* Pass booking uid for seats
* Disable requires confirmation if seats are enabled
* Fix type errors
* Update submodules
* Fix type errors
* Fix type errors
* Fix duplicate string
* Fix duplicate string
* Fix schema and migration file
* Fix render seats
* Fix bookinguid typos
* Remove console.log
* Fix type error
* Fix mobile formatting
* Update apps/web/lib/hooks/useSlots.ts
Co-authored-by: Omar López <zomars@me.com >
* Update apps/web/lib/hooks/useSlots.ts
Co-authored-by: Omar López <zomars@me.com >
* Added translation for seats available text
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com >
Co-authored-by: alannnc <alannnc@gmail.com >
2022-05-24 15:19:12 +02:00
Hariom Balhara and GitHub
f0a36f8194
Fix infinite renders on event-type edit page ( #2820 )
2022-05-23 18:59:09 +01:00
7d7a1c5bbc
Fix login page CTA disabled state ( #2832 )
...
* fix(ui/login): better disabled state for login CTA
The fix involves tracking the form submission with a dedicated state `submitInProgress` with React.
`formState` from `react-hook-form` does not take time taken for the network call into account. For example,
if the api takes 5 seconds to complete, we would expect the `formState.isSubmitting` to be true for `5`
seconds. But, surprisingly this is not the case and `formState` from `react-hook-form` resolves
immediately after it makes a successful connection to the endpoint.
A dedicated state (with `useState`) is introduced that is enabled when the user clicks on the login CTA, and disabled when the api call is resolved, either successfully or with an error.
* Update login.tsx
* Update login.tsx
* Fixes isSubmitting state
Co-authored-by: zomars <zomars@me.com >
2022-05-23 17:20:35 +00:00
zomars
3a1d8b8183
Merge production to main
2022-05-23 09:29:19 -06:00
38f23986ad
Hotfix: Fixing Security Issues ( #2848 )
...
* Fixing Privilege Escalation
* Fixing critical obj ref in availability
* Fixing reschedule security issue
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
2022-05-23 11:29:29 +00:00
27422c351c
Fix UI of dialog ( #2788 )
...
* removed large mandatory height and scroll
* added z index using css
* cleanup
* fixed TS errors
* extract dialog out of dropdown
* Adds custom loading text to confirmation dialog
* rename update
* utilizing mutation loading state
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-23 13:17:00 +02:00
c5ad74f61c
Request the inclusion Assuncion Time Zone ( #2840 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com >
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev >
2022-05-23 13:12:41 +02:00
2560b72596
Wrong username is identified if query params are present and user doesn't exist ( #2838 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com >
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev >
2022-05-23 12:34:11 +02:00
7d7c61a1ab
Adding labels ( #2783 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-23 09:11:04 +01:00
Leo Giovanetti and GitHub
ba9be4e69d
Fix login submit ( #2849 )
2022-05-22 14:28:18 +02:00
Syed Ali Shahbaz and GitHub
e62af90619
fixes dynamic color and typefix for tfunction after react upgrade ( #2821 )
2022-05-20 07:06:21 +00:00
+7
4b6c701c48
save additional inputs as json + view details of booking ( #2796 )
...
* move custom inputs from description to own json object
* show custom inputs on success page
* fix type error
* add custom inputs to email and webhook
* add custom inputs to all emails
* add values for custom inputs when rescheduling
* add custom input everywhere description is shown
* fix bug with boolean value
* fix issues with null values
* disable custom inputs and add notes for organizer
* don't show custom input with empty string
* don't show custom inputs with empty string in calender event and email
* add link to booking details page
* redirect to success page to see booking details
* add functionality to cancel and reschedule booking
* fix bookings that require confirmation
* clean code
* fix infinite lopp in useEffect of success page
* show web conference details message when integration as location
* improve design of cancelling event
* clean code
* disable darkmode for organizer on booking details page
* fix dark mode for cancelling booking
* fix build error
* Fixes infinite loop
* Fixes infinite loop
* Fixes infinite loop
* Update all Yarn dependencies (2022-05-16) (#2769 )
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com >
* Create ci.yml
* Update ci.yml
* Reintroduces typescript-eslint
Buckle up!
* Type fixes
* Update ci.yml
* Update api
* Update admin
* Reusable inferSSRProps
* Linting
* Linting
* Prisma fixes
* Update ci.yml
* Cache testing
* Update e2e.yml
* Update DatePicker.tsx
* Update e2e.yml
* Revert "Linting"
This reverts commit adf817766e .
* Revert "Linting"
This reverts commit 1b59dacd64 .
* Linting
* Update e2e.yml
* Ci updates
* Add team Id to hash url (#2803 )
* Fix missing tabs - Embed (#2804 )
* Fix missing tabs
* Fix Eslint error
* Fix Eslint errors
* Add import statement (#2812 )
* Add import statement
* Update apps/docs/next.config.js
Co-authored-by: Omar López <zomars@me.com >
* Show success page if booking was deleted on calendar (#2808 )
* Add exception to 410
* Fix type error
* Add GoogelCalError type
* only show invite link for app.cal.dev (#2807 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
Co-authored-by: Omar López <zomars@me.com >
* fix: update eslint config to test .ts and .js separately (#2805 )
* fix: update eslint config
* fix: update ts ignore
* fix: update eslint config
* Update TeamAvailabilityScreen.tsx
* Type fixes
* Update useIntercom.ts
Co-authored-by: Omar López <zomars@me.com >
* fix: sync api to latest commit (#2810 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me >
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Embed React improvements (#2782 )
* Add off support. Add getApi export.
* Add publish command
* Add embed-snippet in prod deps
* Update README
* Update package.json
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com >
Co-authored-by: zomars <zomars@me.com >
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Consolidates test-results
* Type fixes
* Abstracts minimal booking select
* Type fixes
* Update listBookings.ts
* Update common.json
* Update bookingReminder.ts
* Consolidates isOutOfBounds
* Update webhookResponse-chromium.txt
* Update TableActions.tsx
* Type fixes
* Update BookingPage.tsx
* Update webhookResponse-chromium.txt
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
Co-authored-by: Alex van Andel <me@alexvanandel.com >
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com >
Co-authored-by: zomars <zomars@me.com >
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com >
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com >
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com >
Co-authored-by: iamkun <kunhello@outlook.com >
Co-authored-by: Agusti Fernandez Pardo <me@agusti.me >
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me >
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-18 15:05:49 -06:00
sean-brydon and GitHub
821105dccb
Add team Id to hash url ( #2803 )
2022-05-18 08:59:23 -06:00
zomars
0153bc583a
Type fixes
2022-05-17 15:32:54 -06:00
db01f7be19
Update all Yarn dependencies (2022-05-16) ( #2769 )
...
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com >
2022-05-17 19:31:49 +00:00
zomars
683e8c4490
Fixes infinite loop
2022-05-17 11:10:57 -06:00
zomars
1c4d2fae56
Fixes infinite loop
2022-05-17 10:53:10 -06:00
84967e5cdf
Add login event ( #2784 )
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com >
2022-05-17 17:22:57 +01:00
sean-brydon and GitHub
676268b62d
2FA submit disabled ( #2790 )
2022-05-17 14:15:57 +01:00
ad126efee8
Add Google cal extneral calendar id to booking reference ( #2671 )
...
* Set google cal event id to use our uid
* Save calendar external id to bookingRef
* Pass external calendar ids to update and delete
* Create migration
* Fix type errors
* Fix prisma url
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com >
2022-05-16 14:20:09 -06:00
81d917e27a
Alert to describe exclusion of options ( #2770 )
...
* Alert to describe exclusion of options
* Update apps/web/pages/event-types/[type].tsx
Co-authored-by: Omar López <zomars@me.com >
* Update apps/web/components/eventtype/RecurringEventController.tsx
Co-authored-by: Omar López <zomars@me.com >
* Formatting
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com >
2022-05-16 18:50:53 +00:00
Omar López and GitHub
3421af10a9
Apply suggestions from code review
2022-05-16 12:36:26 -06:00
Omar López and GitHub
f75917d9c4
Update apps/web/pages/apps/categories/[category].tsx
2022-05-16 12:26:19 -06:00
zomars
7d1b13c88d
Typo
2022-05-16 12:17:28 -06:00
9c52e195ea
Fix adds redirect callback that support app.cal.com ( #2768 )
...
* Fix adds redirect callback that support app.cal.com
* Update apps/web/pages/api/auth/[...nextauth].tsx
Check origin of website and baseurl
Co-authored-by: Omar López <zomars@me.com >
* fix: lint issue extra space removed
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me >
Co-authored-by: Omar López <zomars@me.com >
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-16 17:44:44 +00:00
e4c5df7a2e
remove redundant conditional expressions ( #2756 )
...
* remove redundant conditional expressions
* remove redundant conditional expression
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com >
2022-05-16 11:26:32 -06:00
2eae40eff2
Readd steps to create a new user #2665 ( #2759 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com >
2022-05-16 11:23:40 -06:00
9e662aa202
Mutually exclusive options ( #2755 )
...
Co-authored-by: Omar López <zomars@me.com >
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-16 17:15:09 +00:00
f2a6d00348
Fix/unpaid unconfirmed ( #2553 )
...
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com >
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com >
* Update apps/web/pages/api/integrations.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com >
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/confirm.ts
Co-authored-by: alannnc <alannnc@gmail.com >
* Modal window before delete stripe integration
* ESLint Report
* Test fixes
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com >
Co-authored-by: alannnc <alannnc@gmail.com >
Co-authored-by: zomars <zomars@me.com >
2022-05-16 10:27:36 -06:00
7fd149fd2e
Users Phone Number Option ( #2669 )
...
* Users Phone Number Option
* Implemented improvments
* Add validation to form
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com >
2022-05-16 09:50:12 -06:00
84f19bb4df
Bad UX when user wants to set the default Event Type Title #2245 ( #2760 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com >
2022-05-16 09:44:19 -06:00
549e38fb78
fix: remove hardcoded redirect in signin url email verification ( #2764 )
...
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me >
2022-05-16 17:34:13 +02:00
2a53614723
Fix/avoid multiple schedule deletions ( #2602 )
...
* Prevents users from deleting the same schedule multiple times due to delay before the schedule disappears. It also applies the same fix to team disband.
Schedule deletion:

Team disband:

Fixes issue [#2569 ](https://github.com/calcom/cal.com/issues/2569 )
Bug fix (non-breaking change which fixes an issue)
**apps/web/components/LightLoader.tsx** → this file was created in order to make a light color loading spinner available. It's necessary when we need to display a loading spinner above dark backgrounds.
**apps/web/components/availability/ScheduleListItem.tsx** → this component was created in order to give a schedule list item its own state.
* Removing a "setTimeout" that was only used for testing purposes
* Adding a code review suggestion to my modifications
* Changing loading style
* Cleanup
* Avoids using unnecessary state
* Revert "Adding a code review suggestion to my modifications"
This reverts commit b5e40062d71157ca1d9384fb1f5c30d50625809d.
* Reverts some changes
* Renames isLoading
Co-authored-by: Alex van Andel <me@alexvanandel.com >
Co-authored-by: Omar López <zomars@me.com >
2022-05-14 12:47:23 -06:00
212fd1bc14
Fixing ESLint warnings ( #2723 )
...
* Fixing warnings
* Reverting and disabling ESLint in some cases
* Reverting Next Images
* Reverting file, bad merge
* Targeting ESLint to line
* Additional warnings
* New warning squished
* More tweaks and major fixes
* Uneeded conf
Co-authored-by: Omar López <zomars@me.com >
2022-05-14 13:49:39 +00:00
93bd4ed79e
Sign in button should be changed or disabled after click #2654 ( #2749 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com >
2022-05-14 07:38:56 -06:00
Omar López and GitHub
2bb6f33112
E2E fixtures ( #2747 )
2022-05-13 21:02:10 -06:00
zomars
bf1f9b6a32
Build fixes
2022-05-12 13:54:46 -06:00
Joe Au-Yeung and GitHub
b69c1e46d1
Merge pull request #2745 from calcom/apps/multiple-categories
...
Allow apps to belong to multiple categories
2022-05-12 11:47:11 -06:00
7a08403636
Fix reschedule not happening in calendar if two calendards are there ( #2733 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
2022-05-12 09:33:15 +00:00
zomars
ecb3264b52
getBusyTimes consolidation
2022-05-11 19:49:21 -06:00
zomars
06702aa48a
E2E and paid bookings fixes
2022-05-11 14:36:38 -06:00
01e88b3807
Allow deletion of a disabled event ( #2737 )
...
* allows deletion of disabled event
* some visual fixes
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 14:14:08 +00:00
Peer Richelsen and GitHub
0945bbe5cf
fixes #2732 ( #2732 )
2022-05-11 12:04:04 +02:00
fb436996c0
Change date format for RecurringBookings ( #2707 )
...
* Change date format for RecurringBookings
* Missing bookingId query param
Co-authored-by: Leo Giovanetti <hello@leog.me >
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 07:59:49 +00:00
50f1fe544e
Improve logs and Fix unwanted 500 to reduce noise in logs ( #2674 )
...
* Improve logs
* Fix unintentional 500
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 05:41:09 +00:00
Syed Ali Shahbaz and GitHub
746643bf8e
adds availability select loader ( #2718 )
2022-05-11 05:26:06 +00:00
65a69ef1e4
Add more embed events ( #2719 )
...
* Add more embed events
* Add more embed events
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
2022-05-11 05:14:08 +00:00
6483182ef6
add invite link to Zapier setup page ( #2696 )
...
* add invite link and toaster to zapier setup page
* create env variable for invite link and save in database
* fetch invite link form getStaticProps
* add getStaticPath method
* clean code
* Moves app setup and index page
* Moves Loader to ui
* Trying new way to handle dynamic app store pages
* Cleanup
* Update tailwind.config.js
* zapier invite link fixes
* Tests fixes
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com >
2022-05-11 04:58:10 +00:00
Peer Richelsen and GitHub
92806d5257
fixed /booking skeleton ( #2722 )
...
* fixed /booking skeleton
* nit
2022-05-10 16:59:23 +02:00
zomars
819c6c96e8
Build fixes
2022-05-09 14:05:57 -06:00