0108a12b18
화면관리 외부 db 선택 기능 추가
2025-10-21 13:42:57 +09:00
kjs
641a171270
Merge pull request 'feature/screen-management' ( #117 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/117
2025-10-21 13:19:35 +09:00
kjs
0d96ea566b
플로우 외부연결 중간커밋
2025-10-21 13:19:18 +09:00
kjs
967f9a9f5b
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-21 13:18:39 +09:00
hyeonsu
45d00e10e7
Merge pull request '대시보드 뷰어에 반응형 적용' ( #116 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/116
2025-10-21 13:11:34 +09:00
f088a2d995
대시보드 뷰어 에러 해결
2025-10-21 13:10:03 +09:00
b30e3480d4
반응형 적용
2025-10-21 11:36:25 +09:00
hyeonsu
c6c56a1239
Merge pull request 'rest-api관리 페이지 구현' ( #115 ) from feat/rest-api into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/115
2025-10-21 11:08:11 +09:00
2263863456
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/rest-api
2025-10-21 11:06:30 +09:00
090cba09f1
rest api 관리 구현
2025-10-21 10:59:15 +09:00
kjs
efa2cbc538
메인 수정
2025-10-21 10:44:09 +09:00
hjlee
0937336453
Merge pull request 'lhj' ( #114 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/114
2025-10-21 10:06:31 +09:00
5fb9e19e5a
차트 범례 수정 완료
2025-10-21 10:05:39 +09:00
11729b2e26
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/rest-api
2025-10-21 09:52:04 +09:00
d6d179025d
ENCRYPTION_KEY 환경변수가 설정
2025-10-21 09:43:01 +09:00
be1bd6a40a
Alpine Linux 명령어로 수정
2025-10-21 09:34:34 +09:00
21688d3815
개발서버 수정사항 적용
2025-10-21 09:29:35 +09:00
c3064ac01f
fix: syntax 지시문 제거
2025-10-20 18:29:24 +09:00
74487b5455
chore: Docker Hub 장애 우회 - WACE Docker Registry 사용
2025-10-20 18:26:57 +09:00
kjs
6fc50cd315
저장 오류 수정
2025-10-20 18:23:15 +09:00
12e5d99339
Merge branch 'main' into lhj - Flow management system integration
2025-10-20 18:08:11 +09:00
70f6093fb5
도커파일 원상복구
2025-10-20 18:08:03 +09:00
1e3136cb0b
todo 오류 있던거 수정 이젠 디비꺼도 지워짐
2025-10-20 18:04:49 +09:00
7e0f08388c
원상복구
2025-10-20 18:04:30 +09:00
7b3b856476
503에러 우회 수정
2025-10-20 17:58:56 +09:00
1d8d90e5c6
Docker Hub에 의존하지 않고 로컬 Docker 데몬의 기본 빌더를 사용
2025-10-20 17:54:42 +09:00
kjs
d8ea7981fe
Merge pull request 'feature/screen-management' ( #113 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/113
2025-10-20 17:51:45 +09:00
kjs
876e3bfa05
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-20 17:51:36 +09:00
kjs
1f12df2f79
플로우 외부db연결
2025-10-20 17:50:27 +09:00
hjlee
54a559a309
Merge pull request '대시보드관리디벨롭' ( #112 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/112
2025-10-20 17:43:04 +09:00
86135dcf10
대시보드관리디벨롭
2025-10-20 17:42:35 +09:00
3b3067d067
rest api 관리 계획 md파일 생성
2025-10-20 17:24:41 +09:00
hyeonsu
72045df25a
Merge pull request '대시보드 수정사항 적용' ( #111 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/111
2025-10-20 17:02:56 +09:00
bb1ab5d192
대시보드 뷰어에서 화면 너비 설정
2025-10-20 17:02:19 +09:00
2e19b929ad
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-20 15:57:14 +09:00
hjlee
8eb2f21583
Merge pull request 'lhj' ( #110 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/110
2025-10-20 15:56:42 +09:00
40e9958690
덜된듯
2025-10-20 15:53:08 +09:00
kjs
7d8abc0449
플로우 분기처리 구현
2025-10-20 15:53:00 +09:00
7ceecd15af
투두리스트랑 커스텀통계카드
2025-10-20 15:52:22 +09:00
3eac709478
리스트 위젯, 차트, 뷰어 수정사항 반영
2025-10-20 15:43:17 +09:00
84994a30e8
차트 컴포넌트 수정
2025-10-20 15:01:32 +09:00
597b9b9a51
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-20 14:28:40 +09:00
652aa1e9b0
fix: TransportStatsWidget 타입 오류 수정 (connectionId -> externalConnectionId)
2025-10-20 14:15:06 +09:00
b711680a3c
Merge branch 'lhj'
2025-10-20 14:14:08 +09:00
5b503edfa8
작업 이력 통계 위젯 추가
...
백스페이스 안먹는 오류 수정
그리드 컴포넌트 수정
등등
2025-10-20 14:07:08 +09:00
f16f75c083
야드 레이아웃 이름 변경 구현
2025-10-20 12:29:47 +09:00
821be53b19
야드3D 요소 삭제 시 Dialog를 사용
2025-10-20 12:07:07 +09:00
2b7519519a
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj
...
; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
2025-10-20 11:57:06 +09:00
hyeonsu
16a1c459fc
Merge pull request '야드관리 수정' ( #109 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/109
2025-10-20 11:55:08 +09:00
dd9bfff056
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-20 11:55:00 +09:00
dohyeons
kjs
hyeonsu
hjlee
leeheejin