Commit graph

5810 commits

Author SHA1 Message Date
Kavin Venkatachalam
3e52b34ca1 Merge branch 'fix/appbuilder-03' of https://github.com/ToolJet/ToolJet into perf/performance-imp 2025-07-10 20:12:16 +05:30
Nakul Nagargade
d02b3d8c5c Merge branch 'fix/appbuilder-03' into gh-12680-toggle-app-mode 2025-07-10 19:09:59 +05:30
Johnson Cherian
41134cf8a8
Merge pull request #13150 from ToolJet/fix-header-resizer-form-container
Fix header resizer not coming up on Container, form and modal
2025-07-10 17:51:59 +05:30
johnsoncherian
ed295b9cc6 Merge branch 'main' into fix/appbuilder-03 2025-07-10 15:43:03 +05:30
Adish M
4de88e9888
🚀 chore: update submodules to latest main after auto-merge (#13297)
Co-authored-by: gsmithun4 <3417097+gsmithun4@users.noreply.github.com>
2025-07-09 22:37:39 +05:30
Midhun G S
0c5ab3484c
Platform LTS Final fixes (#13221)
* Cloud Blocker bugfixes (#13160)

* fix

* minor email fixes

* settings menu fix

* fixes

* Bugfixes/whitelabelling apis (#13180)

* white-labelling apis

* removed consoles logs

* reverts

* fixes for white-labelling

* fixes

* reverted breadcrumb changes (#13194)

* fixes for getting public sso configurations

* fix for enable signup on cloud

* Cloud Trial and Banners (#13182)

* Cloud Blocker bugfixes (#13160)

* fix

* minor email fixes

* settings menu fix

* fixes

* Cloud Trial and Banners

* revert

* initial commit

* Added website onboarding APIs

* moved ai onboarding controller to auth module

* ee banners

* fix

---------

Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>

* Bugfixes/minor UI fixes-CLoud (#13203)

* Bugfixes/UI bugs platform 1 (#13205)

* cleanup

* Audit logs fix

* gitignore changes

* postgrest configs removed

* removed unused import

* improvements

* fix

* improved startup logs

* Platform cypress fix (#13192)

* Cloud Blocker bugfixes (#13160)

* fix

* minor email fixes

* settings menu fix

* fixes

* Bugfixes/whitelabelling apis (#13180)

* white-labelling apis

* removed consoles logs

* reverts

* fixes for white-labelling

* fixes

* Cypress fix

* reverted breadcrumb changes (#13194)

* cypress fix

* title fix

* fixes for getting public sso configurations

---------

Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>

* deployment fix

* added interfaces and permissions

* Bugfixes/lts 3.6 branch 1 platform (#13238)

* fix

* Licensing Banners Fixes Cloud and EE (#13241)

* design: Adds license buttons to header

* Refactor header actions

* Cloud Blocker bugfixes (#13160)

* fix

* minor email fixes

* settings menu fix

* fixes

* subscription page

* fix banners

---------

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>

* fix for public apps

* fix

* CE Instance Signup bug (#13254)

* CE Instance Signup bug

* improvement

* fix

* Add WEBSITE_SIGNUP_URL to deployment environment variables

* Add WEBSITE_SIGNUP_URL to environment variables for deployment

* Super admin banner fix (#13262)

* Git Sync Fixes  (#13249)

* git-sync module changes

* git sync fixes

* added app resource guard

* git-sync fixes

* removed require feature

* fix

* review comment changes

* ypress fix

* App logo fix inside app builder

* fix for subpath cache

* fix (#13274)

* platform-cypress-fix (#13271)

* git sync fixes (#13277)

* fix

* Add data-cy for new components (#13289)

---------

Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>
Co-authored-by: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com>
Co-authored-by: Ajith KV <ajith.jaban@gmail.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: rohanlahori <rohanlahori99@gmail.com>
Co-authored-by: Adish M <adish.madhu@gmail.com>
Co-authored-by: Rudra deep Biswas <rudra21ultra@gmail.com>
2025-07-09 22:36:41 +05:30
johnsoncherian
c3c933bac1 chore: update version for release 2025-07-09 19:21:13 +05:30
Vijaykant Yadav
53a8ca74ab merge base 2025-07-09 17:58:41 +05:30
johnsoncherian
2c12f8fc06 fix: remove incorrect second parameter from setSelectedQuery call 2025-07-09 15:04:47 +05:30
Kavin Venkatachalam
4f59c73f81 Resolve merge conflict by keeping local frontend/ee submodule commit 2025-07-09 14:12:59 +05:30
johnsoncherian
5577655726 chore: update version for release 2025-07-09 14:04:08 +05:30
Kavin Venkatachalam
c0687dca49 Update EE frontend and server submodules 2025-07-09 14:03:43 +05:30
NishidhJain11
5d8b080589
Merge branch 'main' into ai-modularisation-bug-fix 2025-07-09 12:57:28 +05:30
adishM98 Bot
5b076c9d31 🔄 chore: update submodules to latest main after auto-merge 2025-07-09 06:54:35 +00:00
Kavin Venkatachalam
d931b7ecc6 fix: optimize component sorting logic to ensure recalculation on changes. Fixes the bug on showing the component from one subcontainer to another 2025-07-09 12:22:28 +05:30
johnsoncherian
8c36a06ebe Merge branch 'main' into fix/appbuilder-02 2025-07-09 12:01:31 +05:30
Johnson Cherian
2777eb7435
Merge pull request #13263 from ToolJet/enable-hmr-fix
Disable error overlay for react refresh plugin
2025-07-09 09:14:16 +05:30
johnsoncherian
bf6d570fa7 Merge branch 'main' into fix/appbuilder-02 2025-07-09 01:39:40 +05:30
johnsoncherian
89f169c091 Merge branch 'main' into feat/ui-revamp-surface 2025-07-09 00:33:45 +05:30
Johnson Cherian
a6104f6b79
Merge pull request #13247 from ToolJet/fix/query-breaking
Fixed query breaking due to nested proxy
2025-07-09 00:15:59 +05:30
Johnson Cherian
0b282f45d0
Revert "Add support to show guidelines on component drop" 2025-07-09 00:14:28 +05:30
johnsoncherian
dc68be6130 Merge branch 'fix/appbuilder-02' into snapping-react-moveable 2025-07-09 00:10:18 +05:30
Ganesh Kumar
88ac5416ad Merge branch 'main' into feat/optional-tjdb-sql-mode 2025-07-08 23:00:33 +05:30
Ganesh Kumar
8eff0bd6c8 Merge branch 'main' into fix/workspace-constants-mapping 2025-07-08 21:02:59 +05:30
Ganesh Kumar
406210718a submodule reference updated 2025-07-08 21:01:58 +05:30
adishM98 Bot
937f9ffecd 🔄 chore: update submodules to latest main after auto-merge 2025-07-08 15:25:04 +00:00
Manish Kushare
3f3bc1046e
query switcher bug fixed along with sample data source addition (#13266) 2025-07-08 19:56:16 +05:30
Ganesh Kumar
50e8acb46a submodule reference updated 2025-07-08 19:17:26 +05:30
devanshu052000
e2034073ae Update frontend submodule reference 2025-07-08 18:53:38 +05:30
Devanshu Rastogi
07ba7acdc6
Fix: Workflow LTS migration UI issues (#13245)
* Fix: Rest API UI Alignment

* Update submodule reference

* Update frontend submodule ref

* update submodule ref

* Update frontend submodule ref
2025-07-08 18:53:36 +05:30
Akshay Sasidharan
bc1b0779d2 chore: disable SQL mode for cloud edition 2025-07-08 18:35:35 +05:30
Nishidh Jain
ee9ac0820b Disable error overlay 2025-07-08 18:10:24 +05:30
Nishidh Jain
d0cc67ced6 Added optional chaining for renderCopilot function call as its not passed as prop in few cases hence getting resolbed to undefined 2025-07-08 17:52:40 +05:30
Kartik Gupta
e924ce9551 update submodules 2025-07-08 16:17:14 +05:30
Muhsin Shah C P
1285779eca
fix: Handle params in trigger function to support non-array input (#13257) 2025-07-08 16:09:34 +05:30
johnsoncherian
489c8aa950 fix:: updated filepicker default size 2025-07-08 15:31:01 +05:30
johnsoncherian
7906279667 Merge branch 'fix/appbuilder-02' into snapping-react-moveable 2025-07-08 15:18:47 +05:30
johnsoncherian
890fc2aa4e chore: update submodule reference 2025-07-08 15:03:45 +05:30
johnsoncherian
618ae95b08 Merge branch 'fix/appbuilder-02' into snapping-react-moveable 2025-07-08 15:02:52 +05:30
Muhsin Shah C P
563c354248
fix: Simplify license information logging in handleLicensingInit function (#13253) 2025-07-08 14:30:21 +05:30
parthy007
da772699e4 Merge branch 'main' into fix/workspace-constants-mapping 2025-07-08 14:09:15 +05:30
Akshay
9316b763fc
Refactor: Workflows feature is configurable (#13235)
* refactor: Disable workflows for cloud edition

* chore: update submodule to latest commit
2025-07-08 14:07:42 +05:30
Akshay Sasidharan
abcbea75c0 fix: isWorkflowsFeatureEnabled method added 2025-07-08 13:51:37 +05:30
Akshay Sasidharan
72adb1afae Merge branch 'main' into release/workflows-lts-migration 2025-07-08 13:20:59 +05:30
Kartik Gupta
d82ee5d307 cloud changes 2025-07-08 12:59:42 +05:30
Nithin David Thomas
bbb02c64b3 Dropdown fixes 2025-07-08 12:58:29 +05:30
Nithin David Thomas
41f48df1de Fixes sso card body 2025-07-08 12:34:14 +05:30
Nithin David Thomas
bf19bcbe73 Fixes tooljet db styles 2025-07-08 12:25:52 +05:30
Shaurya Sharma
6c28d3f522 Fixed query breaking due to nested proxy 2025-07-08 12:09:16 +05:30
Muhsin Shah C P
17932d571e
feat: add workflow store to manage workflow ID state (#13239) 2025-07-08 10:56:05 +05:30