zomars
4fa380d7ed
Update admin
2022-05-17 15:36:04 -06:00
zomars
39031123e1
Update api
2022-05-17 15:36:01 -06:00
zomars
0153bc583a
Type fixes
2022-05-17 15:32:54 -06:00
depfu[bot]
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
a0296b8ccb
Fixes infinite loop
2022-05-17 11:04:02 -06:00
zomars
1c4d2fae56
Fixes infinite loop
2022-05-17 10:53:10 -06:00
Hariom Balhara
84967e5cdf
Add login event ( #2784 )
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-05-17 17:22:57 +01:00
sean-brydon
676268b62d
2FA submit disabled ( #2790 )
2022-05-17 14:15:57 +01:00
zomars
6e2cb4f90d
v1.6
2022-05-16 15:57:29 -06:00
zomars
8b0c7f579a
v1.6
2022-05-16 15:55:16 -06:00
Joe Au-Yeung
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
github-actions[bot]
4e97d3ed72
New Crowdin translations by Github Action ( #2773 )
...
* New Crowdin translations by Github Action
* Update vital.json
* Update vital.json
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Omar López <zomars@me.com>
2022-05-16 13:20:17 -06:00
iamkun
0bfdf2f8ef
fix: split time correctly if the local working hours are just across mid night ( #2766 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-16 19:03:33 +00:00
Leo Giovanetti
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
3421af10a9
Apply suggestions from code review
2022-05-16 12:36:26 -06:00
Omar López
f75917d9c4
Update apps/web/pages/apps/categories/[category].tsx
2022-05-16 12:26:19 -06:00
zomars
c05040795d
Typo
2022-05-16 12:20:40 -06:00
zomars
7d1b13c88d
Typo
2022-05-16 12:17:28 -06:00
zomars
9bd1246ada
Squashed commit of the following:
...
commit 27540b09ce
Author: Agusti Fernandez Pardo <me@agusti.me>
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 <git@agusti.me>
commit ae15a7d739
Author: Hariom Balhara <hariombalhara@gmail.com>
Date: Tue May 10 14:30:43 2022 +0530
Fix time issue
commit 2a5a89fe50
Author: Leo Giovanetti <hello@leog.me>
Date: Wed May 11 10:21:46 2022 -0300
Missing fix for success page
commit 2ce1e78053
Author: Leo Giovanetti <hello@leog.me>
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 <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
commit 2d6d1cb444
Author: Hariom Balhara <hariombalhara@gmail.com>
Date: Tue May 10 14:49:46 2022 +0530
Hotfix: Success page layout broken due to duplicate "When" (#2716 )
commit ef68f4f4f8
Author: Hariom Balhara <hariombalhara@gmail.com>
Date: Tue May 10 10:54:20 2022 +0530
Fix preview.html not built and thus served during depooy (#2713 )
commit 18c28cc3fd
Author: zomars <zomars@me.com>
Date: Mon May 9 16:17:07 2022 -0600
Make apps single pages public
commit d40e8caff9
Author: zomars <zomars@me.com>
Date: Mon May 9 16:08:03 2022 -0600
Turbo fixes
commit 3161cc4d45
Merge: ed808c3be
4099a477d
Author: zomars <zomars@me.com>
Date: Mon May 9 14:58:33 2022 -0600
Merge branch 'main' into production
commit ed808c3be6
Author: Omar López <zomars@me.com>
Date: Mon May 9 14:56:23 2022 -0600
Merge pull request #2672 from calcom/main
v1.5.4
2022-05-16 12:00:04 -06:00
buschco
60c97c9fa9
respect local set timezone and update url on mismatch ( #2506 )
...
* ensure `timeZone()` will make its way to the URL
fixes https://github.com/calcom/cal.com/issues/2482
* keep `timeZone()` and the offset from URL in sync
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-16 17:57:53 +00:00
Agusti Fernandez Pardo
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
Hashen
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
GitStart
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
Leo Giovanetti
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
andreaestefania12
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
sean-brydon
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
zomars
3c37c2e774
Skip sending emails in E2E
2022-05-16 09:49:44 -06:00
GitStart
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
Agusti Fernandez Pardo
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
Hariom Balhara
2655f816af
Fix white border ( #2761 )
2022-05-16 12:38:22 +00:00
Mitchell Moore
016023fa50
Added check on create eventtype to see is user has slug that already exists ( #2757 )
...
* Added check on create eventtype to see is user has slug that already exists, added error check on onError
* revert yarn.lock back
* Catches prisma known error instead of making an additional query
Co-authored-by: zomars <zomars@me.com>
2022-05-15 03:41:39 +00:00
Arthur Cruz
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:
![schedule_deletion_new_behaving](https://user-images.githubusercontent.com/42497300/165126805-b3090268-c1a6-418a-b06e-06bd8446da03.gif )
Team disband:
![team_disband_new_behaving](https://user-images.githubusercontent.com/42497300/165127043-7e083e94-e4c9-4e88-90a2-47d31bdd92e6.gif )
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 b5e40062d7
.
* 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
Leo Giovanetti
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
GitStart
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
2bb6f33112
E2E fixtures ( #2747 )
2022-05-13 21:02:10 -06:00
Omar López
68e275ab07
Improving Email DRYness ( #2486 )
...
* Email DRY
* WIP
* Improve email DRYness
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-13 12:34:54 +00:00
zomars
bf1f9b6a32
Build fixes
2022-05-12 13:54:46 -06:00
Joe Au-Yeung
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
Hariom Balhara
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
613e42ce70
E2E fixing attemps
2022-05-11 21:07:22 -06:00
zomars
43f479299a
Fixes delete-me test
2022-05-11 20:21:16 -06:00
zomars
ecb3264b52
getBusyTimes consolidation
2022-05-11 19:49:21 -06:00
zomars
e89520d7d6
Update testUtils.ts
2022-05-11 16:55:30 -06:00
zomars
892bb90d9d
Update testUtils.ts
2022-05-11 16:39:45 -06:00
zomars
a2ea08ba5f
TODO marks blocking test to be fixed
2022-05-11 16:29:44 -06:00
zomars
06702aa48a
E2E and paid bookings fixes
2022-05-11 14:36:38 -06:00
zomars
f2988870d5
Update booking-pages.test.ts
2022-05-11 12:03:22 -06:00
zomars
f0ea8d30ca
Parallelizes some tests
2022-05-11 11:19:22 -06:00
zomars
c3909ccc70
Multiple E2E improvements
2022-05-11 10:46:52 -06:00