8000 Sync master with develop branch by pranavxc · Pull Request #7909 · nocodb/nocodb · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Sync master with develop branch #7909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 19, 2024
Merged

Sync master with develop branch #7909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7efeba7
Merge pull request #7858 from nocodb/develop
github-actions[bot] Mar 14, 2024
4dfe35c
[create-pull-request] automated change
pranavxc Mar 14, 2024
65b583a
Merge pull request #7859 from nocodb/release/0.204.5
github-actions[bot] Mar 14, 2024
6426d86
chore: downgrade sqlite version for executable
pranavxc Mar 14, 2024
f930126
Merge pull request #7861 from nocodb/executable-build
pranavxc Mar 14, 2024
48b757c
[create-pull-request] automated change
pranavxc Mar 19, 2024
b5b36f8
Merge pull request #7907 from nocodb/release/0.204.6
github-actions[bot] Mar 19, 2024
27a2171
Merge branch 'master' into pre-release
pranavxc Mar 19, 2024
7446edb
Merge pull request #7908 from nocodb/pre-release
pranavxc Mar 19, 2024
f189ecd
chore: update sdk path
pranavxc Mar 19, 2024
8000
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/nc-lib-gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nc-lib-gui",
"version": "0.204.5",
"version": "0.204.6",
"description": "NocoDB GUI",
"author": {
"name": "NocoDB",
Expand Down Expand Up @@ -29,4 +29,4 @@
"dependencies": {
"express": "^4.17.1"
}
}
}
4 changes: 2 additions & 2 deletions packages/nocodb-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nocodb-sdk",
"version": "0.204.5",
"version": "0.204.6",
"description": "NocoDB SDK",
"main": "build/main/index.js",
"typings": "build/main/index.d.ts",
Expand Down Expand Up @@ -73,4 +73,4 @@
"prettier": {
"singleQuote": true
}
}
}
20 changes: 10 additions & 10 deletions packages/nocodb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nocodb",
"version": "0.204.5",
"version": "0.204.6",
"description": "NocoDB Backend",
"main": "dist/bundle.js",
"author": {
Expand Down Expand Up @@ -53,30 +53,30 @@
"@graphql-tools/merge": "^6.2.17",
"@jm18457/kafkajs-msk-iam-authentication-mechanism": "^3.1.2",
"@nestjs/bull": "^10.0.1",
"@nestjs/common": "^10.3.4",
"@nestjs/common": "^10.3.3",
"@nestjs/config": "^3.1.1",
"@nestjs/core": "^10.3.4",
"@nestjs/core": "^10.3.3",
"@nestjs/event-emitter": "^2.0.4",
"@nestjs/jwt": "^10.2.0",
"@nestjs/mapped-types": "^2.0.5",
"@nestjs/passport": "^10.0.3",
"@nestjs/platform-express": "^10.3.4",
"@nestjs/platform-socket.io": "^10.3.4",
"@nestjs/platform-express": "^10.3.3",
"@nestjs/platform-socket.io": "^10.3.3",
"@nestjs/serve-static": "^4.0.1",
"@nestjs/throttler": "^5.1.2",
"@nestjs/websockets": "^10.3.4",
"@nestjs/websockets": "^10.3.3",
"@ntegral/nestjs-sentry": "^4.0.1",
"@sentry/node": "^6.19.7",
"@techpass/passport-openidconnect": "^0.3.3",
"@types/chai": "^4.3.13",
"@types/chai": "^4.3.12",
"airtable": "^0.12.2",
"ajv": "^8.12.0",
"ajv-formats": "^2.1.1",
"archiver": "^5.3.2",
"auto-bind": "^4.0.0",
"aws-kcl": "^2.2.5",
"aws-sdk": "^2.1550.0",
"axios": "^1.6.8",
"axios": "^1.6.7",
"bcryptjs": "^2.4.3",
"body-parser": "^1.20.2",
"boxen": "^5.1.2",
Expand Down Expand Up @@ -132,11 +132,11 @@
"mysql2": "^3.9.2",
"nanoid": "^3.3.7",
"nc-help": "0.3.1",
"nc-lib-gui": "0.204.5",
"nc-lib-gui": "0.204.6",
"nc-plugin": "^0.1.3",
"ncp": "^2.0.0",
"nestjs-kafka": "^1.0.6",
"nestjs-throttler-storage-redis": "^0.4.3",
"nestjs-throttler-storage-redis": "^0.4.2",
"nocodb-sdk": "workspace:^",
"nodemailer": "^6.9.12",
"object-hash": "^3.0.0",
Expand Down
34 changes: 17 additions & 17 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/pkg-executable/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"nocodb": "0.204.5"
},
"overrides": {
"sqlite3": "5.1.7"
"sqlite3": "5.1.6"
},
"devDependencies": {
"@mapbox/node-pre-gyp&quo 403D t;: "^1.0.11"
Expand Down
0