Skip to content

Commit 2205ebc

Browse files
Merge branch 'main' into feat/force-confirm-booking-status
2 parents 045163b + 27515d4 commit 2205ebc

4,616 files changed

Lines changed: 418042 additions & 271307 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/rude-candies-scream.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/tender-birds-think.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@calcom/atoms": patch
3+
---
4+
5+
fix: unlocked fields not saved for managed event type

.claude/rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../agents/rules

.claude/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"env": {
3+
"CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS": "1"
4+
}
5+
}

.claude/skills

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../agents/skills

.cursor/rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../agents/rules

.cursor/rules/review.mdc

Lines changed: 0 additions & 36 deletions
This file was deleted.

.cursor/skills

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../agents/skills

.env.appStore.example

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,6 @@ ZOHOCRM_CLIENT_ID=""
129129
ZOHOCRM_CLIENT_SECRET=""
130130

131131

132-
# - REVERT
133-
# Used for the Pipedrive integration (via/ Revert (https://revert.dev))
134-
# @see https://github.com/calcom/cal.com/#obtaining-revert-api-keys
135-
REVERT_API_KEY=
136-
REVERT_PUBLIC_TOKEN=
137-
138-
# NOTE: If you're self hosting Revert, update this URL to point to your own instance.
139-
REVERT_API_URL=https://api.revert.dev/
140132
# *********************************************************************************************************
141133

142134
# - Huddle01

.env.example

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ DATABASE_URL="postgresql://postgres:@localhost:5450/calendso"
3333
DATABASE_DIRECT_URL="postgresql://postgres:@localhost:5450/calendso"
3434
INSIGHTS_DATABASE_URL=
3535

36-
# Uncomment to enable a dedicated connection pool for Prisma using Prisma Data Proxy
37-
# Cold boots will be faster and you'll be able to scale your DB independently of your app.
38-
# @see https://www.prisma.io/docs/data-platform/data-proxy/use-data-proxy
39-
# PRISMA_GENERATE_DATAPROXY=true
40-
PRISMA_GENERATE_DATAPROXY=
41-
4236
# ***********************************************************************************************************
4337

4438
# - SHARED **************************************************************************************************
@@ -47,7 +41,6 @@ PRISMA_GENERATE_DATAPROXY=
4741
NEXT_PUBLIC_WEBAPP_URL='http://localhost:3000'
4842
# Change to 'http://localhost:3001' if running the website simultaneously
4943
NEXT_PUBLIC_WEBSITE_URL='http://localhost:3000'
50-
NEXT_PUBLIC_CONSOLE_URL='http://localhost:3004'
5144
NEXT_PUBLIC_EMBED_LIB_URL='http://localhost:3000/embed/embed.js'
5245

5346
# To enable SAML login, set both these variables
@@ -94,7 +87,7 @@ CRON_ENABLE_APP_SYNC=false
9487

9588
# Application Key for symmetric encryption and decryption
9689
# must be 32 bytes for AES256 encryption algorithm
97-
# You can use: `openssl rand -base64 32` to generate one
90+
# You can use: `openssl rand -base64 24` to generate a 32-character key
9891
CALENDSO_ENCRYPTION_KEY=
9992

10093
# Intercom Config
@@ -216,11 +209,13 @@ NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE=
216209
NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN=0
217210
NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE=
218211
STRIPE_TEAM_MONTHLY_PRICE_ID=
212+
STRIPE_TEAM_ANNUAL_PRICE_ID=
219213
NEXT_PUBLIC_STRIPE_CREDITS_PRICE_ID=
220214
ORG_MONTHLY_CREDITS=
221215
STRIPE_TEAM_PRODUCT_ID=
222216
# It is a price ID in the product with id STRIPE_ORG_PRODUCT_ID
223217
STRIPE_ORG_MONTHLY_PRICE_ID=
218+
STRIPE_ORG_ANNUAL_PRICE_ID=
224219
STRIPE_ORG_PRODUCT_ID=
225220
# Used to pass trial days for orgs during the Stripe checkout session
226221
STRIPE_ORG_TRIAL_DAYS=
@@ -261,6 +256,9 @@ EMAIL_SERVER_PORT=1025
261256
## @see https://support.google.com/accounts/answer/185833
262257
# EMAIL_SERVER_PASSWORD='<gmail_app_password>'
263258

259+
# queue or cancel payment reminder email/flow
260+
AWAITING_PAYMENT_EMAIL_DELAY_MINUTES=
261+
264262
# Used for E2E for email testing
265263
# Set it to "1" if you need to email checks in E2E tests locally
266264
# Make sure to run mailhog container manually or with `yarn dx`
@@ -395,7 +393,10 @@ NEXT_PUBLIC_API_V2_URL="http://localhost:5555/api/v2"
395393
TASKER_ENABLE_WEBHOOKS=0
396394
TASKER_ENABLE_EMAILS=0
397395

398-
# Ratelimiting via unkey
396+
# Ratelimiting via Unkey (https://unkey.com)
397+
# Optional: Only required if you want to enable rate limiting
398+
# Not needed for testing or self-hosting unless you specifically want rate limiting features
399+
# Sign up at https://unkey.com to get your Root key
399400
UNKEY_ROOT_KEY=
400401

401402
# Used for Cal.ai Voice AI Agents
@@ -431,14 +432,7 @@ BLACKLISTED_GUEST_EMAILS=
431432
NEXT_PUBLIC_VAPID_PUBLIC_KEY=
432433
VAPID_PRIVATE_KEY=
433434

434-
# Mintlify chat api
435-
# Power AI chat in for docs
436-
MINTLIFY_CHAT_API_KEY=
437-
NEXT_PUBLIC_ENABLE_MINTLIFY_CHAT=
438-
NEXT_PUBLIC_CHAT_API_URL=
439-
NEXT_PUBLIC_DOCS_URL=
440-
441-
# Custom privacy policy / terms URLs (for self-hosters: change to your privacy policy / terms URLs)
435+
# Custom privacy policy/ terms URLs (for self-hosters: change to your privacy policy / terms URLs)
442436
NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=
443437
NEXT_PUBLIC_WEBSITE_TERMS_URL=
444438

@@ -505,8 +499,22 @@ TZ=UTC
505499
SEED_PLATFORM_OAUTH_CLIENT_ID=
506500
SEED_PLATFORM_OAUTH_CLIENT_SECRET=
507501

502+
# test oauth2 client for `packages/platform/examples/base` (optional)
503+
SEED_OAUTH2_CLIENT_ID=
504+
SEED_OAUTH2_CLIENT_SECRET_HASHED=
505+
508506
# Trigger.dev
509507
ENABLE_ASYNC_TASKER="false" # set to "true" to enable
510508
TRIGGER_SECRET_KEY=
511509
TRIGGER_API_URL=https://api.trigger.dev
512-
TRIGGER_DEV_PROJECT_REF=
510+
TRIGGER_DEV_PROJECT_REF=
511+
512+
GOOGLE_ADS_ENABLED=1 # To enable Google Ads tracking (gclid)
513+
LINKEDIN_ADS_ENABLED=1 # To enable LinkedIn Ads tracking (li_fat_id)
514+
515+
# - BACKBLAZE B2 (Compliance Documents) *************************************************************************
516+
# Used for storing and serving compliance documents (SOC 2, ISO 27001, pentest reports)
517+
B2_APPLICATION_KEY_ID=
518+
B2_APPLICATION_KEY=
519+
B2_BUCKET_ID=
520+
B2_BUCKET_NAME=

0 commit comments

Comments
 (0)