Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
f804b63
chore(deps): bump @prisma/adapter-pg from 6.5.0 to 6.9.0
dependabot[bot] Jun 9, 2025
7440683
Merge branch 'main' into dependabot/npm_and_yarn/main/prisma/adapter-…
claudfuen Jun 9, 2025
e63e50a
chore: ability to run agent job for orgs in any state
Marfuen Jun 11, 2025
b64482f
Merge branch 'main' of github.com:trycompai/comp into mariano/comp-16…
Marfuen Jun 11, 2025
879d2bf
chore: fix up migrations
Marfuen Jun 11, 2025
299d994
chore: fix mobile menu
Marfuen Jun 11, 2025
60870c4
chore: fix build issues
Marfuen Jun 11, 2025
55bca3e
Merge pull request #874 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
98efdea
chore: fix up migrations
Marfuen Jun 11, 2025
ed1d6a0
Merge pull request #876 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
4361940
chore: force trigger push
Marfuen Jun 11, 2025
757a225
Merge pull request #877 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
91840a1
Merge pull request #878 from trycompai/claudio/patch-retool-reset
claudfuen Jun 11, 2025
06d7557
chore: add fleetctl directly to app
Marfuen Jun 11, 2025
76cd975
Merge pull request #880 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
cfd8dfc
chore: define env var properly
Marfuen Jun 11, 2025
520ebd8
Merge pull request #882 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
7ef9c91
chore: use npx
Marfuen Jun 11, 2025
fffcfbe
Merge pull request #883 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
5c0dad0
chore: update trigger config to install fleetctl
Marfuen Jun 11, 2025
7ab7737
Merge pull request #884 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
64d4bde
chore: properly remove temp dir
Marfuen Jun 11, 2025
7c9b8e1
chore: remove unnecessary task
Marfuen Jun 11, 2025
d257eeb
Merge pull request #885 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
74a7431
chore: still need npx
Marfuen Jun 11, 2025
b6e8457
Merge pull request #886 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
5ffe418
chore: add fleet service to be used by the job
Marfuen Jun 11, 2025
0ac8469
Merge branch 'main' into mariano/comp-166-osquery-agent-integration
Marfuen Jun 11, 2025
233e0ac
chore: cleanup
Marfuen Jun 11, 2025
3f2e0b2
Merge branch 'mariano/comp-166-osquery-agent-integration' of github.c…
Marfuen Jun 11, 2025
8011648
Merge pull request #887 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
6c31e21
chore: add better error handling
Marfuen Jun 11, 2025
813cb2f
Merge pull request #888 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
b1379eb
chore: add dockerfile
Marfuen Jun 11, 2025
9910451
Merge pull request #889 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
12db094
chore: fix bug in dockerfile
Marfuen Jun 11, 2025
57087e4
Merge pull request #890 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
dacca5d
chore: import s3 lib
Marfuen Jun 11, 2025
e0a5124
Merge pull request #891 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
759b388
chore: use bun for fleetctl
Marfuen Jun 11, 2025
821827f
Merge pull request #892 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
72770f5
chore: add certificates
Marfuen Jun 11, 2025
1e835b1
Merge pull request #893 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
046fed6
chore: more deps
Marfuen Jun 11, 2025
0184050
Merge pull request #894 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 11, 2025
4b9372d
Merge branch 'release' into main
claudfuen Jun 12, 2025
f4e4488
Merge branch 'main' into dependabot/npm_and_yarn/main/prisma/adapter-…
claudfuen Jun 12, 2025
cc9add4
Merge pull request #847 from trycompai/dependabot/npm_and_yarn/main/p…
claudfuen Jun 12, 2025
9143944
chore: fix agent
Marfuen Jun 12, 2025
ef4868c
chore: update migrations and menu
Marfuen Jun 12, 2025
12d9e52
chore: remove unused import
Marfuen Jun 12, 2025
f8b2ad2
Merge pull request #901 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 12, 2025
eee4653
chore: update deps
Marfuen Jun 12, 2025
4595fd9
Merge pull request #902 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 12, 2025
7aa558e
chore: update bun lock
Marfuen Jun 12, 2025
b3a53c9
Merge pull request #903 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 12, 2025
586767c
chore: fix bun again
Marfuen Jun 12, 2025
0fdf976
Merge pull request #904 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 12, 2025
9d3d0ae
chore: dont freeze lockfile
Marfuen Jun 12, 2025
de186e8
Merge pull request #905 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 12, 2025
71bf037
chore: fox deps?
Marfuen Jun 12, 2025
5435dbd
Merge branch 'main' of github.com:trycompai/comp into mariano/comp-16…
Marfuen Jun 12, 2025
8df1397
Merge branch 'release' of github.com:trycompai/comp into mariano/comp…
Marfuen Jun 12, 2025
1d25145
chore: updated
Marfuen Jun 12, 2025
5d38e70
Merge pull request #906 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 12, 2025
970931d
chore: fix
Marfuen Jun 12, 2025
3749e78
feat(stripe): add new Stripe integration features
claudfuen Jun 12, 2025
c02d539
chore: fix deps
Marfuen Jun 12, 2025
a25760f
chore: deps
Marfuen Jun 12, 2025
0f62e41
Merge pull request #907 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 12, 2025
34769c3
chore: dont check env vars rn
Marfuen Jun 13, 2025
e20777f
Merge pull request #910 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 13, 2025
2f16812
chore: add back missing UI
Marfuen Jun 13, 2025
8ad3a11
chore: move react dependencies from peerDependencies to dependencies …
Marfuen Jun 13, 2025
833ffb6
chore: update alert
Marfuen Jun 13, 2025
c237843
chore: update Azure identity package and fix employee status import path
Marfuen Jun 13, 2025
e4f8fa5
refactor: remove redundant error alert UI from OnboardingTracker comp…
Marfuen Jun 13, 2025
39e417f
refactor: move React dependencies to root package.json and remove dup…
Marfuen Jun 13, 2025
8766a8d
Merge branch 'main' into mariano/comp-166-osquery-agent-integration
Marfuen Jun 14, 2025
c6c29c8
chore: fix deps
Marfuen Jun 14, 2025
c4fb2fb
Merge branch 'mariano/comp-166-osquery-agent-integration' of github.c…
Marfuen Jun 14, 2025
d48c8a6
chore: build works locally I swear to god
Marfuen Jun 14, 2025
ccd5138
chore: add @azure/core-rest-pipeline dependency
Marfuen Jun 14, 2025
d7f5d89
chore: remove redundant React and type dependencies from package files
Marfuen Jun 14, 2025
b92c343
chore: upgrade react to v19.1.0 and add type definitions
Marfuen Jun 14, 2025
1e052c8
chore: remove clean-react task and add Azure core dependencies
Marfuen Jun 14, 2025
e77ec2d
refactor: move react and react-dom to peerDependencies across all pac…
Marfuen Jun 14, 2025
42b3a5f
refactor: update text size from sm to base across components
Marfuen Jun 14, 2025
9e9463e
Revert "refactor: update text size from sm to base across components"
Marfuen Jun 14, 2025
b858770
refactor: migrate from local CSS to shared UI package styles
Marfuen Jun 14, 2025
1a9e7b2
refactor: replace @apply with @reference in CSS stylesheets for consi…
Marfuen Jun 14, 2025
7067e81
Merge pull request #911 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 14, 2025
993dbb7
chore: bring back tailwind styles from before
Marfuen Jun 15, 2025
c0acdec
refactor: extract fleet policy logic and modernize Card component wit…
Marfuen Jun 15, 2025
4949954
Merge branch 'main' of https://github.com/trycompai/comp into claudio…
claudfuen Jun 15, 2025
d72340c
chore: update empty state message for device compliance chart and rem…
Marfuen Jun 15, 2025
bfed1fb
Merge pull request #912 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 15, 2025
6372cdd
chore: add syncpack configuration for dependency management and updat…
claudfuen Jun 15, 2025
15314b6
chore: enhance pre-push hook to enforce branch naming convention and …
claudfuen Jun 15, 2025
a383d9e
chore: add feature flag for fleet
Marfuen Jun 15, 2025
7497004
Merge pull request #913 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 15, 2025
f29211f
chore: add ESLint configuration and update package dependencies acros…
claudfuen Jun 15, 2025
79408cc
chore: add ESLint and Next.js configuration to framework-editor depen…
claudfuen Jun 15, 2025
06a8b7c
chore: add ESLint and Next.js configuration to trust application depe…
claudfuen Jun 15, 2025
5317849
chore: add ESLint consistency check to syncpack configuration
claudfuen Jun 15, 2025
17da748
chore: update ESLint and Next.js configuration across multiple packages
claudfuen Jun 15, 2025
cffee0a
Merge branch 'main' of https://github.com/trycompai/comp into claudio…
claudfuen Jun 15, 2025
62fdfab
chore: updated files and formatting
claudfuen Jun 15, 2025
712750d
chore: update Next.js and ESLint dependencies across multiple packages
claudfuen Jun 15, 2025
d647e90
chore: update workspace references in yarn.lock
claudfuen Jun 15, 2025
079b1c1
chore: fixed
claudfuen Jun 15, 2025
3887f71
fix: cast stripeCustomerId to string before syncing data
claudfuen Jun 15, 2025
3066213
Merge pull request #908 from trycompai/claudio/comp-210-self-serve-im…
claudfuen Jun 15, 2025
a9224a7
chore: use posthog feature flag instead of env var
Marfuen Jun 16, 2025
612d085
refactor: improve code formatting and remove unused import in Employe…
Marfuen Jun 16, 2025
27eac43
chore: updated packages
Marfuen Jun 16, 2025
f7a5590
chore: fix prettier issue
Marfuen Jun 16, 2025
75eb00d
Merge pull request #914 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 16, 2025
ac6bd6b
chore: fix issue with host
Marfuen Jun 16, 2025
b9e72e5
Merge branch 'main' into mariano/comp-166-osquery-agent-integration
Marfuen Jun 16, 2025
4b9e5b6
Merge pull request #915 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 16, 2025
a955e6a
chore: update fleet url
Marfuen Jun 16, 2025
3a00f50
Merge branch 'mariano/comp-166-osquery-agent-integration' of github.c…
Marfuen Jun 16, 2025
f5891f8
Merge pull request #916 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 16, 2025
2cdb06b
chore: update deps
Marfuen Jun 16, 2025
89336ca
Merge branch 'main' of github.com:trycompai/comp into mariano/comp-16…
Marfuen Jun 16, 2025
9644a20
chore: update yarn lock
Marfuen Jun 16, 2025
84aac9f
chore: update fleet instance to be server side
Marfuen Jun 16, 2025
cc87516
Merge pull request #917 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 16, 2025
9ab26a0
fix: fix issue with s3 url sanitization
Marfuen Jun 16, 2025
1acccc6
fix: fix issue with sanitizing html
Marfuen Jun 16, 2025
31b37dd
Merge pull request #918 from trycompai/mariano/comp-166-osquery-agent…
Marfuen Jun 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/database-migrations-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
DATABASE_URL: ${{ secrets.DATABASE_URL_DEV }}
run: |
cd packages/db
npx prisma migrate deploy
npx prisma migrate deploy
2 changes: 1 addition & 1 deletion .github/workflows/database-migrations-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
DATABASE_URL: ${{ secrets.DATABASE_URL_PROD }}
run: |
cd packages/db
npx prisma migrate deploy
npx prisma migrate deploy
4 changes: 2 additions & 2 deletions .github/workflows/github-releases-to-discord.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:
jobs:
github-releases-to-discord:
permissions:
contents: read
contents: read
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Github Releases To Discord
uses: SethCohen/github-releases-to-discord@v1.16.2
with:
webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20' # Or your preferred Node.js version
node-version: "20" # Or your preferred Node.js version

- name: Setup Bun
uses: oven-sh/setup-bun@v2
Expand All @@ -43,4 +43,4 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
# NPM_TOKEN: ${{ secrets.NPM_TOKEN }} # Uncomment if publishing to npm
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
run: npx semantic-release
run: npx semantic-release
2 changes: 1 addition & 1 deletion .github/workflows/trigger-tasks-deploy-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: rm -rf node_modules .bun
- name: Install dependencies
run: |
bun install --frozen-lockfile
bun install
- name: Generate Prisma client
working-directory: ./packages/db
run: bunx prisma generate
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-tasks-deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: oven-sh/setup-bun@v2

- name: Install dependencies
run: bun install --frozen-lockfile
run: bun install

- name: Generate Prisma client
working-directory: ./packages/db
Expand Down
12 changes: 12 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

# Check for dependency mismatches
echo "Checking for dependency mismatches..."
bun run deps:check

# If there are mismatches, offer to fix them
if [ $? -ne 0 ]; then
echo "Dependency mismatches found! Run 'bun run deps:fix' to fix them."
exit 1
fi
15 changes: 14 additions & 1 deletion .husky/pre-push
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
#!/bin/sh

# Check branch name convention
branch_name=$(git symbolic-ref --short HEAD)
pattern="^[a-zA-Z-]+/.+$"

if [[ ! $branch_name =~ $pattern ]]; then
echo "Branch name '$branch_name' does not follow the naming convention."
echo "Branch names should follow the pattern: category/branch-name (e.g. feature/add-button)"
exit 1
fi
fi

echo "Running lint and typecheck before push..."

# Run lint
bun run lint

# Run typecheck
bun run typecheck:ci

echo "✅ All checks passed!"
Loading
Loading