Commit Graph

Select branches

Hide Pull Requests

260120-jhj

add/레포트관리

barcode

common/feat/dashboard-map

dev

external-connections

feat/dashboard

feat/multilang

feat/rest-api

feat/screenDesinger

feat/screenMngConnection

feat/tableTypeMngHistFeat

feature/batch-management

feature/batch-testing-updates

feature/connection

feature/dashboard

feature/inbound-inventory-fix

feature/multi-agent-orchestrator

feature/prisma-to-raw-query-phase1-complete

feature/report

feature/rest-api-integration

feature/screen-management

feature/unified-components-renewal

feature/v2-renewal

feature/v2-unified-renewal

fix/429error

fix/commcode

fix/daejin-bugs

fix/error

fix/modalError

fix/profileImage

fix/split-panel-edit-group-records

gbpark-node

gbpark-node-test

jskim-node

ksh

ksh-v2-work

lhj

logi

logistream

main

regacy-del

reportMng

skw-pop-icon

ycshin-node

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#362

#363

#364

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• bf7fc6cfb8 에러수정 kjs 2025-09-26 17:24:59 +0900
• 9de0b4158c Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-26 17:17:53 +0900
• f59fcb56b0 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-26 17:17:03 +0900
• 58248db457 Merge pull request 'dev' (#68) from dev into main hjlee 2025-09-26 17:13:16 +0900
• 5876f80265 Merge pull request 'lhj' (#67) from lhj into dev hjlee 2025-09-26 17:12:59 +0900
• 3600621554 화면관리 쪽 파일첨부 수정 leeheejin 2025-09-26 17:12:03 +0900
• 11b71b788a 외부호출 기능(rest API) kjs 2025-09-26 17:11:18 +0900
• 9454e3a81f 제어관리 데이터 저장기능 kjs 2025-09-26 13:52:32 +0900
• 1fe401c7d6 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj leeheejin 2025-09-26 13:11:44 +0900
• ee7c8e989e 파일 업로드 기능 구현 및 상세설정 연동 leeheejin 2025-09-26 13:11:34 +0900
• 2a4e379dc4 제어관리 외부커넥션 설정기능 kjs 2025-09-26 01:28:51 +0900
• ddd191b87b Merge pull request 'dev' (#65) from dev into main hjlee 2025-09-25 18:57:35 +0900
• 74fdaea4ac Merge pull request 'lhj' (#64) from lhj into dev hjlee 2025-09-25 18:56:44 +0900
• c28e27f3e8 화면관리의 테이블 리스트, 카드 디스플레이 수정 leeheejin 2025-09-25 18:54:25 +0900
• d69feef9da 화면관리의 테이블 리스트, 카드 디스플레이 수정 leeheejin 2025-09-25 18:54:12 +0900
• a06f41dbdb Merge pull request 'dev' (#63) from dev into main hjlee 2025-09-25 16:23:18 +0900
• ecac852d7a Merge pull request '콘솔 주석처리, 화면관리쪽 컬럼수, 페이지네이션 수정' (#62) from lhj into dev hjlee 2025-09-25 16:22:40 +0900
• 28485d6e5c 콘솔 주석처리, 화면관리쪽 컬럼수, 페이지네이션 수정 leeheejin 2025-09-25 16:22:02 +0900
• c0414abaa0 Merge pull request 'dev' (#61) from dev into main hjlee 2025-09-25 14:32:43 +0900
• 1977e73c80 Merge pull request 'lhj' (#60) from lhj into dev hjlee 2025-09-25 14:31:58 +0900
• 5921a84581 fix: 배치 관리 시스템 Oracle/MariaDB 커넥터 추가 및 timestamp 타입 변환 오류 수정 hjjeong 2025-09-25 14:25:18 +0900
• cd84d9033c uiux 개선 leeheejin 2025-09-25 14:22:30 +0900
• 1a59c0cf04 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2025-09-25 13:26:27 +0900
• 949aab0b73 feat: 배치 관리 시스템 구현 hjjeong 2025-09-25 11:04:16 +0900
• dd902cafab 백엔드 에러수정 kjs 2025-09-25 11:04:02 +0900
• 0d46bc540c 타입스크립트 에러수정 kjs 2025-09-25 10:13:43 +0900
• 7b84102cd9 도커설정 kjs 2025-09-25 09:53:23 +0900
• 25ecfa13d2 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-25 09:37:25 +0900
• d7ac8113ba 도커설정 kjs 2025-09-25 09:37:24 +0900
• acfe282dae Merge pull request 'feature/screen-management' (#59) from feature/screen-management into main kjs 2025-09-25 09:32:39 +0900
• 623a76080a Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2025-09-25 09:32:11 +0900
• cb0058cd37 Merge pull request 'dev' (#58) from dev into main hjlee 2025-09-25 09:31:48 +0900
• 026e79688a 도커설정 kjs 2025-09-25 09:31:44 +0900
• 93a11fdbf3 Merge pull request 'lhj' (#57) from lhj into dev hjlee 2025-09-25 09:30:59 +0900
• e3cd6dc3a0 UI/UX 개선: 사이드바 레이아웃 안정화 및 메뉴 hover 효과 개선 leeheejin 2025-09-25 09:29:56 +0900
• b41e645c74 제어관리 외부 커넥션 설정기능 kjs 2025-09-24 18:23:57 +0900
• 1a60177fe4 feat: 관리자 페이지 레이아웃 통일 및 JSX 구문 수정 leeheejin 2025-09-24 18:07:36 +0900
• 3c839a56bf Merge pull request 'feature/screen-management' (#56) from feature/screen-management into main kjs 2025-09-24 15:03:15 +0900
• 0d9ee4c40f 테이블 컬럼 표시문제 수정 kjs 2025-09-24 15:02:54 +0900
• 649ed5c6d7 조인컬럼수정(조인 컬럼 추가시 엔티티 타입 표시 오류) kjs 2025-09-24 14:31:46 +0900
• 86dc961968 조인컬럼 오류 kjs 2025-09-24 12:56:22 +0900
• d52d6c129b Merge pull request 'feature/screen-management' (#55) from feature/screen-management into main kjs 2025-09-24 10:50:18 +0900
• d5b63d1c9b Merge branch 'main' into feature/screen-management kjs 2025-09-24 10:50:09 +0900
• 4abf5b31c0 배치관리 중간커밋 feature/batch-management hjjeong 2025-09-24 10:46:55 +0900
• e75889a127 조인 컬럼 문제 수정 kjs 2025-09-24 10:33:54 +0900
• 4b148ee823 Merge pull request 'dev' (#54) from dev into main hjlee 2025-09-24 10:31:51 +0900
• bb642cab04 Merge pull request '데이터베이스 틀린 비밀번호 입력시 연결거부처리' (#53) from lhj into dev hjlee 2025-09-24 10:31:28 +0900
• 4efec8d758 데이터베이스 틀린 비밀번호 입력시 연결거부처리 leeheejin 2025-09-24 10:30:36 +0900
• db08d9e6b9 Merge pull request 'dev' (#52) from dev into main hjlee 2025-09-24 10:06:35 +0900
• 192982a556 Merge pull request '외부커넥션관리' (#51) from lhj into dev hjlee 2025-09-24 10:05:45 +0900
• bc6e6056c1 외부커넥션관리 leeheejin 2025-09-24 10:04:25 +0900
• a757034d86 엔티티타입 표시방식 변경 kjs 2025-09-23 17:43:24 +0900
• 28109eb63b fix: 엔티티 컬럼 조인 테이블 정보 자동 가져오기 기능 추가 kjs 2025-09-23 17:11:07 +0900
• 4c5e0330ef fix: TableListConfigPanel API 호출 수정 및 엔티티 컬럼 참조 테이블 로깅 추가 kjs 2025-09-23 17:08:52 +0900
• ad7f350f00 fix: API 클라이언트 설정 원복 및 빈 테이블명 API 호출 방지 kjs 2025-09-23 17:06:23 +0900
• f01be49f6a fix: TableListConfigPanel에서 컬럼 검색 필드명 수정 kjs 2025-09-23 16:59:12 +0900
• 9d346a3d3a fix: 엔티티 컬럼 표시 설정 문제 해결 kjs 2025-09-23 16:51:12 +0900
• de6c7a8008 feat: 엔티티 타입 컬럼 표시 설정을 화면 편집기로 이동 kjs 2025-09-23 16:23:36 +0900
• 51a1d4572c Merge pull request 'lhj' (#50) from lhj into dev hjlee 2025-09-23 16:07:58 +0900
• affb6899cc 수정할때 비밀번호 틀리면 연결안되게 leeheejin 2025-09-23 16:05:30 +0900
• 4aefb5be6a 엔티티 타입 다중 표시 컬럼 기능 구현 kjs 2025-09-23 15:58:54 +0900
• d9270e6307 Merge pull request 'feature/screen-management' (#49) from feature/screen-management into main kjs 2025-09-23 15:38:41 +0900
• 699efd25a2 Merge origin/dev - 충돌 해결 kjs 2025-09-23 15:36:03 +0900
• f15c1fa114 검색필터 수정사항 kjs 2025-09-23 15:31:27 +0900
• c557fc5d56 전체 화면 영역 배경색을 흰색으로 통일 kjs 2025-09-23 15:30:02 +0900
• f0a9c50ca1 ResponsiveScreenContainer 컨테이너 완전 제거 kjs 2025-09-23 15:25:55 +0900
• 1f67576d5d 화면 자동맞춤 기능 제거 및 전체 화면 표시 개선 kjs 2025-09-23 15:21:50 +0900
• da9985cd24 검색 필터기능 수정사항 kjs 2025-09-23 14:26:18 +0900
• 7297db1730 Merge pull request 'lhj' (#48) from lhj into dev hjlee 2025-09-23 12:37:28 +0900
• 3083ffc0a3 외부커넥션관리 수정시 연결테스트 문제 해결과 프론트 약간 수정한 내용 leeheejin 2025-09-23 12:34:34 +0900
• f160a33b94 스크롤 기능 포함 leeheejin 2025-09-23 10:45:53 +0900
• e653effac0 테이블 추가기능 수정사항 kjs 2025-09-23 10:40:21 +0900
• 37ded5a543 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-23 09:27:15 +0900
• 2d83bf9329 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node kjs 2025-09-22 18:29:03 +0900
• cc4398afbf Merge pull request 'dev' (#47) from dev into main kjs 2025-09-22 18:28:31 +0900
• 3556f55986 Merge branch 'main' into dev kjs 2025-09-22 18:28:12 +0900
• d7c512772e 도커 db설정 kjs 2025-09-22 18:27:50 +0900
• 0e2889afc1 Resolve merge conflict: Keep working multilangController.ts version kjs 2025-09-22 18:24:51 +0900
• 7fa6fd6093 Fix: Restore multilangController.ts with all required exports kjs 2025-09-22 18:24:21 +0900
• 0257254036 Fix: Restore multilangController.ts with all required exports kjs 2025-09-22 18:24:00 +0900
• 6c0e0db897 Merge pull request 'dev' (#46) from dev into main kjs 2025-09-22 18:17:23 +0900
• 0031291828 Merge branch 'main' into dev kjs 2025-09-22 18:17:07 +0900
• c78f152f68 Resolve merge conflicts: Use main branch versions for conflicting files kjs 2025-09-22 18:16:24 +0900
• 26ede5830c 윈도우용 실행파일 커밋 chpark 2025-09-22 17:46:23 +0900
• 474cc33aee Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2025-09-22 17:36:43 +0900
• e7f9320a78 Merge pull request 'feature connection' (#45) from feature/connection into dev hjlee 2025-09-22 17:34:46 +0900
• 1ae16bb690 feature connection feature/connection leeheejin 2025-09-22 17:28:31 +0900
• 1436c908a6 Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2025-09-22 17:02:52 +0900
• dfda1bcc24 테이블 및 컬럼 생성기능 추가 kjs 2025-09-22 17:00:59 +0900
• 3a96f9dc81 Merge pull request 'external-connections' (#44) from external-connections into dev hyeonsu 2025-09-22 15:05:19 +0900
• 0258c2a76c 라벨표시 수정 kjs 2025-09-22 14:13:05 +0900
• 0bad11686e web_type에 따른 input 변화 구현 external-connections hyeonsu 2025-09-21 12:31:37 +0900
• c3cb1a0033 entity 수정 hyeonsu 2025-09-21 11:39:34 +0900
• 28bd0d55cd Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into external-connections hyeonsu 2025-09-21 11:10:31 +0900
• 44ed594dd7 insert 매핑 시 날짜 기본값 설정 hyeonsu 2025-09-21 11:10:18 +0900
• 33600ce667 webtype 엔티티 수정 hyeonsu 2025-09-21 10:28:15 +0900
• 43e335d271 전체실행조건 웹 타입별 조건분기 hyeonsu 2025-09-21 09:53:05 +0900
• 4b28530fec 타입 관리 개선 및 화면 비율조정 중간커밋 kjs 2025-09-19 18:43:55 +0900
• 81d760532b 제어 관리 저장 액션에 논리연산자 추가 hyeonsu 2025-09-19 16:42:33 +0900
• 61aac5c5c3 관계도 저장 시 모달 및 이름 중복 안내 구현 hyeonsu 2025-09-19 15:47:35 +0900