dohyeons
|
b01e241a44
|
Merge remote-tracking branch 'upstream/main'
|
2025-10-30 15:06:56 +09:00 |
 kjs
|
58e1aec262
|
Merge pull request 'feature/screen-management' (#169) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/169
|
2025-10-30 14:39:45 +09:00 |
|
kjs
|
0e9e5f29cf
|
충돌 해결
|
2025-10-30 14:39:17 +09:00 |
|
kjs
|
dea88dd42b
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
|
2025-10-30 12:10:43 +09:00 |
|
dohyeons
|
444b2fab2b
|
개발서버 도커 컴포즈 수정
|
2025-10-30 12:09:22 +09:00 |
|
kjs
|
4d9e783c57
|
수정 모달
|
2025-10-30 12:08:58 +09:00 |
|
kjs
|
556354219a
|
스타일 수정중
|
2025-10-30 12:03:50 +09:00 |
 hyeonsu
|
c0860359e5
|
Merge pull request '대시보드 기타 수정' (#167) from feat/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/167
|
2025-10-30 11:34:13 +09:00 |
|
dohyeons
|
8c6aeb006b
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
|
2025-10-30 11:29:58 +09:00 |
|
dohyeons
|
382b75c87b
|
대시보드 페이지에 서버사이드렌더링 적용
|
2025-10-30 11:29:46 +09:00 |
|
dohyeons
|
234f82b944
|
/dashboard 최적화 진행
|
2025-10-30 10:07:44 +09:00 |
|
dohyeons
|
8f38b176ab
|
Shadcn 사용 수정
|
2025-10-30 10:06:45 +09:00 |
|
dohyeons
|
2959f66e0c
|
안쓰는 코드 삭제
|
2025-10-29 18:30:50 +09:00 |
 hjlee
|
ec3e74706c
|
Merge pull request '쿼리문 작성 좀 완화시킨 버전' (#166) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/166
|
2025-10-29 18:26:20 +09:00 |
leeheejin
|
efa28d8a47
|
쿼리문 작성 좀 완화시킨 버전
|
2025-10-29 18:26:06 +09:00 |
|
hjlee
|
c6a51279d6
|
Merge pull request '나머지 위젯들도 샤드시옌처리(주석처리된 위젯)' (#165) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/165
|
2025-10-29 18:04:47 +09:00 |
|
leeheejin
|
865831e41e
|
나머지 위젯들도 샤드시옌처리(주석처리된 위젯)
|
2025-10-29 18:04:27 +09:00 |
|
hjlee
|
1c1a8633ae
|
Merge pull request '샤드시옌으로 쫙 수정' (#164) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/164
|
2025-10-29 17:53:35 +09:00 |
|
leeheejin
|
437e0c331c
|
샤드시옌으로 쫙 수정
|
2025-10-29 17:53:03 +09:00 |
|
hjlee
|
c5b0d35885
|
Merge pull request 'lhj' (#163) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/163
|
2025-10-29 16:58:13 +09:00 |
|
leeheejin
|
2517261db9
|
대시보드 다운로드 기능 추가
|
2025-10-29 16:57:38 +09:00 |
|
kjs
|
244f04a199
|
등록자랑 회사코드 자동으로 들어가도록 수정
|
2025-10-29 16:06:01 +09:00 |
|
dohyeons
|
9a7b5603df
|
Merge remote-tracking branch 'upstream/main'
|
2025-10-29 16:02:08 +09:00 |
|
dohyeons
|
9a3cc2cc93
|
배포용 도커 컴포즈 파일 수정
|
2025-10-29 16:01:41 +09:00 |
|
leeheejin
|
398c47618b
|
fix: 테스트 위젯 최종 수정 및 충돌 해결
|
2025-10-29 13:50:08 +09:00 |
|
dohyeons
|
4025695b86
|
Merge remote-tracking branch 'upstream/main'
|
2025-10-29 11:52:51 +09:00 |
|
dohyeons
|
8edd5e4ca6
|
api 오류 수정
|
2025-10-29 11:52:18 +09:00 |
|
kjs
|
f7e03792f6
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
|
2025-10-29 11:35:06 +09:00 |
|
kjs
|
5c8a913698
|
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
|
2025-10-29 11:34:57 +09:00 |
|
dohyeons
|
e5b6672c2d
|
Merge remote-tracking branch 'upstream/main'
|
2025-10-29 11:34:13 +09:00 |
|
dohyeons
|
545e8659ae
|
Merge remote-tracking branch 'upstream/main'
|
2025-10-29 11:33:58 +09:00 |
|
dohyeons
|
f62af9077a
|
빌드에러해결
|
2025-10-29 11:33:46 +09:00 |
|
dohyeons
|
1510ad1f3f
|
Merge remote-tracking branch 'upstream/main'
|
2025-10-29 11:29:46 +09:00 |
|
kjs
|
44023d4ff6
|
Merge pull request 'feature/screen-management' (#162) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/162
|
2025-10-29 11:26:26 +09:00 |
|
kjs
|
0dab71edfe
|
Merge branch 'main' into feature/screen-management
|
2025-10-29 11:26:18 +09:00 |
|
kjs
|
efdef36cda
|
모달창 올리기
|
2025-10-29 11:26:00 +09:00 |
|
hjlee
|
ca2904dfc4
|
Merge pull request '쿼리문 덜복잡해도 작성되게 수정' (#161) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/161
|
2025-10-29 10:22:40 +09:00 |
|
leeheejin
|
ce508fb48a
|
쿼리문 덜복잡해도 작성되게 수정
|
2025-10-29 10:22:21 +09:00 |
|
hjlee
|
3371c4c954
|
Merge pull request '쿼리문 작성대로 보이도록 통계카드 수정' (#160) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/160
|
2025-10-29 10:07:50 +09:00 |
|
leeheejin
|
9bff4c77e3
|
쿼리문 작성대로 보이도록 통계카드 수정
|
2025-10-29 10:07:33 +09:00 |
|
hjlee
|
e826648778
|
Merge pull request 'lhj' (#159) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/159
|
2025-10-29 09:33:23 +09:00 |
|
leeheejin
|
3198684f27
|
구버전 위젯도 보이게
|
2025-10-29 09:32:10 +09:00 |
|
leeheejin
|
e880083600
|
구버전신버전 모두 보이게 처리완료
|
2025-10-29 09:32:03 +09:00 |
|
hjlee
|
eed28ba0a9
|
Merge pull request 'lhj' (#158) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/158
|
2025-10-29 09:22:06 +09:00 |
|
leeheejin
|
50aeacd9ea
|
차트를 제외하고 나머지 기능은 구현됨
|
2025-10-29 09:21:04 +09:00 |
|
leeheejin
|
d21764ba51
|
Merge: 충돌 해결 - CustomMetricWidget 실제 코드 유지
|
2025-10-28 19:00:24 +09:00 |
|
leeheejin
|
88d71da1a9
|
다중데이터베이스 연결 가능하게 함, 차트 위젯은 테스트 용도입니다.
|
2025-10-28 18:58:40 +09:00 |
|
dohyeons
|
f99765ea84
|
Merge remote-tracking branch 'upstream/main'
|
2025-10-28 18:58:02 +09:00 |
|
dohyeons
|
179bf418cc
|
Merge remote-tracking branch 'upstream/main'
|
2025-10-28 18:57:45 +09:00 |
|
hyeonsu
|
7a0fee15d4
|
Merge pull request '요소 클릭하면 카메라 시야 변경하도록 구현' (#157) from feat/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/157
|
2025-10-28 18:56:02 +09:00 |