tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,839 Commits 3 Branches 0 Tags 323 MiB
9ac11235a6
Commit Graph

1839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hylee
994172a65a Merge branch 'hylee' into advc 2023-10-06 14:02:56 +09:00
hylee
d75a5cd263 사용자 기소유예 신청 진행중 2023-10-06 14:02:30 +09:00
subsub
52d5e1f9d9 2023/10/06 content.css 수정 2023-10-06 12:34:01 +09:00
hylee
073ea02597 Merge branch 'hylee' into advc 2023-10-06 11:02:53 +09:00
hylee
101334ec2a 사용자: 기반강화연수 기소유예 2023-10-06 11:01:03 +09:00
jiwoo
91c207ebca Merge branch 'JIWOO' into advc 2023-10-05 16:41:55 +09:00
jiwoo
9445f7584c 이지우 - e배움터 로그인 cors 수정 중 2023-10-05 16:40:24 +09:00
kmg
36476a3701 2023/10/05 체험교실 대시보드 프로세스 2023-10-05 12:00:11 +09:00
jiwoo
7347601133 Merge branch 'JIWOO' into advc 2023-10-04 14:15:23 +09:00
jiwoo
db2a329644 이지우 - 저작권체험교실 작업중 2023-10-04 14:13:44 +09:00
hylee
11bff5a1c3 left 메뉴 삭제 / top 메뉴 수정 2023-09-26 18:24:08 +09:00
hylee
9819d56892 기소유예 사용자 구조 2023-09-26 12:35:50 +09:00
hylee
fbb1ebcd14 Merge branch 'hylee' into advc 2023-09-26 12:02:13 +09:00
hylee
d77f0fa10e 기소유예 사용자 패키지 구조 생성 2023-09-26 12:00:59 +09:00
subsub
419ec4eaa4 Merge branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc 2023-09-26 11:52:54 +09:00
subsub
592d386a27 Merge branch 'subsub' into advc 2023-09-26 11:52:22 +09:00
subsub
cd000e461d 2023/09/26 header css 수정 2023-09-26 11:51:50 +09:00
hylee
a39ca85c25 Merge branch 'hylee' into advc 
Conflicts:
	src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
	src/main/resources/egovframework/spring/com/context-idgen.xml
 2023-09-26 11:49:08 +09:00
hylee
f773b23707 기반강화연수 사용자/관리자 2023-09-26 11:45:40 +09:00
jiwoo
a7f8cbd561 Merge branch 'JIWOO' into advc 2023-09-26 10:53:14 +09:00
jiwoo
3ff3e91619 이지우 - 저작권체험교실 진행 중 2023-09-26 10:51:24 +09:00
kmg
15958c6fa8 Merge branch 'advc' of http://yickso@vcs.iten.co.kr:9999/hylee/offedu into advc 2023-09-25 12:39:47 +09:00
kmg
af5fd1f347 src/main/webapp/visitEdu/usr/publish/sub_training_dashboard.html 2023-09-25 12:39:39 +09:00
subsub
d19572e51e 2023/09/25 찾교 
- 기소유예 교육신청 대시보드(/visitEdu/usr/publish/sub_sus_dashboard.html) : 신청완료 옆
취소 버튼 클릭 시 팝업
- 교육신청자 대시보드(/visitEdu/usr/publish/sub_training_dashboard.html) : 설문등록
버튼 클릭 시 팝업
- 교육기반강화연수(/visitEdu/usr/publish/sub_training.html)
 2023-09-25 11:22:44 +09:00
kmg
5334607329 2023/09/22 기소유예 대시보드, 교육기반강화, 대시보드 추가 2023-09-22 15:01:58 +09:00
myname
963bd9ae8d 2023-09-21 12:32 관리자/사용자 로그 관리 수정 2023-09-21 12:32:52 +09:00
myname
5260e6699e Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc 2023-09-19 16:56:37 +09:00
myname
d30c7add54 2023-09-19 16:55 화면 수정 2023-09-19 16:56:08 +09:00
kmg
42b290f3d8 test 2023-09-19 11:51:14 +09:00
myname
7649047af4 Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc 2023-09-19 10:04:12 +09:00
myname
37fc8c5c75 2023-09-19 10:03 사용자/관리자 로그 수정 2023-09-19 10:03:49 +09:00
jiwoo
7a335dda1d Merge branch 'JIWOO' into advc 
Conflicts:
	src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml
	src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp
 2023-09-18 12:01:07 +09:00
jiwoo
d6a7927309 이지우 - 체험교실 관리자 작업 중 2023-09-18 11:56:09 +09:00
hylee
753fa32ad3 Merge branch 'hylee' into advc 2023-09-18 11:55:07 +09:00
hylee
76cc571204 사용자 기반강화 진행중 2023-09-18 11:54:18 +09:00
myname
598cc0940a 2023-09-14 16:47 청소년 개인 정보 스케쥴러 추가 2023-09-14 16:47:57 +09:00
myname
897579ad7d 2023-09-14 12:28 체험교실 신청 조건 변경 2023-09-14 12:28:56 +09:00
myname
16b873f9c0 2023-09-14 12:11 체험교실 날짜 양식 변경 2023-09-14 12:12:05 +09:00
myname
9a376ffce1 Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc 2023-09-14 11:26:08 +09:00
myname
c8bb8598a8 decorator 2023-09-14 11:25:56 +09:00
myname
5ab54801d2 2023-09-14 11:23 쿼리 변경(C->T) 2023-09-14 11:24:11 +09:00
hylee
df4c49aa82 Merge branch 'hylee' into advc 2023-09-14 11:05:51 +09:00
hylee
d4c0e759b3 [관리자]기소유예관리 구현 2023-09-14 11:05:00 +09:00
myname
4a8ac94fd5 Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc 2023-09-14 10:29:11 +09:00
myname
571d576178 2023-09-14 10:28 쿼리 변환(C->T) 2023-09-14 10:28:52 +09:00
subsub
735a34e8ca 2023/09/13 header 오류 수정 2023-09-13 18:19:44 +09:00
subsub
9cd2f0b5d3 Merge branch 'advc' of 
http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc

Conflicts:
	src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
 2023-09-13 17:51:42 +09:00
subsub
7f2b401ec9 2023/09/13 header 교육기부 우수기관 추가 2023-09-13 17:45:33 +09:00
jiwoo
205a903af8 Merge branch 'JIWOO' into advc 2023-09-13 14:15:34 +09:00
jiwoo
412feb7a0e 이지우 - 로그인 진행 중 & profiles.active가 tLocal일 경우 로그인 처리 추가 2023-09-13 14:14:50 +09:00