Commit graph

10231 commits

Author SHA1 Message Date
Rohan Lahori
e6dcc241e0
Feature edit git pulled apps/pre release (#13003)
* init

* ee git-sync

* dependancies

* added octokit depedencies to server directory

* module fixes

* fixes

* fixes

* pull app changes fix

* ability factory fixes

* code restructuring changes

* added gitlab backend changes

* app git module fixes

* module file changes

* added logo images

* migration

* migration

* migration changes

* added migration to remove enabledflag from parent table

* provider and migration fixes

* removed comments

* revert appimport export changes

* Revert "revert appimport export changes"

This reverts commit b139db811e.

* fixed version rename api calls

* app/version rename commit fixes

* added builder permissions

* review comment changes

* module file and service fixes

* module fixes

* fixes

* fixed module file changes

* added git-sync repository

* fixed app-git imports

* removed injected ssh,https, gitlab repositories

* added app git sync repository (dev testing pending)

* removed more modules

* removed type orm completley (dev testing pending)

* fixed module file

* removed unused dto's

* working

* fixes

* removed comments

* migration changes

* removed node git package

* changed default branch to main

* ssh

* removed apps ability factory dependencies

* minor changes

* migration fixes

* fixes

* added events for app and version rename

* removed comments

* added license checks

* listener fixes

* removed unused files

* fixed db:reset and server issues

* fixed ce and ee migration

* submoudle commits

* migration and entity changes

* module changes

* backend changes for edit app functionality

* ui changes

* added app canvas banner

* api-fix for freeze-editor apis

* header changes

* fix for delete version failing

* minor ui fix

* minor changes

* reverts

* reverts

* fixes

* fixed imports

* removed consoles

* added separate data migration for migrating provider column values

* fix

* fixes

* fixed ui breaking

* fix

* added app canvas banner in ce

---------

Co-authored-by: Rudra deep Biswas <rudra21ultra@gmail.com>
Co-authored-by: rohan <rohan@gmail.com>
Co-authored-by: Midhun G S <gsmithun4@gmail.com>
2025-06-25 12:06:04 +05:30
Ganesh Kumar
18206c6b53
Merge pull request #13076 from ToolJet/test/fix-restAPI-automation
Fixed cypress failure for Rest API
2025-06-24 23:07:23 +05:30
Mekhla Asopa
a05afd72d7 fix all method in rest api 2025-06-24 22:16:12 +05:30
Adish M
bed888bd8a
removed docker buildx from cypress-platform.yml (#13075) 2025-06-24 17:43:14 +05:30
Adish M
17045befd3
Update node version in vulnerability automation (#13071) 2025-06-24 14:58:46 +05:30
Adish M
7123fc278b
Update merging-pr.yml for rebase submodule current main to base repo (#13067) 2025-06-23 18:08:08 +05:30
Midhun G S
001f445708
cypress changes (#13037)
Co-authored-by: Ajith KV <ajith.jaban@gmail.com>
2025-06-23 13:16:35 +05:30
johnsoncherian
511797f441 chore: update submodule references 2025-06-23 11:58:02 +05:30
johnsoncherian
42f81d3e79 Merge branch 'main' into appbuilder/sprint-14 2025-06-23 11:57:26 +05:30
Midhun G S
1fbb148f16
Deprecated static local data sources (#12687)
* deprecated static local data sources

* changes

* transactions wrapped under dbTransaction wrap

* removed entity manager from app import export service

* Update export app cypress test case.

* update app export test case

* type error fix for loader

* fix for listing of tooljetdb for app import export

* postgrest configs

* added readme

* cleanup

* fix for app import export version order

* Update app export spec

* fix

---------

Co-authored-by: ajith-k-v <ajith.jaban@gmail.com>
2025-06-22 12:59:13 +05:30
johnsoncherian
9b24e2b315 chore: update submodule references 2025-06-21 17:46:11 +05:30
Johnson Cherian
3a798744be
Merge pull request #13051 from ToolJet/fix/hide-modules-tab
[fix]: Hide the modules tab on the editor
2025-06-21 17:27:45 +05:30
Johnson Cherian
0d7ff2d1f3
Merge branch 'main' into fix/hide-modules-tab 2025-06-21 16:15:39 +05:30
kriks7iitk
1606852abe
Feature/workflow permission 2 (#12869)
* Added worklfow permsiions

* Fixed bugs in workflow permission

* fix bugs in server for worklfow permsiion

* fix bugs for workflow permissions

* reverted not required files

* reverted package lock json

* revert back .gitmodules url

* revered package lock

* plugins import fix

* fix

* Update groups test cases

---------

Co-authored-by: Adish M <adish.madhu@gmail.com>
Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
Co-authored-by: ajith-k-v <ajith.jaban@gmail.com>
2025-06-21 13:10:05 +05:30
Johnson Cherian
c857dc811e
Merge branch 'main' into fix/hide-modules-tab 2025-06-20 16:48:50 +05:30
Adish M
3bb1fbd2a6
Feature: Automation for auto-merge submodule PRs after base PR merges to main (#13057) 2025-06-20 16:01:40 +05:30
johnsoncherian
dafff86b36 chore: update submodule references 2025-06-20 15:53:50 +05:30
Johnson Cherian
8844f4fdab
Merge branch 'main' into fix/hide-modules-tab 2025-06-20 15:52:28 +05:30
Kavin Venkatachalam
0e618973d8 chore: version bump 2025-06-20 15:44:56 +05:30
Kavin Venkatachalam
db90254bda fix: disabled create modules button on dashboard if the license is invalid 2025-06-20 15:01:32 +05:30
Midhun G S
2c146ad3e8
fix for plugin scripts (#13055) 2025-06-20 14:30:52 +05:30
johnsoncherian
4f11d42b69 chore: remove theme settings from vscode settings 2025-06-20 13:41:47 +05:30
Adish M
9aa9675b60
Adding Cloud plugin scripts (#12995) 2025-06-20 12:59:17 +05:30
Rohan Lahori
3aa1960eec
migration fix (#13053) 2025-06-20 11:02:01 +05:30
Kavin Venkatachalam
150e1738b3 chore: updated the submodules 2025-06-19 20:51:44 +05:30
Kavin Venkatachalam
843e6cee19 fix: created a separate component to render the module tab on the rightsidebar 2025-06-19 20:47:28 +05:30
Johnson Cherian
917b80fe65
Merge pull request #12997 from ToolJet/appbuilder/sprint-13
Appbuilder/sprint 13
2025-06-19 18:33:18 +05:30
johnsoncherian
a5750f2942 chore: update submodule references 2025-06-19 17:43:33 +05:30
johnsoncherian
11d58c4a89 Merge branch 'main' into appbuilder/sprint-13 2025-06-19 16:42:49 +05:30
ajith-k-v
6bef66ba63 Platform cypress fix 2025-06-19 15:33:43 +05:30
Muhsin Shah C P
2d3f05ef39
Instance level OIDC common file changes (#12925)
* Working on data-migration

* Added entity file

* Changing login-configs service functions

* Changed some column names

* Fixed updating and creating sso-configs

* Changed the configs update and get apis & Worked on designs

* Added frontend & server files

* Working on oidc service

* Fixed instance signup case

* Fixed extra botton border  issue

* Fixed table updation issues

* Added frontend and backend files

* Added frontend commit file

* Refactor role assignment condition in AuthUtilService

* Update subproject commit reference in server/ee

* Update subproject commit reference in server/ee

* Fixed: no-permissioned group sync issues

* Fixed: migrations

* Fixed: editing the entity file

* Fixed: migration null check

* Updated subproject commit reference in server/ee

* Updated subproject commit reference in server/ee
2025-06-19 14:37:45 +05:30
ajith-k-v
6f67da0d7b Platform cypress fix 2025-06-19 14:08:29 +05:30
johnsoncherian
3070a1387c chore: version bumped to 3.15.0 2025-06-19 09:56:01 +05:30
johnsoncherian
e247114fb1 refactor: format style files to match sass guidelines 2025-06-19 09:24:27 +05:30
johnsoncherian
c28a122cd6 chore: minor alignment in styles file 2025-06-19 08:31:31 +05:30
johnsoncherian
1b56df6a7b Merge branch 'main' into appbuilder/sprint-13 2025-06-19 08:03:25 +05:30
Adish M
d2b8220ab5
fix node version in the preview dockerfile (#13043)
* fix node version in the preview dockerfile

* extra whitespace
2025-06-18 22:30:22 +05:30
Rohan Lahori
81527b91e7
Migration fixes pre-release (#13039)
* migration fix

* migration fix

---------

Co-authored-by: Midhun G S <gsmithun4@gmail.com>
2025-06-18 14:21:06 +05:30
Muhsin Shah C P
957b1513af
refactor: update signIn method signature in ISamlService interface (#13036) 2025-06-18 13:09:06 +05:30
Midhun G S
175345479a
Node upgrade 18->22 (#12836)
* node upgrade initial commit

* Removed node-saas and added saas. Fixed the CSS warnings from saas

* add node version 22 to dockerfile and AMI setup script

* change the base image to debian 12

* Update the node version (#12860)

* correction in builder image

* Update ce-production.Dockerfile

* upgrade node to 22.15.1

* server package lock

* package upgrade

* package upgrade

* base directory package upgrade

* revert sentry package upgrade

* fix

* added copy files

* fix dockerfile for copywrite package issue

* removed copy files package

* fix dockerfile for copywrite package issue

---------

Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>
Co-authored-by: Adish M <adish.madhu@gmail.com>
Co-authored-by: Ajith KV <ajith.jaban@gmail.com>
Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>
Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
2025-06-17 13:01:46 +05:30
Rohan Lahori
643049d10d
remove re-rendering on workspace creation (#13021) 2025-06-17 12:16:05 +05:30
johnsoncherian
7eb1446a98 fix: added missing dependancies in modules module 2025-06-17 10:52:32 +05:30
johnsoncherian
beb224eb1d Merge branch 'main' into appbuilder/sprint-13 2025-06-17 10:10:05 +05:30
devanshu052000
9cc59c1bb3 Merge branch 'feat/query-permissions' into feat/component-permissions 2025-06-13 15:51:00 +05:30
emidhun
cd71b52c42 Temp avoiding appbuilder automation 2025-06-13 11:11:02 +05:30
devanshu052000
3e46322758 Update submodule reference 2025-06-12 21:49:12 +05:30
devanshu052000
91a78c5eb9 Added missing modules change 2025-06-12 19:34:33 +05:30
devanshu052000
7f249aeb13 Merge branch 'appbuilder/sprint-14' into feat/query-permissions 2025-06-12 19:33:42 +05:30
devanshu052000
e3a22fe36d Merged sprint-14 branch in ee-server submodule 2025-06-12 18:06:54 +05:30
devanshu052000
86f0c1808c Changed error message and description 2025-06-12 17:34:27 +05:30