Commit graph

1998 commits

Author SHA1 Message Date
Ganesh Kumar
cccd84d628 submodule reference updated 2025-05-23 13:38:34 +05:30
Ganesh Kumar
5e53d6dd7e
Merge branch 'main' into release/marketplace-sprint-11 2025-05-21 11:08:14 +05:30
Johnson Cherian
1c7ef25656
chore: updated version (#12904)
* chore: updated version

* chore: updated references
2025-05-20 11:57:30 +05:30
johnsoncherian
170355d949 update server submodule reference 2025-05-19 18:18:57 +05:30
Johnson Cherian
09bc300466
Merge pull request #12605 from ToolJet/appbuilder/sprint-11-edit
container size
2025-05-16 18:06:20 +05:30
johnsoncherian
d084360650 Merge branch 'appbuilder/sprint-12' into appbuilder/sprint-11-edit 2025-05-16 18:06:06 +05:30
johnsoncherian
1581552a71 Merge branch 'appbuilder/sprint-12' into fix/custom-themes-ui 2025-05-16 18:02:11 +05:30
johnsoncherian
b64b5ad5ea update reference 2025-05-16 12:30:44 +05:30
Johnson Cherian
31552242a2
Merge pull request #12591 from ToolJet/feat/steps-v2-alignment-style-improvement
feat: dynamic steps length based on steps text size
2025-05-15 15:28:29 +05:30
Johnson Cherian
432066b4f6
Merge pull request #12709 from ToolJet/fix/query-duplicate-failure
Fix: Add datasourceId to static queries in GET requests
2025-05-15 15:04:06 +05:30
Johnson Cherian
51dbe8bee9
Merge branch 'main' into fix/query-duplicate-failure 2025-05-15 15:03:50 +05:30
devanshu052000
e1bf0ea4c6 Updated submodule ref 2025-05-15 14:28:22 +05:30
gsmithun4
81f039b481 Merge branch 'main' into fix/external-epi 2025-05-14 21:41:27 +05:30
Muhsin Shah C P
958cbd1d02
[improvement] Default workspace (#12834)
* Added set-default API

* Setting default workspace for super-admin onboarding

* Seperated the migrations

* Added nestjs init

* removed nestjs init

* Added: default workspace case to signup

* Fixed: instance signup

* Fixed: existed non-active user instance signup

* Added: SSO default workspace support

* Added: Default workspace chooser

* Moved some scss changes to ee folder

* Added: disable workspace default organization check

* updated the migration

* Fixing .env issue

* Removed the logs

* Remove personal workspace check from enable signup

* Fixing sign-in cases

* Fixing workspace invited user's instance signup cases

* Fixing sso workspace invited user's instance signup cases

* fixing the workspace signup issue

* Adding ee server and frontend file

* Adding ee server and frontend file

* Adding active check

* Added query fix for the migration

* Added migration logic fix

* Removed/Commented the ENABLE_ONBOARDING_QUESTIONS_FOR_ALL_SIGN_UPS env support from EE and CE

* Adding server and frontend files

* Added frontend file

* Bump version
2025-05-14 16:06:52 +05:30
Rudra deep Biswas
dba41a8739 cleanup 2025-05-13 22:04:31 +05:30
Rudra deep Biswas
01d73bd3f9 remove orgId 2025-05-13 19:12:34 +05:30
Rudra deep Biswas
29202a8e40 pass ws admin 2025-05-13 18:10:29 +05:30
Rudra deep Biswas
6e6b721fca user-role 2025-05-13 17:08:09 +05:30
Rudra deep Biswas
592447dc83 util-service 2025-05-13 16:19:57 +05:30
Midhun G S
3d697f08b1
Merge branch 'main' into fix/external-epi 2025-05-13 11:36:36 +05:30
Ganesh Kumar
9b6d2db945
Merge branch 'main' into release/marketplace-sprint-11 2025-05-13 11:03:54 +05:30
Rudra deep Biswas
7af3812f5f fix 2025-05-12 15:26:40 +05:30
devanshu052000
65539ddbb1 Updated the color names 2025-05-12 14:12:17 +05:30
Rudra deep Biswas
c7bca09dc6 merge fix 2025-05-08 12:16:44 +05:30
johnsoncherian
34ee831f65 Merge branch 'main' into feat/steps-v2-alignment-style-improvement 2025-05-08 11:13:29 +05:30
Midhun G S
49b14781f4
Merge branch 'main' into fix/migration-license-plan 2025-05-08 10:58:46 +05:30
Adish M
648cc2c247
Adding volume for render PR app (#12795)
* Adding volume for render PR app

* correction mountPath

* dummy PR for testing

* correction in mount path

* correction in mount path

* correction disk size

* correction disk size

* correction disk size

* correction disk size

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue and volume issue fixed

* fix postgresql start up issue in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* clean up

* clean up

* fix EOF

* changed the instance spec for ee edition
2025-05-08 01:37:20 +05:30
devanshu
eb6cc28fbb fix: super admin issue 2025-05-07 13:07:55 +05:30
parthy007
4080f55f6e Fix: Connection for Salesforce, Google sheet, Slack , Grpc, Zendesk & Woocommerce
Fetch the auth code using correct method in request

Get the plugin object correctly for reloading

Fix woocommerce operation rendering

Resolve promise correctly

Pass plugin_id as prop

Resolve plugin saving issue with caching tokens

Add json-message in query correctly

Use auth code once without cache
2025-05-06 16:47:24 +05:30
Rudra deep Biswas
ef20a0b9a5 Merge branch 'main' of https://github.com/ToolJet/ToolJet into fix/external-epi 2025-05-06 16:43:19 +05:30
Rudra deep Biswas
12f09f80d8 review 2025-05-06 16:38:13 +05:30
devanshu052000
2e3c346fb5 Added UI for more surface options 2025-05-06 13:18:29 +05:30
johnsoncherian
67c7d65e73 Merge branch 'main' into feat/steps-v2-alignment-style-improvement 2025-05-02 11:52:02 +05:30
johnsoncherian
24b3eb9ac0 chore: uodate submodule reference 2025-05-02 11:51:48 +05:30
Akshay Sasidharan
9b9f872e2e bump to v3.12.0 2025-04-30 21:31:45 +05:30
Johnson Cherian
a4665c86ea
Merge pull request #12734 from ToolJet/fix/version-creation
Fix: Relation "page_permissions" does not exist error on version creation
2025-04-29 18:18:21 +05:30
johnsoncherian
c62c0f7ff9 chore: uodate submodule reference 2025-04-29 18:17:23 +05:30
devanshu052000
7c6f3c576d Move page-permissions logic to server/ee submodule 2025-04-29 16:05:23 +05:30
johnsoncherian
6e0d9b8073 Merge branch 'main' into feat/steps-v2-alignment-style-improvement 2025-04-29 13:25:47 +05:30
johnsoncherian
68bf2807fd Merge branch 'main' into feat/steps-v2-alignment-style-improvement 2025-04-29 13:00:33 +05:30
Akshay Sasidharan
d107346f80 Merge branch 'main' into release/marketplace-sprint-10 2025-04-29 10:59:25 +05:30
Adish M
eea449c154
Merge pull request #12716 from ToolJet/fix/render-postgresql-issue
Fix: Render postgresql connection pool issue
2025-04-29 10:53:50 +05:30
johnsoncherian
8e290141ca chore: updated submodule references 2025-04-29 08:57:59 +05:30
johnsoncherian
9dd5a7435b chore: updated submodule references 2025-04-29 08:56:45 +05:30
Adish M
ff9567a876 remove redis boot.sh file 2025-04-29 08:35:15 +05:30
Adish M
c60e75a067 adding dockerfile and boot.sh file change for postgresql 2025-04-29 07:57:51 +05:30
Rudra deep Biswas
7e52b6178c fix 2025-04-29 03:44:14 +05:30
Devanshu Rastogi
0a274dd0d2
Updating ee/server ee/frontend submodule reference (#12719) 2025-04-28 23:58:31 +05:30
Ganesh Kumar
a4e6ca9f2b
ToolJet database JSON column values are not persisted in query builder (#12438) 2025-04-28 23:27:42 +05:30
Manish Kushare
42b4a4105e
Added feature to add bulk upsert using PK (#12325)
* Added feature to add bulk upsert using PK

* Avoid pre-fetching of data

* refactor: update bulk upsert option to use primary key in ToolJetDbOperations

* refactor: rename bulk upsert action to include primary key in TooljetDbActions

* refactor: enhance data type conversion and improve bulk upsert logic in TooljetDbBulkUploadService for bulk upsert function

* updated bulk upsert functionalities

* refactor: implement error handling in bulk upsert process of TooljetDbBulkUploadService

* refactor: simplify row handling in BulkUpsertPrimaryKey and ensure consistent data structure in TooljetDb services

* Made the review changes

* refactor: remove getTableInfo method from TooljetDbBulkUploadService and its usage in TooljetDbDataOperationsService

* refactor: update initialValue handling in CodeHinter for BulkUploadPrimaryKey and BulkUpsertPrimaryKey components
2025-04-28 20:45:57 +05:30