somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
664 Commits 1 Branch 0 Tags 108 MiB
be4f7fa7f2
Commit Graph

618 Commits

Author SHA1 Message Date
KNKIM
16b1a83d5d 충돌해소 2021-11-24 14:40:09 +09:00
KNKIM
6081d1f1a6 총돌 처리 2021-11-24 14:27:18 +09:00
KNKIM
1b7dfb77b0 충돌 처리 2021-11-24 14:27:03 +09:00
JSYOO
5fdc0bee93 mb_site 관련 소스 제거 , 소장자료리스트 대출예약,방문 등의 상태 소스수정 2021-11-24 14:23:43 +09:00
com02
b7c6bdc4ea 커밋 2021-11-24 13:26:46 +09:00
com02
baf28f38a7 Merge remote-tracking branch 'origin/master' 2021-11-24 13:26:22 +09:00
com02
5f9e9686ec 커밋 2021-11-24 13:26:11 +09:00
com02
7d5824581d 메인배너 수정 2021-11-24 12:16:44 +09:00
KNKIM
a716dda23e 메인화면 배너 롤링 기능 구현 2021-11-24 11:53:00 +09:00
JSYOO
2194fad76a 유사한 자료 쿼리수정 2021-11-24 11:48:04 +09:00
com02
1c56bd4c47 소장자료 상세페이지 목차 수정 2021-11-24 11:35:55 +09:00
JSYOO
5d5eaed16d 목차 수정 2021-11-24 10:25:51 +09:00
JSYOO
0c62351f93 POST 제거 2021-11-24 09:36:13 +09:00
JSYOO
5aacfecc3a 자료관안내 메뉴 페이지들 CONTENT 컬럼 삭제로 인해 수정 2021-11-23 17:32:47 +09:00
KNKIM
7a3b0cfe87 메인화면 속도 2021-11-23 16:30:56 +09:00
JSYOO
d8e7db7d68 카트담기 조건 수정 2021-11-23 16:26:37 +09:00
JSYOO
c2fd3eda98 상세조회 POST로 수정 
공유하기 상세로 나오게 수정
 2021-11-23 16:25:26 +09:00
KNKIM
2cdcee1306 개인정보 삭제 2021-11-23 15:40:38 +09:00
com02
4580465df2 소장자료디테일페이지 목차 css 수정 2021-11-23 12:24:35 +09:00
com02
d70be02ec9 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-23 12:23:47 +09:00
KNKIM
c5fcae8949 엑티버 css 적용 2021-11-23 11:50:18 +09:00
KNKIM
66b4986d9a 엑티버 css 적용 2021-11-23 11:49:45 +09:00
KNKIM
96719a4141 엑티버 css 적용 2021-11-23 11:48:56 +09:00
KNKIM
d3d6cac418 엑티버 css 적용 2021-11-23 11:48:04 +09:00
KNKIM
f8965072d5 엑티버 css 적용 2021-11-23 11:47:23 +09:00
KNKIM
d637ba28d6 엑티버 css 적용 2021-11-23 11:44:15 +09:00
KNKIM
8b2ddbf77f Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-23 11:43:24 +09:00
KNKIM
85e9da022b 엑티버 css 적용 2021-11-23 11:43:13 +09:00
com02
cf5aee0d62 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-23 11:26:52 +09:00
com02
138f410fa7 css 2021-11-23 11:26:38 +09:00
JSYOO
4a54a7b9eb 공유하기시 원문보기 url 수정 
상세조회 목차 --- *** 편집
 2021-11-23 11:05:15 +09:00
KNKIM
c5ebc8dc1b meta_og 추가 외 2021-11-23 10:40:32 +09:00
JSYOO
ac439d1a2c 커밋 2021-11-23 09:39:45 +09:00
JSYOO
ba386b5cc7 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-23 09:39:36 +09:00
JSYOO
aaee1c3533 상세조회 커밋 2021-11-23 09:39:17 +09:00
KNKIM
6fd4d354ef 충돌 머지 2021-11-23 09:38:51 +09:00
KNKIM
a957f746c5 충돌 처리 2021-11-23 09:36:07 +09:00
KNKIM
722e1157d5 충돌 머징 작업 2021-11-23 09:10:43 +09:00
KNKIM
84550bfb32 충돌 처리 2021-11-23 08:32:11 +09:00
com02
ee90299969 추가 2021-11-23 08:11:37 +09:00
com02
047b75d0b7 충돌 해결 2021-11-23 08:11:25 +09:00
com02
a7d7081809 Merge branch 'master' of 
http://docs.nculture.org:30000/nculture/iams.nlib

Conflicts:
	src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp
	src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
	src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
	src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp
	src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
 2021-11-23 08:07:27 +09:00
com02
00f2d4c2c3 충돌 처리 2021-11-22 17:07:40 +09:00
com02
2cfc4e37ee 충돌 머징 2021-11-22 17:06:01 +09:00
KNKIM
55dc4cf87d 메뉴 변경 2021-11-22 16:43:30 +09:00
KNKIM
bdec9bc7ca 테스트 및 보완 작업 2021-11-22 16:22:51 +09:00
KNKIM
dac6212a1e 테스트 및 보완사항 처리 2021-11-22 16:02:15 +09:00
JSYOO
c3039e74fc 메시지 줄바꿈 , 상세조회화면 대출,방문열람 상태 수정 2021-11-22 14:30:15 +09:00
JSYOO
a8c2c4ea4b 커밋 2021-11-22 10:56:31 +09:00
JSYOO
d0f2bf7b80 Merge remote-tracking branch 'origin/master' 2021-11-22 10:56:11 +09:00
JSYOO
757ee74776 공유하기 INTERFACEID 없을시 처리 2021-11-22 10:56:03 +09:00
KNKIM
421176d703 DB 컬럼 변경 처리 : CONTENT (TEXT) -> CONTENT_LBL (LONGBLOB) 외 2021-11-22 10:42:42 +09:00
KNKIM
eee6c9caaf 쿼리 정리 2021-11-22 08:11:50 +09:00
KNKIM
47ea8c8a20 보완 2021-11-19 17:58:49 +09:00
KNKIM
8332914efb 기타 처리 2021-11-19 17:39:48 +09:00
KNKIM
311a2377d8 열람 표시 2021-11-19 17:39:37 +09:00
KNKIM
ed7dc3ed87 썸네일 보완 2021-11-19 17:35:06 +09:00
KNKIM
36ca6fa421 충돌 처리 2021-11-19 17:34:06 +09:00
KNKIM
bccfe9c65d Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
	src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
 2021-11-19 17:30:39 +09:00
KNKIM
81937fd479 충돌 조정 2021-11-19 17:29:14 +09:00
KNKIM
3967f56587 썸네일 처리 보완 2021-11-19 17:28:11 +09:00
com02
d7b3fdffcb 모바일 수정 2021-11-19 17:15:20 +09:00
JSYOO
c04a49ea18 커밋 2021-11-19 17:03:27 +09:00
JSYOO
6a28c8db70 열람 ,대출등 조건 함수 jsp적용 2021-11-19 17:03:04 +09:00
KNKIM
23d7a25842 상태 코드 처리 구현 2021-11-19 17:02:06 +09:00
KNKIM
44b50c772a 각종 상태 관련 인터페이스 추가 2021-11-19 16:21:56 +09:00
KNKIM
1582d6a874 공지사항 : 공지 수정 2021-11-19 16:18:22 +09:00
com02
850a63b8e3 메뉴수정 2021-11-19 16:17:30 +09:00
JSYOO
af28ea67d3 모바일 원문보기 2021-11-19 16:16:28 +09:00
JSYOO
629f573c75 커밋 2021-11-19 16:12:41 +09:00
JSYOO
5c06139ae3 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-19 16:12:25 +09:00
JSYOO
8a8d134296 커밋 2021-11-19 16:12:14 +09:00
JSYOO
b845bc00e8 Merge remote-tracking branch 'origin/master' 2021-11-19 16:10:59 +09:00
com02
ebf4fe8f28 css 2021-11-19 16:10:50 +09:00
JSYOO
389eee5c3d html wax, w3c 사용해 수정 2021-11-19 16:10:48 +09:00
com02
3c6e71fa6b Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/webapp/css/media.css
 2021-11-19 16:10:21 +09:00
com02
ca6de530ea css 2021-11-19 16:09:04 +09:00
KNKIM
773e0c37bd Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/webapp/css/media.css
 2021-11-19 15:13:15 +09:00
KNKIM
a59c6d5dcd 소스 충돌 처리 2021-11-19 15:06:23 +09:00
com02
dd9dec541b 변경 2021-11-19 14:55:40 +09:00
com02
937f9133ea 커밋 2021-11-19 14:54:59 +09:00
com02
b45c13d331 충돌 처리 2021-11-19 14:43:58 +09:00
com02
4fa9982dff 소스충돌 처리 2021-11-19 14:37:54 +09:00
JSYOO
b3a85c702a digitalReadYn값 impl 부분에서 set추가 2021-11-19 11:10:24 +09:00
KNKIM
60433d6d90 자료항목, 썸네일 등 정리 2021-11-19 10:52:51 +09:00
JSYOO
6a7622c1b4 nlib 수정안된부분 수정 2021-11-19 10:39:28 +09:00
com02
51a657fe83 수정 2021-11-18 19:05:44 +09:00
com02
431ec0b3fd Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-18 19:05:15 +09:00
com02
6399bd81dc 충돌수정 2021-11-18 19:04:59 +09:00
KNKIM
e19e81096d 모바일용 메뉴 연결 처리 2021-11-18 17:56:56 +09:00
KNKIM
3b8b774cb1 소스충돌 - 처리 2021-11-18 17:22:59 +09:00
KNKIM
24ce0b267e Merge remote-tracking branch 'origin/master' 2021-11-18 17:21:15 +09:00
KNKIM
663f9a5276 오류 및 예외 페이지 처리 2021-11-18 17:20:14 +09:00
JSYOO
80268a50ba 커밋 2021-11-18 16:49:06 +09:00
JSYOO
b90bec5ed6 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-18 16:48:54 +09:00
JSYOO
00c20f786a html body head 태그제거 2021-11-18 16:48:37 +09:00
KNKIM
42442f901a 정리 2021-11-18 16:40:50 +09:00
KNKIM
65af908108 소스정리작업 2021-11-18 16:39:34 +09:00
JSYOO
15acbbc190 커밋 2021-11-18 15:42:01 +09:00
JSYOO
4b6e3e4c35 Merge remote-tracking branch 'origin/master' 2021-11-18 15:40:19 +09:00