Skip to content

[pull] main from calcom:main #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 31, 2025
Merged

[pull] main from calcom:main #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1115030
fix: added message in schedule bulk update (#26334)
Spandan-Mishra Dec 31, 2025
fdb4cc5
fix: replace scroll-bar with no-scrollbar in AvailableTimeSlots compo…
KartikLabhshetwar Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/modules/availability/availability-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export function AvailabilityList({ availabilities }: AvailabilityListProps) {
onSuccess: () => {
utils.viewer.availability.list.invalidate();
revalidateAvailabilityList();
showToast(t("success"), "success");
showToast(t("bulk_updated_schedule_successfully"), "success");
callback();
},
}
Expand Down
1 change: 1 addition & 0 deletions apps/web/public/static/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,7 @@
"delete_schedule_description": "Deleting a schedule will remove it from all event types. This action cannot be undone.",
"schedule_created_successfully": "{{scheduleName}} schedule created successfully",
"availability_updated_successfully": "{{scheduleName}} schedule updated successfully",
"bulk_updated_schedule_successfully": "Bulk updated selected event types with default schedule",
"schedule_deleted_successfully": "Schedule deleted successfully",
"default_schedule_name": "Working Hours",
"new_schedule_heading": "Create an availability schedule",
Expand Down
4 changes: 2 additions & 2 deletions packages/features/bookings/Booker/components/AvailableTimeSlots.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export const AvailableTimeSlots = ({
<div
ref={containerRef}
className={classNames(
limitHeight && "scroll-bar grow overflow-auto md:h-[400px]",
limitHeight && "no-scrollbar grow overflow-auto md:h-[400px]",
!limitHeight && "flex h-full w-full flex-row gap-4",
`${customClassNames?.availableTimeSlotsContainer}`
)}>
Expand All @@ -227,7 +227,7 @@ export const AvailableTimeSlots = ({
{!isLoading &&
slotsPerDay.length > 0 &&
slotsPerDay.map((slots) => (
<div key={slots.date} className="scroll-bar overflow-x-hidden! h-full w-full overflow-y-auto">
<div key={slots.date} className="no-scrollbar overflow-x-hidden! h-full w-full overflow-y-auto">
<AvailableTimes
className={customClassNames?.availableTimeSlotsContainer}
customClassNames={customClassNames?.availableTimes}
Expand Down
Loading