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
|
8af10b6cec
|
Merge remote-tracking branch 'origin/master'
|
2021-11-19 17:03:13 +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 |
|