Skip to content

Commit 9287768

Browse files
authored
Merge branch 'main' into devin/1763390447-add-org-trial-days
2 parents f7fadf2 + 6818806 commit 9287768

File tree

293 files changed

+5268
-9096
lines changed

Some content is hidden

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

293 files changed

+5268
-9096
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**/package.json @calcom/Foundation
22
/apps/api/**/* @calcom/API
3-
/apps/ui-playground/**/* @calcom/Consumer @calcom/Foundation
43
/apps/web/**/layout.tsx @calcom/Consumer @calcom/Foundation
54
/apps/web/lib/csp.ts @calcom/Foundation
65
/apps/web/lib/buildNonce.ts @calcom/Foundation

.github/actions/cache-db/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ runs:
2626
with:
2727
path: ${{ inputs.path }}
2828
key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}
29-
- run: USE_POOL=true yarn db-seed
29+
- run: yarn db-seed
3030
if: steps.cache-db.outputs.cache-hit != 'true'
3131
shell: bash
3232
- name: Postgres Dump Backup

.yarn/versions/35256f20.yml

Whitespace-only changes.

.yarn/versions/55a2e9af.yml

Whitespace-only changes.

apps/api/v1/lib/utils/isAdmin.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ export const isAdminGuard = async (req: NextApiRequest) => {
1616
where: {
1717
userId: userId,
1818
accepted: true,
19+
role: {
20+
in: [MembershipRole.OWNER, MembershipRole.ADMIN],
21+
},
1922
team: {
2023
isOrganization: true,
2124
organizationSettings: {
2225
isAdminAPIEnabled: true,
2326
},
2427
},
25-
OR: [{ role: MembershipRole.OWNER }, { role: MembershipRole.ADMIN }],
2628
},
2729
select: {
2830
team: {

apps/ui-playground/.gitignore

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

apps/ui-playground/README.md

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

apps/ui-playground/app/(home)/layout.tsx

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

apps/ui-playground/app/(home)/page.tsx

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

apps/ui-playground/app/api/search/route.ts

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

0 commit comments

Comments
 (0)