From 9bd1246ada3eb9c5986e913d894f526076afac04 Mon Sep 17 00:00:00 2001 From: zomars Date: Mon, 16 May 2022 12:00:04 -0600 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 27540b09ce950f215475ddffe15dd8f9b3877f5b Author: Agusti Fernandez Pardo Date: Mon May 16 17:34:13 2022 +0200 fix: remove hardcoded redirect in signin url email verification (#2764) Co-authored-by: Agusti Fernandez Pardo commit ae15a7d7398258a0bff23d24d9a067750e875bd7 Author: Hariom Balhara Date: Tue May 10 14:30:43 2022 +0530 Fix time issue commit 2a5a89fe50bf181cbbe4124eb8ed967545bd377a Author: Leo Giovanetti Date: Wed May 11 10:21:46 2022 -0300 Missing fix for success page commit 2ce1e780537f48f81a674d752b1301f6cf6adc23 Author: Leo Giovanetti Date: Wed May 11 10:12:59 2022 -0300 Hotfix: Success page for recurring event (#2725) * Merge pull request #2672 from calcom/main v1.5.4 * Turbo fixes * Make apps single pages public * Fix preview.html not built and thus served during depooy (#2713) * Hotfix: Success page layout broken due to duplicate "When" (#2716) * Update BookingPage.tsx * Reverting unchaged lines * Fixing recurrenceRule for ICS files Co-authored-by: Omar López Co-authored-by: Hariom Balhara commit 2d6d1cb444e3a95ae85e50235a76d716156a41dd Author: Hariom Balhara Date: Tue May 10 14:49:46 2022 +0530 Hotfix: Success page layout broken due to duplicate "When" (#2716) commit ef68f4f4f8f2195de33af15946eec52ab4818b40 Author: Hariom Balhara Date: Tue May 10 10:54:20 2022 +0530 Fix preview.html not built and thus served during depooy (#2713) commit 18c28cc3fdae3e4f4396ecb974c8593736be7269 Author: zomars Date: Mon May 9 16:17:07 2022 -0600 Make apps single pages public commit d40e8caff9d201c5a6a99ac49ca0a870798ff48c Author: zomars Date: Mon May 9 16:08:03 2022 -0600 Turbo fixes commit 3161cc4d4520a7a214349605fa2bae4184cd5931 Merge: ed808c3be 4099a477d Author: zomars Date: Mon May 9 14:58:33 2022 -0600 Merge branch 'main' into production commit ed808c3be61e3858f559489e069dd87d35bf2e12 Author: Omar López Date: Mon May 9 14:56:23 2022 -0600 Merge pull request #2672 from calcom/main v1.5.4 --- apps/web/components/booking/pages/BookingPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/components/booking/pages/BookingPage.tsx b/apps/web/components/booking/pages/BookingPage.tsx index 15b291cd..f479d00e 100644 --- a/apps/web/components/booking/pages/BookingPage.tsx +++ b/apps/web/components/booking/pages/BookingPage.tsx @@ -486,7 +486,7 @@ const BookingPage = ({
{(rescheduleUid || !eventType.recurringEvent.freq) && - parseDate(dayjs.tz(date, timeZone()), i18n)} + parseDate(dayjs(date).tz(timeZone()), i18n)} {!rescheduleUid && eventType.recurringEvent.freq && recurringStrings.slice(0, 5).map((aDate, key) =>

{aDate}

)}