Commit graph

10455 commits

Author SHA1 Message Date
johnsoncherian
cb5bf13d75 chore: update submodule references 2025-07-10 22:06:39 +05:30
Johnson Cherian
1d5fabae0a
Merge pull request #13240 from ToolJet/perf/performance-imp
[fix]: Removed unwanted re-renders
2025-07-10 22:05:43 +05:30
Kavin Venkatachalam
a931a38529 chore: updated submodule ref 2025-07-10 20:13:12 +05:30
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
Johnson Cherian
f1f9a57e3d
Merge pull request #12936 from ToolJet/gh-12680-toggle-app-mode
Add action to toggle app mode (light/dark)
2025-07-10 19:43:53 +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
f86fd72631
Merge pull request #13311 from ToolJet/fix/migration-issue-cloud-1
Cloud imgration issue fix
2025-07-10 14:54:22 +05:30
Adish M
d38eb7a6f2 added the correct files for migration 2025-07-10 14:52:32 +05:30
Adish M
f4244a36c6 Cloud imgration issue fix 2025-07-10 14:50:57 +05:30
Adish M
d6475010b0
Created a new automation for deploying prod frontend to Netlify (#13304) 2025-07-10 12:48:17 +05:30
Adish M
09b2f89cf8
fix git issue cloud server dockerifle (#13299) 2025-07-09 23:41:59 +05:30
Midhun G S
e666435bd8
Merge pull request #13298 from ToolJet/fix/platform-lts-mgs-1
Remove app-git util file
2025-07-09 23:33:01 +05:30
gsmithun4
35d75e03b5 delete app git util service 2025-07-09 23:31:56 +05:30
gsmithun4
0ac2a25205 initial commit 2025-07-09 23:31:25 +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
Johnson Cherian
33f77dda7c
Merge pull request #13231 from ToolJet/fix/page-bugs-01
Fix: page bugs and design changes
2025-07-09 19:18:48 +05:30
Adish M
7b0b5ca13d
Merge pull request #13293 from ToolJet/fix/ai-dockerfile
Update new ai assest path in dockerfile
2025-07-09 19:18:21 +05:30
Adish M
19eab65c40 Add the fallback and ai path changes to cloud dockerfile 2025-07-09 18:54:59 +05:30
Adish M
f9f37804b5 adding condition to fallback to main if submodule branch is not found 2025-07-09 18:27:43 +05:30
Adish M
90a28e6ea0 changing it back to main 2025-07-09 18:24:29 +05:30
Vijaykant Yadav
8cfb388fbb Merge branch 'fix/page-bugs-01' of https://github.com/ToolJet/ToolJet into fix/page-bugs-01 2025-07-09 17:59:24 +05:30
Vijaykant Yadav
b451d89027 update submodule 2025-07-09 17:59:13 +05:30
Vijaykant Yadav
53a8ca74ab merge base 2025-07-09 17:58:41 +05:30
Adish M
f7f7ec4702 hardcoding main branch 2025-07-09 17:56:20 +05:30
Adish M
e96da4597a Update new ai assest path in dockerfile 2025-07-09 17:38:58 +05:30
Johnson Cherian
d988b83469
Merge pull request #13129 from ToolJet/fix-import-export-container-form
Fix Container and form on import adding header and footer by default
2025-07-09 16:54:42 +05:30
Nakul Nagargade
8d09dde3d6 update reference 2025-07-09 16:50:36 +05:30
Nakul Nagargade
3767156287 update reference 2025-07-09 16:48:16 +05:30
Nakul Nagargade
16b55d3431 Merge remote-tracking branch 'origin/fix/appbuilder-03' into fix-import-export-container-form 2025-07-09 16:47:51 +05:30
Nakul Nagargade
a63e4370c9 update reference 2025-07-09 16:47:05 +05:30
Adish M
9f3617e8a1
Merge pull request #13276 from ToolJet/enhance/merge-pr-workflow
chore: streamline submodule update process and automate PR creation
2025-07-09 16:03:09 +05:30
Johnson Cherian
7a00f8561d
Merge pull request #13284 from ToolJet/fix/setselectedquery-parameter-correction
fix: remove incorrect second parameter from setSelectedQuery call
2025-07-09 15:33:35 +05:30
Adish M
f23c4ecbe1 Update display image 2025-07-09 15:28:57 +05:30
johnsoncherian
2c12f8fc06 fix: remove incorrect second parameter from setSelectedQuery call 2025-07-09 15:04:47 +05:30
Adish M
b2a582b1c8 update submodule handling in merging PR workflow 2025-07-09 14:19:35 +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
Johnson Cherian
e1f33ac305
Merge pull request #13280 from ToolJet/ai-modularisation-bug-fix
Added optional chaining for renderCopilot function call as its not passed as prop in few cases hence getting resolved to undefined
2025-07-09 13:29:38 +05:30
Johnson Cherian
bb6a05b696
Merge pull request #13261 from ToolJet/ai-modularisation-bug-fix
Added optional chaining for renderCopilot function call as its not passed as prop in few cases hence getting resolved to undefined
2025-07-09 13:07:24 +05:30
NishidhJain11
5d8b080589
Merge branch 'main' into ai-modularisation-bug-fix 2025-07-09 12:57:28 +05:30
Adish M
e8ed047388 🔄 chore: streamline submodule update process and automate PR creation 2025-07-09 12:46:43 +05:30
adishM98 Bot
5b076c9d31 🔄 chore: update submodules to latest main after auto-merge 2025-07-09 06:54:35 +00:00
Johnson Cherian
2be1a69aea
Merge pull request #13233 from ToolJet/fix/appbuilder-02
Fix/appbuilder 02
2025-07-09 12:23:45 +05:30
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