Commit graph

9895 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
Johnson Cherian
cb7eb39334
Merge pull request #12894 from ToolJet/appbuilder/sprint-12
Appbuilder/sprint 12
2025-05-20 10:34:07 +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
Johnson Cherian
0ae9f5f66f
Merge pull request #12806 from ToolJet/fix/custom-themes-ui
Fix: Custom Themes UI in Workspace Settings
2025-05-16 18:02:45 +05:30
johnsoncherian
1581552a71 Merge branch 'appbuilder/sprint-12' into fix/custom-themes-ui 2025-05-16 18:02:11 +05:30
Johnson Cherian
77bf79f1c2
Merge pull request #12889 from ToolJet/feat/override-codemirror-autocomplete-default-filter
Feat/override codemirror autocomplete default filter
2025-05-16 17:22:08 +05:30
johnsoncherian
1d590cbe03 update reference 2025-05-16 17:16:12 +05:30
johnsoncherian
583dcc5779 Merge branch 'appbuilder/sprint-12' of https://github.com/ToolJet/ToolJet into appbuilder/sprint-12 2025-05-16 17:15:10 +05:30
johnsoncherian
9d6be8cef6 update reference 2025-05-16 17:14:59 +05:30
johnsoncherian
2b1d4607d6 Merge branch 'appbuilder/sprint-12' into feat/override-codemirror-autocomplete-default-filter 2025-05-16 17:13:45 +05:30
Johnson Cherian
66683af78c
Merge pull request #12686 from ToolJet/fix/codehinter-btns
Fix: Search button and Fill with AI button overlapping in multiline code-editor
2025-05-16 15:05:58 +05:30
devanshu052000
c5fe9f67d0 Update frontend submodule 2025-05-16 14:35:55 +05:30
devanshu052000
b53b8100d3 Revert "Update submodule references"
This reverts commit e3772f359b.
2025-05-16 14:35:39 +05:30
devanshu052000
e3772f359b Update submodule references 2025-05-16 14:31:28 +05:30
johnsoncherian
97377089a8 Merge branch 'main' into feat/override-codemirror-autocomplete-default-filter 2025-05-16 12:36:26 +05:30
johnsoncherian
cd557a1849 update reference 2025-05-16 12:31:18 +05:30
johnsoncherian
b64b5ad5ea update reference 2025-05-16 12:30:44 +05:30
johnsoncherian
74b2065354 update reference 2025-05-16 12:15:29 +05:30
johnsoncherian
6eba90ecc1 Merge branch 'appbuilder/sprint-12' into feat/override-codemirror-autocomplete-default-filter 2025-05-16 12:14:22 +05:30
johnsoncherian
6d016956e1 fix: add missing imports 2025-05-16 12:10:38 +05:30
Johnson Cherian
ecf1d824ec
Merge pull request #12842 from ToolJet/fix/query-panel-overflow
Fix: Dropdown options go out of scope when scrolling through Query Manager
2025-05-16 09:48:22 +05:30
devanshu052000
af97aaaf74 Merge branch 'appbuilder/sprint-12' into fix/codehinter-btns 2025-05-15 19:01:09 +05:30
devanshu052000
6fa8457d95 Merge branch 'appbuilder/sprint-12' into fix/query-panel-overflow 2025-05-15 16:27:08 +05:30
devanshu052000
159f7c88ee Merge branch 'appbuilder/sprint-12' into fix/query-panel-overflow 2025-05-15 16:12:50 +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
7a45ed5672
Merge pull request #12817 from ToolJet/fix/new-input-tag
Fix: Added 'New' tag for Phone, Email and Currency input
2025-05-15 15:06:02 +05:30
Johnson Cherian
a704fa3a8a
Merge pull request #12816 from ToolJet/fix/event-actions
Fix: Reorganised event actions and improved UX
2025-05-15 15:05:39 +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
Johnson Cherian
923092ebb3
Merge pull request #12447 from ToolJet/fix/multiselect-dropdown-issues
Fix: Triage room issues
2025-05-15 15:03:03 +05:30
devanshu052000
e1bf0ea4c6 Updated submodule ref 2025-05-15 14:28:22 +05:30
Johnson Cherian
e0169e2a59
Merge branch 'main' into fix/multiselect-dropdown-issues 2025-05-15 14:07:46 +05:30
Adish M
b94934279e
Merge pull request #12673 from ToolJet/fix/external-epi
Fix External API Modularisation
2025-05-15 10:37:07 +05:30
johnsoncherian
3dd2d9f284 update submodule refs 2025-05-15 00:13:41 +05:30
johnsoncherian
a442207a6e chore: sync frontend/src/_ui/Select/SelectComponent.jsx with main branch 2025-05-15 00:05:45 +05:30
johnsoncherian
d442a12eb6 Update server/ee 2025-05-15 00:03:51 +05:30
johnsoncherian
0868447e92 chore: sync frontend/src/modules/ directory with main branch 2025-05-15 00:02:23 +05:30
johnsoncherian
a0a6eb0f77 Merge branch 'appbuilder/sprint-12' into enhance/override-codemirror-autocomplete-default-filter 2025-05-15 00:00:57 +05:30
johnsoncherian
42fb9fecd5 chore: sync server/ directory with main branch 2025-05-14 23:56:05 +05:30
johnsoncherian
0d5e6870a0 fix: remove redundant chat 2025-05-14 23:50:34 +05:30
johnsoncherian
93ef107040 Merge branch 'appbuilder/sprint-12' into enhance/override-codemirror-autocomplete-default-filter 2025-05-14 23:29:52 +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
Ganesh Kumar
29045d7606
Merge branch 'main' into release/marketplace-sprint-11 2025-05-14 15:35:00 +05:30
Adish M
c0009b2c3a
Fix repo in ee render app to pick the forked branch (#12873) 2025-05-14 15:33:39 +05:30
Ganesh Kumar
f3cf8959a3
Merge branch 'main' into release/marketplace-sprint-11 2025-05-14 15:23:44 +05:30