Commit Graph

142 Commits

Author SHA1 Message Date
19d35acc5e Merge branch 'tolag3'
인증 끝
2024-11-27 16:54:05 +09:00
6568998f4e 인증 2024-11-27 12:06:04 +09:00
myname
5e81d7ffb6 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-26 19:15:16 +09:00
myname
14ec097e3a 2024-11-26 19:14 묶음 기안 2024-11-26 19:14:58 +09:00
JIWOO
074cd9384f Merge branch 'JIWOO' 2024-11-26 17:05:04 +09:00
JIWOO
bdb0be7efe 이지우 - 사용자 분쟁신청에 이노릭스 첨부파일 솔루션 추가 2024-11-26 17:04:00 +09:00
myname
8c2ed24b9a Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-26 13:59:27 +09:00
myname
c962dbcd20 2024-11-26 13:56 gw 연동 작업 2024-11-26 13:59:11 +09:00
JIWOO
c3ac71256d Merge branch 'JIWOO' 2024-11-25 18:41:19 +09:00
JIWOO
dc04618526 이지우 - 사용자 분쟁조정 신청 수정. 첨부파일 추가 예정 2024-11-25 18:37:24 +09:00
myname
6120143e26 2024-11-20 18:19 gw 수동 연동 처리 2024-11-20 18:20:03 +09:00
myname
25bf900b69 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-20 10:03:27 +09:00
myname
97ce174b4a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

gw 콜백수동 처리
2024-11-20 10:03:11 +09:00
fb87ee35fe Merge branch 'tolag3' 2024-11-19 16:50:59 +09:00
b5fc6dfb48 Merge branch 'tolag3'
사용자 검색
2024-11-18 17:32:04 +09:00
6c0f1ce1da Merge branch 'tolag3' 2024-11-18 12:39:32 +09:00
752391a2c3 Merge branch 'tolag3' 2024-11-18 12:39:13 +09:00
myname
c97688d0f0 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

착수 보고 상신 작업
2024-11-15 16:43:13 +09:00
JIWOO
662fbadfae Merge branch 'JIWOO' 2024-11-14 12:27:40 +09:00
JIWOO
15afa07a45 이지우 - 사용자 > 분쟁조정안내 > 자주하는 질문 > (기타)절차종결 관련질문 상세페이지 및 검색기능 추가 2024-11-14 12:26:36 +09:00
myname
0c6d441a15 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-13 18:26:25 +09:00
myname
e3a8d94f11 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-11-13 18:26:09 +09:00
2ca559755d 사용자 인증 2024-11-13 09:44:00 +09:00
JIWOO
f1c88cbbf5 이지우 - 관리자 > 분쟁조정관련서식 등록 시 이노릭스 적용 완료. 수정화면 작업 중 2024-11-08 15:35:11 +09:00
JIWOO
a61a82d316 이지우 > 대용량 업로드 솔루션 작업 중 2024-11-06 09:59:35 +09:00
0887c17ae8 Merge branch 'tolag3' 2024-10-30 18:27:07 +09:00
6c80d38713 이노릭스 커밋 2024-10-30 18:19:30 +09:00
myname
2273f3cce5 2024-10-30 14:07 오시는길 2024-10-30 14:07:18 +09:00
JIWOO
fa9585dc14 Merge branch 'JIWOO' 2024-10-29 10:21:03 +09:00
JIWOO
784d13d3fd 이지우 - 이노릭스 작업 중 2024-10-29 10:16:32 +09:00
myname
9b6f7a3a2a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

로그 정보
2024-10-28 17:39:02 +09:00
JIWOO
93c442802e Merge branch 'JIWOO' 2024-10-25 12:50:20 +09:00
JIWOO
798c1806ba 이지우 - 이노릭스 라이센스 구분 추가 2024-10-25 12:49:31 +09:00
myname
7f520742f1 Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Conflicts:
	src/main/resources/egovframework/egovProps/globals_local.properties
2024-10-25 12:46:19 +09:00
JIWOO
f9c8308e53 Merge branch 'JIWOO'
Conflicts:
	src/main/resources/egovframework/egovProps/globals_local.properties
2024-10-25 12:32:46 +09:00
myname
d4beed6aa3 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

분쟁조정 사례수정 & DB ip 변경
2024-10-25 12:28:35 +09:00
JIWOO
1bc29f7569 이지우 - 이노릭스 대용량 파일 솔루션 세팅 중 2024-10-25 12:27:25 +09:00
160dfdd6be Merge branch 'tolag3' 2024-10-25 09:44:45 +09:00
c2acfa2f38 Merge branch 'tolag3' 2024-10-25 09:36:57 +09:00
myname
bbc21324bc # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-23 09:50:53 +09:00
JIWOO
67c73ed88a Merge branch 'JIWOO' 2024-10-21 09:53:26 +09:00
JIWOO
9b8b1406aa 이지우 - 분쟁조정 프로세스 작업 중 2024-10-21 09:51:34 +09:00
myname
ea91cb312d # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-18 17:50:06 +09:00
20754aab98 Merge branch 'tolag3'
팝업관리 게시판관리 개발
2024-10-17 17:41:07 +09:00
b9f5505393 Merge branch 'tolag3'
오류 수정
2024-10-17 10:15:27 +09:00
ccc878dd0e Merge branch 'tolag3' 2024-10-16 09:41:20 +09:00
ccb250b5d9 Merge branch 'tolag3'
조정신청 개발중
본인인증 개발중
2024-10-16 09:40:57 +09:00
JIWOO
878447e341 Merge branch 'JIWOO' 2024-10-15 18:29:54 +09:00
JIWOO
7d3c935c3d 이지우 - 분쟁조정협의회 관리 작업 중 2024-10-15 18:27:54 +09:00
858987855b Merge branch 'tolag3' 2024-10-15 10:31:42 +09:00