Skip to content

Commit 6aad8ec

Browse files
hariombalharahariombalhara
authored
Merge branch 'main' into fix/immediate-redirect
2 parents 606c480 + e504f5c commit 6aad8ec

169 files changed

Lines changed: 2767 additions & 2069 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.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ Fixes # (issue)
1212

1313
## Type of change
1414

15-
<!-- Please delete options that are not relevant. -->
15+
<!-- Please delete bullets that are not relevant. -->
1616

17-
- [ ] Bug fix (non-breaking change which fixes an issue)
18-
- [ ] Chore (refactoring code, technical debt, workflow improvements)
19-
- [ ] New feature (non-breaking change which adds functionality)
20-
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
21-
- [ ] This change requires a documentation update
17+
- Bug fix (non-breaking change which fixes an issue)
18+
- Chore (refactoring code, technical debt, workflow improvements)
19+
- New feature (non-breaking change which adds functionality)
20+
- Breaking change (fix or feature that would cause existing functionality to not work as expected)
21+
- This change requires a documentation update
2222

2323
## How should this be tested?
2424

‎.github/matchers/tsc-absolute.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "tsc-absolute",
5+
"pattern": [
6+
{
7+
"regexp": "(?:^|\\s)([^\\s].*)[\\(:](\\d+)[,:](\\d+)(?:\\):\\s+|\\s+-\\s+)(error|warning|info)\\s+(TS\\d+)\\s*:\\s*(.*)$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"severity": 4,
12+
"code": 5,
13+
"message": 6
14+
}
15+
]
16+
}
17+
]
18+
}

‎.github/workflows/check-types.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ jobs:
1010
- uses: actions/checkout@v3
1111
- uses: ./.github/actions/dangerous-git-checkout
1212
- uses: ./.github/actions/yarn-install
13-
1413
- name: Show info
1514
run: node -e "console.log(require('v8').getHeapStatistics())"
16-
17-
- run: yarn type-check
15+
- name: Configure TSC problem matcher
16+
run: |
17+
echo "::remove-matcher owner=tsc::"
18+
echo "::add-matcher::.github/matchers/tsc-absolute.json"
19+
- run: yarn type-check:ci

‎.github/workflows/cron-downgradeUsers.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: Cron - downgradeUsers
22

33
on:
4+
workflow_dispatch:
45
# "Scheduled workflows run on the latest commit on the default or base branch."
56
# — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
67
schedule:
7-
# Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
8-
- cron: "0,15,30,45 * * * *"
8+
# Runs “Every month at 1st (see https://crontab.guru)
9+
- cron: "0 0 1 * *"
910
jobs:
1011
cron-downgradeUsers:
1112
env:

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@ We have a list of [help wanted](https://github.com/calcom/cal.com/issues?q=is:is
350350
<source media="(prefers-color-scheme: dark)" srcset="https://console.algora.io/api/og/cal/bounties.png?p=0&status=open&theme=dark">
351351
<img alt="Bounties of cal" src="https://console.algora.io/api/og/cal/bounties.png?p=0&status=open&theme=light">
352352
</picture>
353-
</a>
354-
353+
</a>
355354

356355
<!-- CONTRIBUTORS -->
357356

@@ -456,12 +455,12 @@ following
456455

457456
1. Open [Zoho API Console](https://api-console.zoho.com/) and sign into your account, or create a new one.
458457
2. From within the API console page, go to "Applications".
459-
3. Click "ADD CLIENT" button top right and select "Server-based Applications".
458+
3. Click "ADD CLIENT" button top right and select "Server-based Applications".
460459
4. Fill in any information you want in the "Client Details" tab
461-
5. Go to tab "Client Secret" tab.
460+
5. Go to tab "Client Secret" tab.
462461
6. Now copy the Client ID and Client Secret to your .env file into the `ZOHOCRM_CLIENT_ID` and `ZOHOCRM_CLIENT_SECRET` fields.
463462
7. Set the Redirect URL for OAuth `<Cal.com URL>/api/integrations/zohocrm/callback` replacing Cal.com URL with the URI at which your application runs.
464-
8. In the "Settings" section check the "Multi-DC" option if you wish to use the same OAuth credentials for all data centers.
463+
8. In the "Settings" section check the "Multi-DC" option if you wish to use the same OAuth credentials for all data centers.
465464
9. Click the "Save"/ "UPDATE" button at the bottom footer.
466465
10. You're good to go. Now you can easily add your ZohoCRM integration in the Cal.com settings.
467466

‎apps/docs/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
1212
"lint:report": "eslint . --format json --output-file ../../lint-results/docs.json",
1313
"start": "PORT=4000 next start",
14-
"type-check": "tsc --pretty --noEmit"
14+
"type-check": "tsc --pretty --noEmit",
15+
"type-check:ci": "tsc-absolute --pretty --noEmit"
1516
},
1617
"author": "Cal.com, Inc.",
1718
"license": "MIT",

‎apps/web/components/AdditionalCalendarSelector.tsx‎

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

‎apps/web/components/DestinationCalendarSelector.tsx‎

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

0 commit comments

Comments
 (0)