DDD1542 b22feca8b5 Merge branch 'jskim-node' of origin into jskim-node ...

Resolve conflict in AppLayout.tsx - keep both sidebar collapse and hasPopMenus state

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-04-09 11:14:00 +09:00

..

AdminButton.tsx

각 회사별 데이터 분리

2025-10-27 16:40:59 +09:00

AdminPageRenderer.tsx

feat: Update smart factory log scheduling and enhance item info page

2026-04-08 10:41:32 +09:00

AppLayout.tsx

Merge branch 'jskim-node' of origin into jskim-node

2026-04-09 11:14:00 +09:00

EmptyDashboard.tsx

feat: Add Zustand for state management and enhance modal handling

2026-02-27 14:25:53 +09:00

Logo.tsx

화면관리 쪽 파일첨부 수정

2025-09-26 17:12:03 +09:00

MainHeader.tsx

feat(pop): PC <-> POP 모드 전환 네비게이션 + POP 기본 화면(Landing) 기능

2026-03-09 12:16:26 +09:00

MainSidebar.tsx

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

MobileMenu.tsx

최초커밋

2025-08-21 09:41:46 +09:00

ProfileModal.tsx

refactor: 전체 프론트엔드 하드코딩 색상 → CSS 변수 일괄 치환

2026-03-09 14:31:59 +09:00

SideMenu.tsx

최초커밋

2025-08-21 09:41:46 +09:00

TabBar.tsx

11

2026-03-17 21:50:37 +09:00

TabContent.tsx

Merge branch 'jskim-node' of http://39.117.244.52:3000/kjs/ERP-node into mhkim-node

2026-03-12 01:18:18 +09:00

ThemeToggle.tsx

[agent-pipeline] pipe-20260310020928-52l9 round-2

2026-03-10 11:22:37 +09:00

UserDropdown.tsx

Merge branch 'ksh-function-stabilization' into ksh-v2-work

2026-03-09 15:36:53 +09:00