kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
ERP-node/frontend/components
History
SeongHyun Kim 224338d75f Merge branch 'ksh-v2-work' into main 
POP 디자이너 GRID-V6 + BLOCK DETAIL Phase 2~3 + 낙관적 잠금 기능을 main에 통합한다.
주요 병합 내용:
- GRID-V6 정사각형 블록 그리드 시스템 (842ac27d)
- POP 그리드 명칭 통일 + Dead Code 제거 (320100c4)
- BLOCK DETAIL Phase 2: 생산 공정 백엔드 API (create-work-processes, timer)
- BLOCK DETAIL Phase 3: pop-work-detail 컴포넌트 + 모달 캔버스 시스템
- 낙관적 잠금 + 소유자 기반 액션 제어 + 디자이너 설정 UI
- LOCK-OWNER 카드 비활성화 UI 보완
충돌 해결: 0건 (자동 병합 완료)
 		2026-03-16 10:37:31 +09:00
..
admin Merge branch 'ksh-v2-work' into main 2026-03-12 09:00:52 +09:00
animations 메일 관리 작업 저장용 커밋 2025-10-01 16:15:53 +09:00
approval Enhance approval process by adding after approval flow ID to templates and implementing user selection via Combobox in the Approval Request Modal. 2026-03-07 03:02:36 +09:00
auth Merge branch 'ksh-v2-work' into main 2026-03-12 09:00:52 +09:00
barcode Merge branch 'gbpark-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node 2026-03-11 12:23:52 +09:00
common Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node 2026-03-12 14:23:34 +09:00
dashboard [agent-pipeline] pipe-20260309055714-23ry round-3 2026-03-09 17:18:45 +09:00
dataflow [agent-pipeline] pipe-20260309122600-xzeg round-1 2026-03-09 22:07:11 +09:00
examples refactor: 전체 프론트엔드 하드코딩 색상 → CSS 변수 일괄 치환 2026-03-09 14:31:59 +09:00
flow refactor: 전체 프론트엔드 하드코딩 색상 → CSS 변수 일괄 치환 2026-03-09 14:31:59 +09:00
layout Merge branch 'ksh-v2-work' into main 2026-03-12 09:00:52 +09:00
mail [agent-pipeline] pipe-20260309055714-23ry round-1 2026-03-09 15:51:42 +09:00
multilang 모달 크기 고정 2025-12-05 10:46:10 +09:00
numbering-rule Merge branch 'gbpark-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node 2026-03-11 12:23:52 +09:00
pop feat: BLOCK DETAIL Phase 3 - pop-work-detail 컴포넌트 + 모달 캔버스 시스템 2026-03-16 10:32:58 +09:00
providers [agent-pipeline] pipe-20260310020928-52l9 round-1 2026-03-10 11:17:23 +09:00
report refactor: 전체 프론트엔드 하드코딩 색상 → CSS 변수 일괄 치환 2026-03-09 14:31:59 +09:00
screen chore: update .gitignore and remove unused images 2026-03-13 14:57:07 +09:00
screen-embedding [agent-pipeline] pipe-20260310142919-l9ae round-2 2026-03-11 00:12:03 +09:00
table-category docs: Add documentation for category tree modal updates with continuous registration mode 2026-03-11 14:44:34 +09:00
tax-invoice [agent-pipeline] pipe-20260309055714-23ry round-3 2026-03-09 17:18:45 +09:00
theme refactor: 전체 프론트엔드 하드코딩 색상 → CSS 변수 일괄 치환 2026-03-09 14:31:59 +09:00
ui Merge branch 'gbpark-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node 2026-03-11 12:23:52 +09:00
unified docs: Add documentation for category dropdown depth separation 2026-03-11 15:53:01 +09:00
v2 docs: update full-screen analysis and V2 component usage guide 2026-03-13 15:02:06 +09:00
vehicle refactor: 전체 프론트엔드 하드코딩 색상 → CSS 변수 일괄 치환 2026-03-09 14:31:59 +09:00
webtypes Merge branch 'gbpark-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node 2026-03-11 12:23:52 +09:00
GlobalFileViewer.tsx refactor: 전체 프론트엔드 하드코딩 색상 → CSS 변수 일괄 치환 2026-03-09 14:31:59 +09:00