• Joined on 2025-07-25
kjs deleted branch ipadress from kjs/ERP-node 2025-09-22 18:34:58 +09:00
kjs deleted branch multilang from kjs/ERP-node 2025-09-22 18:34:58 +09:00
kjs deleted branch admin/layout from kjs/ERP-node 2025-09-22 18:34:57 +09:00
kjs deleted branch commonCodeMng from kjs/ERP-node 2025-09-22 18:34:57 +09:00
kjs deleted branch commonComponent from kjs/ERP-node 2025-09-22 18:34:57 +09:00
kjs deleted branch dataflowMng from kjs/ERP-node 2025-09-22 18:34:57 +09:00
kjs deleted branch docker from kjs/ERP-node 2025-09-22 18:34:57 +09:00
kjs pushed to main at kjs/ERP-node 2025-09-22 18:28:33 +09:00
cc4398afbf Merge pull request 'dev' (#47) from dev into main
3556f55986 Merge branch 'main' into dev
d7c512772e 도커 db설정
0e2889afc1 Resolve merge conflict: Keep working multilangController.ts version
7fa6fd6093 Fix: Restore multilangController.ts with all required exports
Compare 5 commits »
kjs merged pull request kjs/ERP-node#47 2025-09-22 18:28:32 +09:00
dev
kjs pushed to dev at kjs/ERP-node 2025-09-22 18:28:14 +09:00
3556f55986 Merge branch 'main' into dev
6c0e0db897 Merge pull request 'dev' (#46) from dev into main
Compare 2 commits »
kjs created pull request kjs/ERP-node#47 2025-09-22 18:28:09 +09:00
dev
kjs pushed to dev at kjs/ERP-node 2025-09-22 18:27:53 +09:00
d7c512772e 도커 db설정
kjs pushed to dev at kjs/ERP-node 2025-09-22 18:24:58 +09:00
0e2889afc1 Resolve merge conflict: Keep working multilangController.ts version
7fa6fd6093 Fix: Restore multilangController.ts with all required exports
Compare 2 commits »
kjs pushed to main at kjs/ERP-node 2025-09-22 18:17:25 +09:00
6c0e0db897 Merge pull request 'dev' (#46) from dev into main
0031291828 Merge branch 'main' into dev
c78f152f68 Resolve merge conflicts: Use main branch versions for conflicting files
e7f9320a78 Merge pull request 'feature connection' (#45) from feature/connection into dev
1ae16bb690 feature connection
Compare 345 commits »
kjs merged pull request kjs/ERP-node#46 2025-09-22 18:17:24 +09:00
dev
kjs pushed to dev at kjs/ERP-node 2025-09-22 18:17:09 +09:00
0031291828 Merge branch 'main' into dev
26ede5830c 윈도우용 실행파일 커밋
Compare 2 commits »
kjs pushed to dev at kjs/ERP-node 2025-09-22 18:16:30 +09:00
c78f152f68 Resolve merge conflicts: Use main branch versions for conflicting files
kjs created pull request kjs/ERP-node#46 2025-09-22 18:08:42 +09:00
dev
kjs pushed to feature/screen-management at kjs/ERP-node 2025-09-22 17:36:47 +09:00
474cc33aee Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
e7f9320a78 Merge pull request 'feature connection' (#45) from feature/connection into dev
1ae16bb690 feature connection
Compare 3 commits »
kjs pushed to feature/screen-management at kjs/ERP-node 2025-09-22 17:36:18 +09:00
1436c908a6 Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
3a96f9dc81 Merge pull request 'external-connections' (#44) from external-connections into dev
0bad11686e web_type에 따른 input 변화 구현
c3cb1a0033 entity 수정
28bd0d55cd Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into external-connections
Compare 12 commits »