Commit graph

10420 commits

Author SHA1 Message Date
Manish Kushare
cd75df277b
update base repo for this submodule commit (#13315) 2025-07-10 15:45:39 +05:30
Muhsin Shah C P
27ba370d72
feat: add export option for workflows in AppMenu (#13309) 2025-07-10 13:30:34 +05:30
Muhsin Shah C P
ccbc37d0b6
fix: update subproject commit reference (#13308) 2025-07-10 13:11:52 +05:30
Akshay Sasidharan
ea8f020fa1 Merge branch 'release/workflows-fixes' of github.com:ToolJet/ToolJet into release/workflows-fixes 2025-07-10 12:48:40 +05:30
Akshay Sasidharan
6312b26d69 Merge branch 'main' into release/workflows-fixes 2025-07-10 12:45:07 +05:30
Akshay
680040d520
fix: workflow schedule cleanup (#13295) 2025-07-10 12:31:16 +05:30
Devanshu Rastogi
11d04391f9
Fix: Initialize asyncQueryRuns in the state to avoid accessing undefined entity (#13300) 2025-07-10 10:32:21 +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
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
Manish Kushare
9acdd05611
Fixed loop icon issue in logs and Import workflow modal text issues (#13292) 2025-07-09 18:36:25 +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
Devanshu Rastogi
eecfdccdd8
Fix: Remove 'Choose from Template' option from import menu (#13290) 2025-07-09 18:03:25 +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
Devanshu Rastogi
16d931c1c2
Fix: Scroll issue for large set of logs in response (#13288)
* Added optional chaining for renderCopilot function call as its not passed as prop in few cases hence getting resolbed to undefined

* Update ee-server submodule reference

* Fix: Scroll issue for large set of logs in response

---------

Co-authored-by: Nishidh Jain <nishidh@tooljet.com>
Co-authored-by: Johnson Cherian <johnsonc.dev@gmail.com>
2025-07-09 17:10:05 +05:30
Muhsin Shah C P
3ab3471b89
chore: update subproject commits for frontend and server; add UPDATE_ICON feature key to workflow abilities (#13287) 2025-07-09 16:45:45 +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
Adish M
c39598bfea
Merge pull request #13279 from ToolJet/fix/webhook-params
[Dependency PR]The webhook trigger fails for requests without a body.
2025-07-09 15:14:53 +05:30
Muhsin Shah C P
3b5bbc0955 chore: update subproject commit reference in server/ee 2025-07-09 15:05:40 +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
Muhsin Shah C P
57ac9772ce Merge branch 'release/workflows-fixes' into fix/webhook-params 2025-07-09 14:08:23 +05:30
Muhsin Shah C P
c3753e8725
Added optional chaining for renderCopilot function call as its not passed as prop in few cases hence getting resolbed to undefined (#13282)
Co-authored-by: Nishidh Jain <nishidh@tooljet.com>
Co-authored-by: Johnson Cherian <johnsonc.dev@gmail.com>
2025-07-09 14:06:29 +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
Muhsin Shah C P
772fde40d1 chore: update subproject commits for frontend and server 2025-07-09 13:05:33 +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
johnsoncherian
8c36a06ebe Merge branch 'main' into fix/appbuilder-02 2025-07-09 12:01:31 +05:30
Johnson Cherian
ded4aabfad
Merge pull request #12988 from ToolJet/feat/ui-revamp-surface
feat: Changes background color to match new design
2025-07-09 11:26:20 +05:30
Midhun Kumar E
56dee6dc43
Reveredt automation skip. 2025-07-09 10:10:03 +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
Midhun Kumar E
e3568dee53
Commented the automation from platfoem and marketplace. 2025-07-09 01:49:01 +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
146bf83e67
Merge pull request #13272 from ToolJet/revert-13089-snapping-react-moveable
Revert "Add support to show guidelines on component drop"
2025-07-09 00:14:44 +05:30
Johnson Cherian
0b282f45d0
Revert "Add support to show guidelines on component drop" 2025-07-09 00:14:28 +05:30
Johnson Cherian
1d7f6d7731
Merge pull request #13089 from ToolJet/snapping-react-moveable
Add support to show guidelines on component drop
2025-07-09 00:13:33 +05:30
johnsoncherian
dc68be6130 Merge branch 'fix/appbuilder-02' into snapping-react-moveable 2025-07-09 00:10:18 +05:30