Skip to content

Commit dc0e949

Browse files
authored
Merge pull request #1 from dc143c/main
Sync
2 parents 5becc95 + b7b21c4 commit dc0e949

File tree

3,802 files changed

+283326
-69862
lines changed

Some content is hidden

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

3,802 files changed

+283326
-69862
lines changed

.env.appStore.example

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# - DAILY.CO VIDEO
66
# - GOOGLE CALENDAR/MEET/LOGIN
77
# - HUBSPOT
8+
# - HUDDLE01
89
# - OFFICE 365
910
# - SLACK
1011
# - STRIPE
@@ -137,3 +138,7 @@ REVERT_PUBLIC_TOKEN=
137138
# NOTE: If you're self hosting Revert, update this URL to point to your own instance.
138139
REVERT_API_URL=https://api.revert.dev/
139140
# *********************************************************************************************************
141+
142+
# - Huddle01
143+
# Used for the huddle01 integration
144+
HUDDLE01_API_TOKEN=

.env.example

Lines changed: 73 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
# - You can not repackage or sell the codebase
1616
# - Acquire a commercial license to remove these terms by visiting: cal.com/sales
1717
#
18-
# To enable enterprise-only features, as an admin, go to /auth/setup to select your license and follow
19-
# instructions. This environment variable is deprecated although still supported for backward compatibility.
20-
# @see https://console.cal.com
18+
19+
# To enable enterprise-only features please add your environment variable to the .env file then make your way to /auth/setup to select your license and follow instructions.
2120
CALCOM_LICENSE_KEY=
21+
# Signature token for the Cal.com License API (used for self-hosted integrations)
22+
# We will give you a token when we provide you with a license key this ensure you and only you can communicate with the Cal.com License API for your license key
23+
CAL_SIGNATURE_TOKEN=
24+
# The route to the Cal.com License API
25+
CALCOM_PRIVATE_API_ROUTE="https://goblin.cal.com"
2226
# ***********************************************************************************************************
2327

2428
# - DATABASE ************************************************************************************************
@@ -98,6 +102,20 @@ NEXT_PUBLIC_INTERCOM_APP_ID=
98102
# Secret to enable Intercom Identity Verification
99103
INTERCOM_SECRET=
100104

105+
# Posthog Config
106+
NEXT_PUBLIC_POSTHOG_KEY=
107+
108+
NEXT_PUBLIC_POSTHOG_HOST=
109+
110+
# plain.com config
111+
112+
PLAIN_API_KEY=
113+
PLAIN_API_URL=https://api.plain.com/v1
114+
PLAIN_HMAC_SECRET_KEY=
115+
NEXT_PUBLIC_PLAIN_CHAT_ID=
116+
PLAIN_CHAT_HMAC_SECRET_KEY=
117+
NEXT_PUBLIC_PLAIN_CHAT_EXCLUDED_PATHS=
118+
101119
# Zendesk Config
102120
NEXT_PUBLIC_ZENDESK_KEY=
103121

@@ -110,7 +128,7 @@ NEXT_PUBLIC_FRESHCHAT_HOST=
110128

111129
# Google OAuth credentials
112130
# To enable Login with Google you need to:
113-
# 1. Set `GOOGLE_API_CREDENTIALS` above
131+
# 1. Set `GOOGLE_API_CREDENTIALS` below
114132
# 2. Set `GOOGLE_LOGIN_ENABLED` to `true`
115133
# When self-hosting please ensure you configure the Google integration as an Internal app so no one else can login to your instance
116134
# @see https://support.google.com/cloud/answer/6158849#public-and-internal&zippy=%2Cpublic-and-internal-applications
@@ -120,11 +138,15 @@ GOOGLE_LOGIN_ENABLED=false
120138
# Needed to enable Google Calendar integration and Login with Google
121139
# @see https://github.com/calcom/cal.com#obtaining-the-google-api-credentials
122140
GOOGLE_API_CREDENTIALS=
141+
# Token to verify incoming webhooks from Google Calendar
142+
GOOGLE_WEBHOOK_TOKEN=
143+
# Optional URL to override for tunelling webhooks. Defaults to NEXT_PUBLIC_WEBAPP_URL.
144+
GOOGLE_WEBHOOK_URL=
123145

124146
# Inbox to send user feedback
125147
SEND_FEEDBACK_EMAIL=
126148

127-
# Sengrid
149+
# Sendgrid
128150
# Used for email reminders in workflows and internal sync services
129151
SENDGRID_API_KEY=
130152
SENDGRID_EMAIL=
@@ -133,6 +155,11 @@ NEXT_PUBLIC_SENDGRID_SENDER_NAME=
133155
# Sentry
134156
# Used for capturing exceptions and logging messages
135157
NEXT_PUBLIC_SENTRY_DSN=
158+
SENTRY_DEBUG=
159+
SENTRY_DISABLE_CLIENT_SOURCE_MAPS=
160+
SENTRY_DISABLE_SERVER_SOURCE_MAPS=
161+
SENTRY_MAX_SPANS=
162+
SENTRY_TRACES_SAMPLE_RATE=
136163

137164
# Formbricks Experience Management Integration
138165
NEXT_PUBLIC_FORMBRICKS_HOST_URL=https://app.formbricks.com
@@ -164,13 +191,13 @@ NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE=
164191
NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN=0
165192
NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE=
166193
STRIPE_TEAM_MONTHLY_PRICE_ID=
194+
STRIPE_TEAM_PRODUCT_ID=
167195
STRIPE_ORG_MONTHLY_PRICE_ID=
168196
STRIPE_WEBHOOK_SECRET=
169197
STRIPE_WEBHOOK_SECRET_APPS=
170198
STRIPE_PRIVATE_KEY=
171199
STRIPE_CLIENT_ID=
172200

173-
174201
# Use for internal Public API Keys and optional
175202
API_KEY_PREFIX=cal_
176203
# ***********************************************************************************************************
@@ -215,13 +242,15 @@ E2E_TEST_MAILHOG_ENABLED=
215242

216243
# Cloudflare Turnstile
217244
NEXT_PUBLIC_CLOUDFLARE_SITEKEY=
245+
NEXT_PUBLIC_CLOUDFLARE_USE_TURNSTILE_IN_BOOKER=
218246
CLOUDFLARE_TURNSTILE_SECRET=
219247

220248
# Set the following value to true if you wish to enable Team Impersonation
221249
NEXT_PUBLIC_TEAM_IMPERSONATION=false
222250

223251
# Close.com internal CRM
224-
CLOSECOM_API_KEY=
252+
CLOSECOM_CLIENT_ID=
253+
CLOSECOM_CLIENT_SECRET=
225254

226255
# Sendgrid internal sync service
227256
SENDGRID_SYNC_API_KEY=
@@ -255,8 +284,10 @@ NEXT_PUBLIC_AVAILABILITY_SCHEDULE_INTERVAL=
255284
# This variable should only be set to 1 or true if you are in a non-prod environment and you want to
256285
# use organizations
257286
ORGANIZATIONS_ENABLED=
287+
NEXT_PUBLIC_ORGANIZATIONS_MIN_SELF_SERVE_SEATS=30
288+
NEXT_PUBLIC_ORGANIZATIONS_SELF_SERVE_PRICE=3700 # $37.00 per seat
258289

259-
# This variable should only be set to 1 or true if you want to autolink external provider sing-ups with
290+
# This variable should only be set to 1 or true if you want to autolink external provider sign-ups with
260291
# existing organizations based on email domain address
261292
ORGANIZATIONS_AUTOLINK=
262293

@@ -325,23 +356,21 @@ E2E_TEST_OIDC_USER_PASSWORD=
325356
# provide a value between 0 and 100 to ensure the percentage of traffic
326357
# redirected from the legacy to the future pages
327358
AB_TEST_BUCKET_PROBABILITY=50
328-
# whether we redirect to the future/event-types from event-types or not
329-
APP_ROUTER_EVENT_TYPES_ENABLED=0
330-
APP_ROUTER_SETTINGS_ADMIN_ENABLED=0
331359
APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED=0
332360
APP_ROUTER_APPS_SLUG_ENABLED=0
333361
APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
334362
# whether we redirect to the future/apps/categories from /apps/categories or not
335363
APP_ROUTER_APPS_CATEGORIES_ENABLED=0
336364
# whether we redirect to the future/apps/categories/[category] from /apps/categories/[category] or not
337365
APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
338-
APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
339-
APP_ROUTER_WORKFLOWS_ENABLED=0
340-
APP_ROUTER_SETTINGS_TEAMS_ENABLED=0
341-
APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
342366
APP_ROUTER_APPS_ENABLED=0
343-
APP_ROUTER_VIDEO_ENABLED=0
344-
APP_ROUTER_TEAMS_ENABLED=0
367+
APP_ROUTER_TEAM_ENABLED=0
368+
APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED=0
369+
APP_ROUTER_AUTH_LOGIN_ENABLED=0
370+
APP_ROUTER_AUTH_LOGOUT_ENABLED=0
371+
APP_ROUTER_AUTH_SAML_ENABLED=0
372+
APP_ROUTER_AUTH_PLATFORM_ENABLED=0
373+
APP_ROUTER_AUTH_OAUTH2_ENABLED=0
345374

346375
# disable setry server source maps
347376
SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1
@@ -356,10 +385,36 @@ TASKER_ENABLE_EMAILS=0
356385
# Ratelimiting via unkey
357386
UNKEY_ROOT_KEY=
358387

359-
360388
# Used for Cal.ai Enterprise Voice AI Agents
361389
# https://retellai.com
362390
RETELL_AI_KEY=
363391

392+
# Used for the huddle01 integration
393+
HUDDLE01_API_TOKEN=
394+
364395
# Used to disallow emails as being added as guests on bookings
365396
BLACKLISTED_GUEST_EMAILS=
397+
398+
# Used to allow browser push notifications
399+
# You can use: 'npx web-push generate-vapid-keys' to generate these keys
400+
NEXT_PUBLIC_VAPID_PUBLIC_KEY=
401+
VAPID_PRIVATE_KEY=
402+
403+
# Custom privacy policy / terms URLs (for self-hosters: change to your privacy policy / terms URLs)
404+
NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=
405+
NEXT_PUBLIC_WEBSITE_TERMS_URL=
406+
407+
# NEXT_PUBLIC_LOGGER_LEVEL=3 sets to log info, warn, error and fatal logs.
408+
# [0: silly & upwards, 1: trace & upwards, 2: debug & upwards, 3: info & upwards, 4: warn & upwards, 5: error & fatal, 6: fatal]
409+
NEXT_PUBLIC_LOGGER_LEVEL=
410+
411+
# Used to use Replexica SDK, a tool for real-time AI-powered localization
412+
REPLEXICA_API_KEY=
413+
414+
# Comma-separated list of DSyncData.directoryId to log SCIM API requests for. It can be enabled temporarily for debugging the requests being sent to SCIM server.
415+
DIRECTORY_IDS_TO_LOG=
416+
417+
418+
# Set this when Cal.com is used to serve only one organization's booking pages
419+
# Read more about it in the README.md
420+
NEXT_PUBLIC_SINGLE_ORG_SLUG=

.github/CODEOWNERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/packages/app-store/applecalendar/**/* @calcom/Foundation
2+
/packages/app-store/caldavcalendar/**/* @calcom/Foundation
3+
/packages/app-store/exchange2013calendar/**/* @calcom/Foundation
4+
/packages/app-store/exchange2016calendar/**/* @calcom/Foundation
5+
/packages/app-store/exchangecalendar/**/* @calcom/Foundation
6+
/packages/app-store/feishucalendar/**/* @calcom/Foundation
7+
/packages/app-store/googlecalendar/**/* @calcom/Foundation
8+
/packages/app-store/ics-feedcalendar/**/* @calcom/Foundation
9+
/packages/app-store/larkcalendar/**/* @calcom/Foundation
10+
/packages/app-store/office365calendar/**/* @calcom/Foundation
11+
/packages/app-store/zohocalendar/**/* @calcom/Foundation

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Bug report
33
about: Report any issues with the platform
44
title: ""
5-
labels: bug
5+
labels: ["🐛 bug"]
66
assignees: ""
77
---
88

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Questions
4-
url: https://go.cal.com/discord
5-
about: Ask a general question about the project on our discord community
4+
url: https://github.com/calcom/cal.com/discussions
5+
about: Need help selfhosting or ask a general question about the project? Open a discussion

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Feature request
33
about: Suggest a feature or idea
44
title: ""
5-
labels: feature
5+
labels: ["✨ feature", "🚨 needs approval"]
66
assignees: ""
77
---
88

@@ -49,7 +49,10 @@ assignees: ""
4949
(Share it here.)
5050

5151
---
52+
5253
##### House rules
54+
5355
- If this issue has a `🚨 needs approval` label, don't start coding yet. Wait until a core member approves feature request by removing this label, then you can start coding.
5456
- For clarity: Non-core member issues automatically get the `🚨 needs approval` label.
5557
- Your feature ideas are invaluable to us! However, they undergo review to ensure alignment with the product's direction.
58+
- Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
## Mandatory Tasks (DO NOT REMOVE)
1313

1414
- [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
15-
- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com). If N/A, write N/A here and check the checkbox.
15+
- [ ] I have updated the developer docs in /docs if this PR makes changes that would require a [documentation change](https://cal.com/docs). If N/A, write N/A here and check the checkbox.
1616
- [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
1717

1818
## How should this be tested?

.github/actions/yarn-install/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ runs:
3737
with:
3838
path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
3939
key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
40-
restore-keys: |
41-
yarn-download-cache-
4240

4341
# Invalidated on yarn.lock changes
4442
- name: Restore node_modules

.github/actions/yarn-playwright-install/action.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ description: "Install playwright, cache and restore if necessary"
33
runs:
44
using: "composite"
55
steps:
6+
- name: Get installed Playwright version
7+
shell: bash
8+
id: playwright-version
9+
run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package.json').devDependencies['@playwright/test'])")" >> $GITHUB_ENV
610
- name: Cache playwright binaries
711
id: playwright-cache
812
uses: buildjet/cache@v4
@@ -11,9 +15,7 @@ runs:
1115
~/Library/Caches/ms-playwright
1216
~/.cache/ms-playwright
1317
${{ github.workspace }}/node_modules/playwright
14-
key: cache-playwright-${{ hashFiles('**/yarn.lock') }}
15-
restore-keys: cache-playwright-
18+
key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
1619
- name: Yarn playwright install
1720
shell: bash
18-
if: steps.playwright-cache.outputs.cache-hit != 'true'
19-
run: yarn playwright install
21+
run: yarn playwright install --with-deps

.github/workflows/all-checks.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ jobs:
3434
uses: ./.github/workflows/api-v2-production-build.yml
3535
secrets: inherit
3636

37+
build-atoms:
38+
name: Production builds
39+
uses: ./.github/workflows/atoms-production-build.yml
40+
secrets: inherit
41+
3742
build:
3843
name: Production builds
3944
uses: ./.github/workflows/production-build-without-database.yml
@@ -69,12 +74,6 @@ jobs:
6974
uses: ./.github/workflows/e2e-embed-react.yml
7075
secrets: inherit
7176

72-
analyze:
73-
name: Analyze Build
74-
needs: [build]
75-
uses: ./.github/workflows/nextjs-bundle-analysis.yml
76-
secrets: inherit
77-
7877
required:
7978
needs: [lint, type-check, unit-test, integration-test, build, build-api-v1, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
8079
if: always()

0 commit comments

Comments
 (0)