Commit graph

1964 commits

Author SHA1 Message Date
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
Rudra deep Biswas
7af3812f5f fix 2025-05-12 15:26:40 +05:30
Rudra deep Biswas
c7bca09dc6 merge fix 2025-05-08 12:16:44 +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
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
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
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
Nithin David Thomas
5b59c75d57 fix: Matches default form layout to design 2025-04-28 17:09:53 +05:30
johnsoncherian
afaa634772 chore: updated submodule references 2025-04-28 15:41:42 +05:30
johnsoncherian
f42f9526b7 feat: corrected reference to constants 2025-04-28 15:41:06 +05:30
johnsoncherian
e37733cabd chore: updated submodule references 2025-04-28 15:34:04 +05:30
johnsoncherian
45e945d4c4 Merge branch 'main' into appbuilder/sprint-11 2025-04-28 15:28:21 +05:30
Parth
219440a9bc
Add copy-writing and icon fixes (#12664) 2025-04-28 10:24:56 +05:30
Parth
cb992cd324
Enhance: Add validation for encrypted fields with input reference on failure (#12541)
* API backend setup for fetching decrypted options object

* Frontend setup to use and fetch decrypted options object

* Debounce validation and include encrypted fields

* Update banners and point back to inputs

* Fix toggle and headers to trigger validation on change

* Fix disable state of save button
2025-04-28 10:23:25 +05:30
Kushagra Srivastava
43ac4f251f
add metadata to QueryError and populating metadata in inspector on error (#12501)
* add metadata to QueryError

Signed-off-by: thesynthax <kushagra1403@gmail.com>

* add TODO, minor changes

Signed-off-by: thesynthax <kushagra1403@gmail.com>

* minor changes

Signed-off-by: thesynthax <kushagra1403@gmail.com>

* metadata gets populated on query error/failure

Signed-off-by: thesynthax <kushagra1403@gmail.com>

* add headers to metadata.response

Signed-off-by: thesynthax <kushagra1403@gmail.com>

* redact headers

Signed-off-by: thesynthax <kushagra1403@gmail.com>

---------

Signed-off-by: thesynthax <kushagra1403@gmail.com>
2025-04-28 10:08:34 +05:30
Adish M
1f20354095 Fix entrypoint issue in Preview dockerfie 2025-04-25 16:04:59 +05:30
Muhsin Shah C P
8137cab986 Added server file 2025-04-25 14:47:03 +05:30
Muhsin Shah C P
1a43cb34b1 Migration path fix for ce 2025-04-25 14:46:11 +05:30
Vijaykant Yadav
dd49076c33 fix: config file structure 2025-04-25 14:36:26 +05:30
Muhsin Shah C P
c03ffb00fc Bump version 2025-04-25 12:57:10 +05:30
Muhsin Shah C P
1faa34bc8f Merge branch 'main' into rebasing/main-post-mod 2025-04-25 12:53:01 +05:30
Vijaykant Yadav
3e7f524403 merge base 2025-04-25 12:44:25 +05:30
Vijaykant Yadav
a745ca07d9 be changes 2025-04-25 12:38:25 +05:30
devanshu052000
95c57438d5 Merge branch 'appbuilder/sprint-11' into feat/multiselect-label 2025-04-25 12:03:44 +05:30
Johnson Cherian
23ca209a16
Merge pull request #12322 from ToolJet/feat/resizable-slots-form
feat: Makes header and footer resizable
2025-04-25 11:40:56 +05:30
Johnson Cherian
610a8fd81d
Merge pull request #12494 from ToolJet/fix/container-migrate-header
fix: Migrates showHeader property to false for exiting containers
2025-04-25 11:36:24 +05:30
johnsoncherian
ece6d98f32 feat: rebase maint to release branch 2025-04-25 11:26:25 +05:30
johnsoncherian
26a3574d32 Merge branch 'main' of https://github.com/ToolJet/ToolJet 2025-04-25 11:24:40 +05:30
Nithin David Thomas
509d5e9c58
Merge branch 'appbuilder/sprint-11' into feat/resizable-slots-form 2025-04-24 22:51:16 -07:00
Nithin David Thomas
5f319e2d53 Fixes drag and drop on form with scrolls 2025-04-25 11:16:56 +05:30
Muhsin Shah C P
14158c8bdf moved mails to the src folder 2025-04-25 02:21:39 +05:30