dohyeons
51a4d830f4
Merge remote-tracking branch 'upstream/main'
2025-10-20 18:30:04 +09:00
dohyeons
c3064ac01f
fix: syntax 지시문 제거
2025-10-20 18:29:24 +09:00
dohyeons
a3a28fe06c
Merge remote-tracking branch 'upstream/main'
2025-10-20 18:27:53 +09:00
dohyeons
74487b5455
chore: Docker Hub 장애 우회 - WACE Docker Registry 사용
2025-10-20 18:26:57 +09:00
dohyeons
3682cc0ef7
Merge remote-tracking branch 'upstream/main'
2025-10-20 18:15:19 +09:00
dohyeons
70f6093fb5
도커파일 원상복구
2025-10-20 18:08:03 +09:00
dohyeons
7e0f08388c
원상복구
2025-10-20 18:04:30 +09:00
dohyeons
8af1d2abad
Merge remote-tracking branch 'upstream/main'
2025-10-20 17:59:10 +09:00
dohyeons
7b3b856476
503에러 우회 수정
2025-10-20 17:58:56 +09:00
dohyeons
e7ee49e039
Merge remote-tracking branch 'upstream/main'
2025-10-20 17:54:59 +09:00
dohyeons
1d8d90e5c6
Docker Hub에 의존하지 않고 로컬 Docker 데몬의 기본 빌더를 사용
2025-10-20 17:54:42 +09:00
dohyeons
1e99c311fb
Merge remote-tracking branch 'upstream/main'
2025-10-20 17:52:25 +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
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
leeheejin
86135dcf10
대시보드관리디벨롭
2025-10-20 17:42:35 +09:00
dohyeons
ab48e93487
Merge remote-tracking branch 'upstream/main'
2025-10-20 17:29:45 +09:00
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
dohyeons
bb1ab5d192
대시보드 뷰어에서 화면 너비 설정
2025-10-20 17:02:19 +09:00
dohyeons
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
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
leeheejin
40e9958690
덜된듯
2025-10-20 15:53:08 +09:00
kjs
7d8abc0449
플로우 분기처리 구현
2025-10-20 15:53:00 +09:00
leeheejin
7ceecd15af
투두리스트랑 커스텀통계카드
2025-10-20 15:52:22 +09:00
dohyeons
3eac709478
리스트 위젯, 차트, 뷰어 수정사항 반영
2025-10-20 15:43:17 +09:00
dohyeons
84994a30e8
차트 컴포넌트 수정
2025-10-20 15:01:32 +09:00
dohyeons
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
leeheejin
652aa1e9b0
fix: TransportStatsWidget 타입 오류 수정 (connectionId -> externalConnectionId)
2025-10-20 14:15:06 +09:00
leeheejin
b711680a3c
Merge branch 'lhj'
2025-10-20 14:14:08 +09:00
leeheejin
5b503edfa8
작업 이력 통계 위젯 추가
...
백스페이스 안먹는 오류 수정
그리드 컴포넌트 수정
등등
2025-10-20 14:07:08 +09:00
dohyeons
f16f75c083
야드 레이아웃 이름 변경 구현
2025-10-20 12:29:47 +09:00
dohyeons
821be53b19
야드3D 요소 삭제 시 Dialog를 사용
2025-10-20 12:07:07 +09:00
leeheejin
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
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
dohyeons
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
leeheejin
ff58c84ac0
오류난것들 해결 완료
2025-10-20 11:52:23 +09:00
dohyeons
49669b37e5
야드관리용 설정 모달 생성
2025-10-20 11:39:50 +09:00
dohyeons
cd893c2fa3
alert를 Dialog 로 변경
2025-10-20 11:30:09 +09:00
dohyeons
c5a4b0b10c
저장 버튼을 누르기 전 저장 x
2025-10-20 11:26:50 +09:00
dohyeons
e2d99aef40
quantity 타입 문제 해결
2025-10-20 11:07:58 +09:00
dohyeons
f6848df87a
3D 요소가 그리드보다 아래에 렌더링되는 문제 해결
2025-10-20 10:57:52 +09:00
kjs
de9491aa29
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-20 10:56:23 +09:00
kjs
f9c171c513
플로우 구현
2025-10-20 10:55:33 +09:00
66a8196411
Merge pull request '야드관리' ( #108 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/108
2025-10-20 10:53:20 +09:00
dohyeons
755da0d1bf
파일 에러 해결
2025-10-20 10:34:20 +09:00
dohyeons
f1f282bb34
야드 레이아웃 삭제 기능 구현
2025-10-20 10:27:01 +09:00
dohyeons
0217393cb8
저장 시 위치가 바뀌는 문제 해결
2025-10-20 10:12:23 +09:00
dohyeons
ab07908f09
요소 추가 버튼 시 api 호출 삭제
2025-10-20 10:06:17 +09:00
dohyeons
aba6283e3f
3D의 데이터 바인딩 재설계를 완료
2025-10-20 09:58:51 +09:00
