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

334 Commits

Author SHA1 Message Date
JSYOO
5d5eaed16d 목차 수정 2021-11-24 10:25:51 +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
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
JSYOO
4a54a7b9eb 공유하기시 원문보기 url 수정 
상세조회 목차 --- *** 편집
 2021-11-23 11:05:15 +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
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
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
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
311a2377d8 열람 표시 2021-11-19 17:39:37 +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
JSYOO
c04a49ea18 커밋 2021-11-19 17:03:27 +09:00
JSYOO
6a28c8db70 열람 ,대출등 조건 함수 jsp적용 2021-11-19 17:03:04 +09:00
KNKIM
1582d6a874 공지사항 : 공지 수정 2021-11-19 16:18:22 +09:00
JSYOO
af28ea67d3 모바일 원문보기 2021-11-19 16:16:28 +09:00
JSYOO
629f573c75 커밋 2021-11-19 16:12:41 +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
JSYOO
389eee5c3d html wax, w3c 사용해 수정 2021-11-19 16:10:48 +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
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
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
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
JSYOO
99a14a478c 수정사항 커밋 2021-11-18 15:40:09 +09:00
KNKIM
1616f9c221 웹접근성 보완 2021-11-18 14:55:02 +09:00
KNKIM
bc4a5584cf 웹접근성 검사 - 보완 작업 2021-11-18 14:00:21 +09:00
com02
422daaa083 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-18 13:09:55 +09:00
com02
1bac68f76a 탑버튼 수정 2021-11-18 13:09:49 +09:00
KNKIM
a8ffbd08d4 웹접근성 - 보완작업 2021-11-18 10:32:42 +09:00
KNKIM
93ef434f33 웹접근성 - 보완작업 2021-11-18 10:23:28 +09:00
KNKIM
cead8e051d 웹접근성 - 보완작업 2021-11-18 09:51:25 +09:00
KNKIM
9a8883bfa9 웹접근성 - 보완작업 2021-11-18 09:30:56 +09:00
KNKIM
5bf5534cdb 대출/열람 연결 : GET으로 변경 2021-11-17 18:02:25 +09:00
JSYOO
39757239b9 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-17 17:54:24 +09:00
JSYOO
136816b433 핸드폰,이메일인증 수정 2021-11-17 17:54:16 +09:00
KNKIM
09afe75574 웹접근성 검사 보완사항 처리 2021-11-17 17:45:55 +09:00
JSYOO
b17bd19f6d 소장자료 wax 100점 2021-11-17 16:38:34 +09:00
JSYOO
a29d00c661 Merge remote-tracking branch 'origin/master' 2021-11-17 16:29:00 +09:00
JSYOO
32924e2d8f 필요없는 자료 삭제 2021-11-17 16:28:23 +09:00
JSYOO
c1b68ddb2f alt 썸네일 추가 , 비밀번호 초기화폼 popup으로 수정 2021-11-17 16:28:12 +09:00
KNKIM
143ce2b2ab 웹접근성 보완작업 : 메인화면 2021-11-17 16:22:37 +09:00
KNKIM
7e4c17bb0a 알림 기능 개선 2021-11-17 15:24:12 +09:00
KNKIM
41513ec86b Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-17 14:17:21 +09:00
KNKIM
580e039e7d 퍼블 2021-11-17 14:17:02 +09:00
JSYOO
b15c5a4245 검색결과없을시 지역n문화로 이동추가 2021-11-17 13:56:35 +09:00
com02
1023e79c2f Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-17 13:48:55 +09:00
com02
85a4f012c5 소장자료관 모바일 수정 2021-11-17 13:48:28 +09:00
KNKIM
db33ed791b Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java
 2021-11-17 12:31:36 +09:00
KNKIM
bcc9980c89 온라인 자료관 더보기 처리 2021-11-17 12:27:23 +09:00
KNKIM
0f84dc08fd 소스 이상 충돌 처리 2021-11-17 12:26:22 +09:00
JSYOO
835593d324 커밋 2021-11-17 12:18:40 +09:00
JSYOO
13d551c34f Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-17 12:18:27 +09:00
JSYOO
982db041ef 내정보조회 쿼리 수정, 소장자료 검색결과없을시 2021-11-17 12:18:19 +09:00
KNKIM
d894ce5b21 문화원명 출력 보정 2021-11-17 11:27:35 +09:00
KNKIM
fc027dd05f 권한 설정 2021-11-17 11:13:51 +09:00
KNKIM
f4ba387cc7 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-17 09:50:19 +09:00
KNKIM
168894bd30 코드 정리 2021-11-17 09:50:11 +09:00
JSYOO
51fc5373fc Merge remote-tracking branch 'origin/master' 2021-11-16 18:09:11 +09:00
JSYOO
4c236bf810 단위테스트(내부) 20211115 수정 2021-11-16 18:08:22 +09:00
KNKIM
c7e3a6809d Ajax 스프링 시큐리티 권한 처리 개선 2021-11-16 18:03:22 +09:00
KNKIM
4297a96216 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-16 15:14:04 +09:00
KNKIM
0740c68f4c 로그인 자동 분기 처리 2021-11-16 15:13:38 +09:00
JSYOO
c35e834398 키워드 없을시 노출안되게 수정 2021-11-16 14:17:18 +09:00
JSYOO
5893d84226 Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib 2021-11-16 13:31:48 +09:00
JSYOO
4ce24d2f69 키워드 ; split사용해 jsp에 보여줌 2021-11-16 13:31:41 +09:00