Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• dbb049cb28 Merge pull request '버튼에 제어 달기' (#71) from feature/screen-management into main kjs 2025-09-29 15:21:48 +09:00
• 62cb06c7d9 Merge branch 'main' into feature/screen-management kjs 2025-09-29 15:21:42 +09:00
• 3c26f24179 버튼에 제어 달기 kjs 2025-09-29 15:21:14 +09:00
• 9dfd0cb40f Merge branch 'main' into feature/batch-testing-updates hjjeong 2025-09-29 14:17:22 +09:00
• 9680991962 feat: 배치 관리 시스템 테스트 및 업데이트 기능 개선 hjjeong 2025-09-29 13:48:59 +09:00
• 43d8676f09 Merge pull request 'feature/screen-management' (#66) from feature/screen-management into main kjs 2025-09-29 13:39:55 +09:00
• e057c4d960 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2025-09-29 13:37:35 +09:00
• bff7416cd1 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj leeheejin 2025-09-29 13:33:24 +09:00
• 0fca8cd90b get요청 db 저장기능 kjs 2025-09-29 13:32:59 +09:00
• e0143e9cba 문서뷰어기능구현 leeheejin 2025-09-29 13:29:03 +09:00
• c9afdec09f restapi 버튼 동작 kjs 2025-09-29 12:17:10 +09:00
• cedb5e3ec3 에러 수정 kjs 2025-09-29 10:23:21 +09:00
• 2448f26bc3 Merge branch 'feature/rest-api-integration' of http://39.117.244.52:3000/kjs/ERP-node hjjeong 2025-09-26 20:04:07 +09:00
• cdd345a777 에러수정2 hjjeong 2025-09-26 18:51:27 +09:00
• 52d1e0acad 주의 hjjeong 2025-09-26 17:55:38 +09:00
• e0777d0fc3 데이터 매핑 설정 중간커밋 kjs 2025-09-26 17:52:11 +09:00
• 3333429928 배치관리시스템 (DB, RestAPI) hjjeong 2025-09-26 17:29:20 +09:00
• bf7fc6cfb8 에러수정 kjs 2025-09-26 17:24:59 +09:00
• 9de0b4158c Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-26 17:17:53 +09:00
• f59fcb56b0 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-26 17:17:03 +09:00
• 58248db457 Merge pull request 'dev' (#68) from dev into main hjlee 2025-09-26 17:13:16 +09:00
• 5876f80265 Merge pull request 'lhj' (#67) from lhj into dev hjlee 2025-09-26 17:12:59 +09:00
• 3600621554 화면관리 쪽 파일첨부 수정 leeheejin 2025-09-26 17:12:03 +09:00
• 11b71b788a 외부호출 기능(rest API) kjs 2025-09-26 17:11:18 +09:00
• 9454e3a81f 제어관리 데이터 저장기능 kjs 2025-09-26 13:52:32 +09:00
• 1fe401c7d6 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj leeheejin 2025-09-26 13:11:44 +09:00
• ee7c8e989e 파일 업로드 기능 구현 및 상세설정 연동 leeheejin 2025-09-26 13:11:34 +09:00
• 2a4e379dc4 제어관리 외부커넥션 설정기능 kjs 2025-09-26 01:28:51 +09:00
• ddd191b87b Merge pull request 'dev' (#65) from dev into main hjlee 2025-09-25 18:57:35 +09:00
• 74fdaea4ac Merge pull request 'lhj' (#64) from lhj into dev hjlee 2025-09-25 18:56:44 +09:00
• c28e27f3e8 화면관리의 테이블 리스트, 카드 디스플레이 수정 leeheejin 2025-09-25 18:54:25 +09:00
• d69feef9da 화면관리의 테이블 리스트, 카드 디스플레이 수정 leeheejin 2025-09-25 18:54:12 +09:00
• a06f41dbdb Merge pull request 'dev' (#63) from dev into main hjlee 2025-09-25 16:23:18 +09:00
• ecac852d7a Merge pull request '콘솔 주석처리, 화면관리쪽 컬럼수, 페이지네이션 수정' (#62) from lhj into dev hjlee 2025-09-25 16:22:40 +09:00
• 28485d6e5c 콘솔 주석처리, 화면관리쪽 컬럼수, 페이지네이션 수정 leeheejin 2025-09-25 16:22:02 +09:00
• c0414abaa0 Merge pull request 'dev' (#61) from dev into main hjlee 2025-09-25 14:32:43 +09:00
• 1977e73c80 Merge pull request 'lhj' (#60) from lhj into dev hjlee 2025-09-25 14:31:58 +09:00
• 5921a84581 fix: 배치 관리 시스템 Oracle/MariaDB 커넥터 추가 및 timestamp 타입 변환 오류 수정 hjjeong 2025-09-25 14:25:18 +09:00
• cd84d9033c uiux 개선 leeheejin 2025-09-25 14:22:30 +09:00
• 1a59c0cf04 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2025-09-25 13:26:27 +09:00
• 949aab0b73 feat: 배치 관리 시스템 구현 hjjeong 2025-09-25 11:04:16 +09:00
• dd902cafab 백엔드 에러수정 kjs 2025-09-25 11:04:02 +09:00
• 0d46bc540c 타입스크립트 에러수정 kjs 2025-09-25 10:13:43 +09:00
• 7b84102cd9 도커설정 kjs 2025-09-25 09:53:23 +09:00
• 25ecfa13d2 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-25 09:37:25 +09:00
• d7ac8113ba 도커설정 kjs 2025-09-25 09:37:24 +09:00
• acfe282dae Merge pull request 'feature/screen-management' (#59) from feature/screen-management into main kjs 2025-09-25 09:32:39 +09:00
• 623a76080a Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2025-09-25 09:32:11 +09:00
• cb0058cd37 Merge pull request 'dev' (#58) from dev into main hjlee 2025-09-25 09:31:48 +09:00
• 026e79688a 도커설정 kjs 2025-09-25 09:31:44 +09:00
• 93a11fdbf3 Merge pull request 'lhj' (#57) from lhj into dev hjlee 2025-09-25 09:30:59 +09:00
• e3cd6dc3a0 UI/UX 개선: 사이드바 레이아웃 안정화 및 메뉴 hover 효과 개선 leeheejin 2025-09-25 09:29:56 +09:00
• b41e645c74 제어관리 외부 커넥션 설정기능 kjs 2025-09-24 18:23:57 +09:00
• 1a60177fe4 feat: 관리자 페이지 레이아웃 통일 및 JSX 구문 수정 leeheejin 2025-09-24 18:07:36 +09:00
• 3c839a56bf Merge pull request 'feature/screen-management' (#56) from feature/screen-management into main kjs 2025-09-24 15:03:15 +09:00
• 0d9ee4c40f 테이블 컬럼 표시문제 수정 kjs 2025-09-24 15:02:54 +09:00
• 649ed5c6d7 조인컬럼수정(조인 컬럼 추가시 엔티티 타입 표시 오류) kjs 2025-09-24 14:31:46 +09:00
• 86dc961968 조인컬럼 오류 kjs 2025-09-24 12:56:22 +09:00
• d52d6c129b Merge pull request 'feature/screen-management' (#55) from feature/screen-management into main kjs 2025-09-24 10:50:18 +09:00
• d5b63d1c9b Merge branch 'main' into feature/screen-management kjs 2025-09-24 10:50:09 +09:00
• 4abf5b31c0 배치관리 중간커밋 hjjeong 2025-09-24 10:46:55 +09:00
• e75889a127 조인 컬럼 문제 수정 kjs 2025-09-24 10:33:54 +09:00
• 4b148ee823 Merge pull request 'dev' (#54) from dev into main hjlee 2025-09-24 10:31:51 +09:00
• bb642cab04 Merge pull request '데이터베이스 틀린 비밀번호 입력시 연결거부처리' (#53) from lhj into dev hjlee 2025-09-24 10:31:28 +09:00
• 4efec8d758 데이터베이스 틀린 비밀번호 입력시 연결거부처리 leeheejin 2025-09-24 10:30:36 +09:00
• db08d9e6b9 Merge pull request 'dev' (#52) from dev into main hjlee 2025-09-24 10:06:35 +09:00
• 192982a556 Merge pull request '외부커넥션관리' (#51) from lhj into dev hjlee 2025-09-24 10:05:45 +09:00
• bc6e6056c1 외부커넥션관리 leeheejin 2025-09-24 10:04:25 +09:00
• a757034d86 엔티티타입 표시방식 변경 kjs 2025-09-23 17:43:24 +09:00
• 28109eb63b fix: 엔티티 컬럼 조인 테이블 정보 자동 가져오기 기능 추가 kjs 2025-09-23 17:11:07 +09:00
• 4c5e0330ef fix: TableListConfigPanel API 호출 수정 및 엔티티 컬럼 참조 테이블 로깅 추가 kjs 2025-09-23 17:08:52 +09:00
• ad7f350f00 fix: API 클라이언트 설정 원복 및 빈 테이블명 API 호출 방지 kjs 2025-09-23 17:06:23 +09:00
• f01be49f6a fix: TableListConfigPanel에서 컬럼 검색 필드명 수정 kjs 2025-09-23 16:59:12 +09:00
• 9d346a3d3a fix: 엔티티 컬럼 표시 설정 문제 해결 kjs 2025-09-23 16:51:12 +09:00
• de6c7a8008 feat: 엔티티 타입 컬럼 표시 설정을 화면 편집기로 이동 kjs 2025-09-23 16:23:36 +09:00
• 51a1d4572c Merge pull request 'lhj' (#50) from lhj into dev hjlee 2025-09-23 16:07:58 +09:00
• affb6899cc 수정할때 비밀번호 틀리면 연결안되게 leeheejin 2025-09-23 16:05:30 +09:00
• 4aefb5be6a 엔티티 타입 다중 표시 컬럼 기능 구현 kjs 2025-09-23 15:58:54 +09:00
• d9270e6307 Merge pull request 'feature/screen-management' (#49) from feature/screen-management into main kjs 2025-09-23 15:38:41 +09:00
• 699efd25a2 Merge origin/dev - 충돌 해결 kjs 2025-09-23 15:36:03 +09:00
• f15c1fa114 검색필터 수정사항 kjs 2025-09-23 15:31:27 +09:00
• c557fc5d56 전체 화면 영역 배경색을 흰색으로 통일 kjs 2025-09-23 15:30:02 +09:00
• f0a9c50ca1 ResponsiveScreenContainer 컨테이너 완전 제거 kjs 2025-09-23 15:25:55 +09:00
• 1f67576d5d 화면 자동맞춤 기능 제거 및 전체 화면 표시 개선 kjs 2025-09-23 15:21:50 +09:00
• da9985cd24 검색 필터기능 수정사항 kjs 2025-09-23 14:26:18 +09:00
• 7297db1730 Merge pull request 'lhj' (#48) from lhj into dev hjlee 2025-09-23 12:37:28 +09:00
• 3083ffc0a3 외부커넥션관리 수정시 연결테스트 문제 해결과 프론트 약간 수정한 내용 leeheejin 2025-09-23 12:34:34 +09:00
• f160a33b94 스크롤 기능 포함 leeheejin 2025-09-23 10:45:53 +09:00
• e653effac0 테이블 추가기능 수정사항 kjs 2025-09-23 10:40:21 +09:00
• 37ded5a543 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-23 09:27:15 +09:00
• 2d83bf9329 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-22 18:29:03 +09:00
• cc4398afbf Merge pull request 'dev' (#47) from dev into main kjs 2025-09-22 18:28:31 +09:00
• 3556f55986 Merge branch 'main' into dev kjs 2025-09-22 18:28:12 +09:00
• d7c512772e 도커 db설정 kjs 2025-09-22 18:27:50 +09:00
• 0e2889afc1 Resolve merge conflict: Keep working multilangController.ts version kjs 2025-09-22 18:24:51 +09:00
• 7fa6fd6093 Fix: Restore multilangController.ts with all required exports kjs 2025-09-22 18:24:21 +09:00
• 0257254036 Fix: Restore multilangController.ts with all required exports kjs 2025-09-22 18:24:00 +09:00
• 6c0e0db897 Merge pull request 'dev' (#46) from dev into main kjs 2025-09-22 18:17:23 +09:00
• 0031291828 Merge branch 'main' into dev kjs 2025-09-22 18:17:07 +09:00
• c78f152f68 Resolve merge conflicts: Use main branch versions for conflicting files kjs 2025-09-22 18:16:24 +09:00