Commit Graph

41 Commits

Author SHA1 Message Date
27bafceabf Merge branch 'master' of
http://tolag3@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-30 19:35:24 +09:00
0887c17ae8 Merge branch 'tolag3' 2024-10-30 18:27:07 +09:00
6c80d38713 이노릭스 커밋 2024-10-30 18:19:30 +09:00
myname
8b4fec3ccb 2024-10-30 15:52 법률상담예약 2024-10-30 15:53:38 +09:00
myname
2273f3cce5 2024-10-30 14:07 오시는길 2024-10-30 14:07:18 +09:00
myname
1fbcbff10d # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

2024-10-30 관리자 로그 수정
2024-10-30 09:25:29 +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
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
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
myname
a24dc2a89d # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-17 17:30:37 +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
myname
2364734e77 Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Conflicts:
	src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Oracle.xml
2024-10-15 11:10:02 +09:00
myname
97690f6015 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-15 11:07:23 +09:00
858987855b Merge branch 'tolag3' 2024-10-15 10:31:42 +09:00
c374bbb783 Merge branch 'tolag3'
본인인증 개발중
2024-10-15 10:30:51 +09:00
myname
8057ad755a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

마이페이지 소스 수정
2024-10-11 16:09:44 +09:00
myname
24611c673a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-10 17:08:50 +09:00
myname
bc0275e74b 2024-10-02 18:30 마이페이지 작업 2024-10-02 18:30:38 +09:00
myname
5252ef506c Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-10-02 11:55:10 +09:00
myname
da8e0986c8 2024-10-02 11:53 분쟁조정 안내 작업 2024-10-02 11:54:28 +09:00
269463560b Merge branch 'master' of
http://tolag3@vcs.iten.co.kr:9999/itnAdmin/fairnet

 본인인증 개발중
2024-09-30 17:23:01 +09:00
4f3563e347 본인인증 개발중 2024-09-30 15:48:44 +09:00
myname
3dfa378653 2024-09-30 11:37 분쟁조정상담 작업 2024-09-30 11:38:13 +09:00
myname
1e74f4a7da 2024-09-27 17:48 분쟁조정 사례 상세 화면 작업 2024-09-27 17:48:28 +09:00
myname
e6d2cd8743 2024-09-27 17:44 분쟁조정사례 타이틀 변경 2024-09-27 17:44:28 +09:00
myname
610264e10a 2024-09-27 17:39 분쟁조정 사례 작업 2024-09-27 17:39:50 +09:00
myname
1dd1119381 2024-09-26 17:49 분쟁조정 안내 페이지 작업 2024-09-26 17:49:23 +09:00
myname
4b5d7b05c4 2024-09-26 분쟁조정 안내 작업 2024-09-26 14:56:23 +09:00
myname
f007a80ef8 2024-09-24 11:28 게시판 관리 작업 2024-09-24 11:37:29 +09:00
JIWOO
6113fb47bd 이지우 - 뉴스래터 게시판 이전 완료(첨부파일 작업 전, 유효성 검사등 자잘한 기능 오류 존재) 2024-08-22 16:17:27 +09:00
JIWOO
1755cb8e72 이지우 - 뉴스레터 작업, 웹노트 관련 이미지 추가 2024-08-21 10:30:33 +09:00
JIWOO
757739ec2a 이지우 - 로그인 세션에 분쟁조정 항목 추가 및 뉴스레터 게시판 작업 중 2024-08-13 15:32:57 +09:00
JIWOO
e4d12f8167 이지우 - AS-IS뉴스레터 게시판 목록 메뉴 생성 2024-08-08 17:50:01 +09:00
JIWOO
6a64910872 이지우 - 뉴스레터 이동 작업 중 2024-08-07 16:40:16 +09:00