forked from calcom/cal.com
-
Notifications
You must be signed in to change notification settings - Fork 0
[pull] main from calendso:main #313
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.
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
Open
pull
wants to merge
10,000
commits into
AppInitio:main
Choose a base branch
from
calcom:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* chore: sync vercel env var with trigger.dev * chore: get trigger version from .env.production * chore: deploy trigger dev tasks in draft release * fixup! chore: deploy trigger dev tasks in draft release * fixup! Merge branch 'main' into sync-trigger-dev-env-vercel * remove trigger version from commit message it's already in .env.production * chore: use generated token instead of GITHUB_TOKEN in draft release * fix: code review
…6836) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Replace ESLint fixAll with Biome codeActionsOnSave settings: - source.fixAll.biome: applies safe lint fixes (e.g., removing unused imports) - source.organizeImports.biome: sorts and organizes imports/exports Both are needed separately because they serve different purposes: - fixAll handles lint rule auto-fixes - organizeImports handles import sorting/ordering This aligns with Biome being the default formatter in this repo. Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…t_target (#26842) * feat: remove fork restriction from Stale Community PR Devin Completion workflow Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add back request maintainer access step for fork PRs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: simiondolha <simiondolha@users.noreply.github.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
* fix: reuse existing Devin sessions in stale PR completion workflow Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: consolidate Devin session logic into reusable action - Create .github/actions/devin-session composite action for session checking - Update stale-pr-devin-completion.yml to use the new action - Update cubic-devin-review.yml to use the new action - Update devin-conflict-resolver.yml to use the new action - Rename workflows to 'PR Labeled' with descriptive job names The new action checks for existing Devin sessions by: 1. Looking for session URLs in PR body (for PRs created by Devin) 2. Searching PR comments for known Devin session patterns 3. Verifying session is active (working, blocked, or resumed status) This eliminates duplicated session checking logic across all three workflows. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * revert: restore original workflow names Reverted workflow names back to descriptive names: - 'Stale Community PR Devin Completion' (was 'PR Labeled') - 'Devin PR Conflict Resolver' (was 'PR Labeled') Descriptive names are the recommended convention as they appear in GitHub Actions tab, status checks, and notifications. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add active status check for PR body sessions Addresses Cubic AI feedback (confidence 9/10): PR body sessions now verify the session is active (working, blocked, or resumed) before reusing, matching the behavior of comment-based session checks. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* fix: make flaky E2E tests more stable - Add waitForFunction for localStorage check in change-theme test to wait for app-theme to be set before asserting - Use waitUntil: 'domcontentloaded' for waitForURL calls in routing-forms tests to handle client-side navigation more reliably Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Anik Dhabal Babu <adhabal2002@gmail.com>
* fix(companion): iOS event type detail fixes - Fix #1: Weekly schedule now shows multiple time slots per day in AvailabilityTab - Fix #2: Allow numeric input fields to be empty with proper validation - Fix #3: Add native iOS date picker for date range in Limits tab - Fix #4: Change 'Email verification' to 'Booker email verification' in Advanced tab - Fix #5: Fix Requires confirmation comparison logic in buildPartialUpdatePayload - Fix #6: Forward parameters toggle already working, verified wiring - Fix #7: Add toggles for redirect booking URL and interface language in Advanced tab - Fix #8: Increase scroll padding at bottom from 200 to 350 for better keyboard access * fix(companion): conditional scroll padding for limits and advanced tabs only * fix(companion): remove static date text from iOS date picker, keep only picker * fix(companion): simplify iOS date picker to match RescheduleScreen pattern * update code
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…n user added to org (#26800) * feat(api-v2): ensure default calendars for delegation credentials when user added to org Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: make calendars queue optional in OrganizationsMembershipService Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: make delegation credential repository and users repository optional Co-Authored-By: morgan@cal.com <morgan@cal.com> * refactor: move calendar setup logic to delegation credential service Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: make usersRepository optional for E2E tests Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: module deps * Update apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.ts Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> * test: add unit tests for ensureDefaultCalendarsForUser method Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: address Cubic AI feedback (confidence 9/10) - Repository query now uses select: { id: true } for existence check - Add job removal before adding new job (consistent with ensureDefaultCalendars) - Fix test spy reuse issue Co-Authored-By: morgan@cal.com <morgan@cal.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
* fix: detect OOM errors in type-check CI workflow Turborepo has a known bug where tasks killed by signals (like OOM) are incorrectly marked as successful because the exit code is -1, and Turborepo takes max(-1, 0) = 0. This fix captures the type-check output and explicitly checks for OOM error patterns, failing the job if detected. See: vercel/turborepo#4227 Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: increase type-check memory limit to 6144MB and add OOM detection Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: increase type-check memory limit to 12GB Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
#26849) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* fix: Duplicate calls syncing Calendar integrations * fix: TS error in handler * Minor fixup * Set cacheUpdatedAt at correct depth of array * Import RouterOutputs
* fix: skip Select Account step if only one account is available * chore * chore * chore * test fixes * chore * refactor: address biome linting issues and decompose getServerSideProps --------- Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com> Co-authored-by: Dhairyashil Shinde <93669429+dhairyashiil@users.noreply.github.com>
…7210) * feat(companion): add app store rating prompts for iOS and Android - Add useAppStoreRating hook with generalized requestRating(trigger) function - Add RatingTrigger const for extensible trigger types (EVENT_TYPE_SAVED, BOOKING_CONFIRMED, BOOKING_REJECTED) - Integrate rating prompt into useCreateEventType and useUpdateEventType hooks - Integrate rating prompt into useConfirmBooking and useDeclineBooking hooks - Add expo-store-review package dependency - Rating prompts only show once per trigger type (tracked via AsyncStorage) Co-Authored-By: peer@cal.com <peer@cal.com> * fix(companion): correct expo-store-review version to 9.0.10 Co-Authored-By: peer@cal.com <peer@cal.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…27217) * fix: return 400 instead of 500 for invalid email in iCal generation Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * test: add unit tests for error handling in generateIcsString Co-Authored-By: benny@cal.com <sldisek783@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* Improve empty screen * fix type error --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com>
…m packages/features to apps/web/modules (#27227) * refactor: move timezone-select, settings, and insights components from packages/features to apps/web/modules Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * fix * fix * wip * wip * wip * wip * wip * wip * wip --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…ps/web/modules (#27223) * refactor: move auth components and hooks from packages/features to apps/web/modules Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add vitest import to Turnstile mock Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…dules (#27221) * refactor: move booking-audit client components from packages/features to apps/web/modules This is part of the larger effort to move tRPC-dependent UI components from packages/features to apps/web/modules to eliminate circular dependencies. Changes: - Move BookingHistory.tsx and BookingHistoryPage.tsx to apps/web/modules/booking-audit/components/ - Update imports in apps/web to use the new location Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: move formbricks client from packages/features to apps/web/modules Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: move hooks and stores from packages/features to apps/web/modules - Move useAppsData hook from packages/features/apps/hooks to apps/web/modules/apps/hooks - Move onboardingStore from packages/features/ee/organizations/lib to apps/web/modules/ee/organizations/lib - Move useWelcomeModal hook from packages/features/ee/organizations/hooks to apps/web/modules/ee/organizations/hooks - Move useAgentsData hook from packages/features/ee/workflows/hooks to apps/web/modules/ee/workflows/hooks - Update all import paths in consuming files Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: move onboardingStore test file to apps/web/modules Co-Authored-By: benny@cal.com <sldisek783@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* refactor(companion): split calcom.ts into modular service files Split the monolithic 1692-line calcom.ts file into focused modules: - auth.ts: Authentication configuration and token management - bookings.ts: Booking CRUD operations and actions - conferencing.ts: Conferencing options - event-types.ts: Event type CRUD operations - private-links.ts: Private link management for event types - request.ts: Core HTTP request functionality - schedules.ts: Schedule CRUD operations - user.ts: User profile management - utils.ts: JSON parsing and payload sanitization utilities - webhooks.ts: Webhook management (global and event type specific) - index.ts: Re-exports all functions and maintains backward compatibility This improves code organization, maintainability, and makes it easier to understand and modify specific functionality. Co-Authored-By: peer@cal.com <peer@cal.com> * fix(companion): avoid logging sensitive booking response data Replace logging of full responseText (which may contain PII like attendee emails and names) with responseLength for safer debugging. Addresses Cubic AI review feedback (confidence 9/10). Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
… conflict (#27121) * fix: use createPortal for FeatureOptInBanner to avoid Intercom widget conflict Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: guard portal rendering against non-browser environments Add typeof document check before accessing document.body in createPortal to prevent SSR/test crashes when document is undefined. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* wip flow * add tests * WIP migrateing view * push back step * fix tests and logic for adding new members to existing teams * few UI fixes * type fixes * fix nits * few UI + re-route fixes * fix teamId when migrating
…ions (#27211) Co-authored-by: peer@cal.com <peer@cal.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: pasqualevitiello <pasqualevitiello@gmail.com>
…27242) * fix: remove sticky positioning from page headers in pages using ShellMain * correct fix (mostly) * fix: disable sticky headers on routing forms and members pages Applied disableSticky={true} to remaining affected pages: - Routing Forms page - Organization Members view - Platform Members view --------- Co-authored-by: Dhairyashil <dhairyashil10101010@gmail.com>
* style(ui): improve padding for VerticalTabItem * correct fix --------- Co-authored-by: Dhairyashil <dhairyashil10101010@gmail.com>
… rate limits (#27260) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
… layout for badge spacing (#27265)
…27270) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: ali@cal.com <ali@cal.com>
* fix: improve error handling in Stripe collectCard method - Add CollectCardFailure error code for better error categorization - Replace generic error with ErrorWithCode for consistent error handling - Add error mappings for common Stripe errors (customer not found, invalid API key, rate limit, etc.) - Include Stripe error message when available for better debugging - Follow the same pattern used in chargeCard method Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add CollectCardFailure to getHttpStatusCode mapping This ensures the error returns 400 instead of 500 when collectCard fails. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * docs: add comments explaining ChargeCardFailure vs CollectCardFailure Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: simplify collectCard error handling Remove complex error mapping logic per code review feedback. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * test: add CollectCardFailure to HTTP status code tests Co-Authored-By: benny@cal.com <sldisek783@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )