Commit Graph

311 Commits

Author SHA1 Message Date
yoon
8419f76386 프로젝트 정렬 및 로그 조회 로직 수정 2025-03-07 11:13:21 +09:00
4490655eab 게시글 수정 관련
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-03-07 10:19:32 +09:00
b7435d82f4 Merge branch 'khj' into main 2025-03-06 15:27:10 +09:00
9777553500 용어집 수정 2025-03-06 15:26:35 +09:00
yoon
7caaa0dd81 회원가입 시 색상 체크 2025-03-06 13:14:28 +09:00
yoon
24aea013bc 주석 추가 2025-03-06 13:14:10 +09:00
yoon
963ff1f106 Merge branch 'main' into yoon 2025-03-06 09:29:12 +09:00
278605e5d9 게시판 수정 2025-03-04 17:43:26 +09:00
b906ed74a7 게시판 파일다운 추가 2025-03-04 17:00:28 +09:00
f145f6dbaa 123
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-03-04 11:20:07 +09:00
9e141789ae 연차계산 로직 수정
Some checks are pending
LocalNet_front/pipeline/head Build started...
LOCALNET-DEV/pipeline/head This commit looks good
2025-02-28 16:21:36 +09:00
yoon
0e4a9e6716 연도 최신순 정렬 2025-02-28 15:50:21 +09:00
df70d798d3 Merge branch 'main' of
http://192.168.0.251:3000/localnet/localhost-back.git into main
2025-02-28 13:06:48 +09:00
6fbc38e117 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-28 13:05:38 +09:00
55c911a121 휴가관리 수정 2025-02-28 13:05:26 +09:00
daca8ffd34 Merge branch 'khj' into main 2025-02-27 16:17:52 +09:00
772efb8d96 조회수정 2025-02-27 16:17:21 +09:00
6d46c07b29 Merge branch 'main' of
http://192.168.0.251:3000/localnet/localhost-back.git into main
2025-02-27 14:39:50 +09:00
741fc0260e Merge branch 'khj' into main 2025-02-27 13:28:53 +09:00
f119c4724a 투표수정 2025-02-27 13:28:32 +09:00
yoon
d6f205f332 Merge branch 'main' into yoon 2025-02-27 13:27:20 +09:00
yoon
ebab4bb51e 삭제 추가 2025-02-27 13:24:06 +09:00
c94c6bd8e3 Merge branch 'vacation' into main 2025-02-27 13:20:58 +09:00
5835b39da7 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-27 13:16:42 +09:00
1345a5ce0b Merge remote-tracking branch 'origin/jihee' into main 2025-02-27 13:16:25 +09:00
11f1503d1e 휴가수정 2025-02-27 13:07:25 +09:00
yoon
54bb4d4cc9 .
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-02-25 13:37:02 +09:00
yoon
ec5dd31c0d . 2025-02-25 13:36:04 +09:00
17552d0867 용어집 수정 BlobUtil 추ㅏㄱ 2025-02-25 13:20:13 +09:00
231b763f7c blob 공통으로 분리 2025-02-25 10:50:29 +09:00
yoon
41372391de 주석 변경 2025-02-25 09:50:58 +09:00
yoon
68281f0874 Merge branch 'main' into yoon 2025-02-25 09:50:29 +09:00
yoon
a7e3dfd23d Merge branch 'main' into yoon 2025-02-25 09:47:48 +09:00
yoon
2c5705088b . 2025-02-25 09:47:06 +09:00
3192db220d 게시판 수정 2025-02-24 16:10:05 +09:00
fec0172d66 게시판 댓글 수정 2025-02-24 15:04:53 +09:00
1563af1d6b Merge branch 'khj' into main 2025-02-24 13:35:28 +09:00
972c18d1cb 수정 2025-02-24 13:34:59 +09:00
e9e6431d77 쿠키 partitioned: true 설정 2025-02-24 13:24:31 +09:00
51142afa61 게시판 쿼리문 수정 2025-02-24 13:09:20 +09:00
yoon
2f83264ce0 전화번호 중복체크, 회원가입 시 프로젝트 멤버 테이블에 자동 insert (미참여 형태로) 2025-02-24 12:01:50 +09:00
d09d313958 s 2025-02-24 11:09:51 +09:00
c721da3d6f . 2025-02-24 11:07:24 +09:00
87f425bed2 임시 https 설정
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-02-24 09:59:28 +09:00
yoon
7e8090dead 비밀번호 중복체크 2025-02-22 18:08:43 +09:00
873910358c 휴가 수정 2025-02-21 16:21:03 +09:00
8e64369b77 게시판 글작성 수정 2025-02-21 11:00:03 +09:00
yoon
77af3859f2 Merge branch 'main' into yoon 2025-02-21 09:18:50 +09:00
yoon
b538979ed6 프로젝트 목록 검색 + 카테고리 2025-02-21 09:18:20 +09:00
51c2eb8f01 대댓글 mapper 매핑 수정(기존:boardMapper.selectCommets ->
boardMapper.selectREply)
2025-02-21 09:04:27 +09:00
e2ef67a3d9 휴가 수정 2025-02-20 16:19:52 +09:00
ab66477be2 투표 조회 쿼리 수정 2025-02-20 14:59:27 +09:00
16a2f1ce82 Merge branch 'khj' into main 2025-02-20 11:19:02 +09:00
b6097165ca Merge branch 'khj' into main 2025-02-20 11:17:47 +09:00
7c7ddb6eca 필요없는import제거 2025-02-20 11:17:20 +09:00
68b8a26322 수정 2025-02-20 11:16:48 +09:00
96c5a349c7 성공시 메시지만 반환하는 메소드 추가 2025-02-20 11:11:53 +09:00
1e1b313a6e 대댓글 수정 2025-02-20 10:47:15 +09:00
b4c49fbe58 댓글 좋아요/싫어요 수정 2025-02-20 10:36:05 +09:00
b09f4cda2f 2025-02-18 16:05:00 +09:00
yoon
b8bee16816 Merge branch 'main' into yoon 2025-02-18 13:04:38 +09:00
c27687438c 에디터 수정, 게시판 메소드명 수정 2025-02-18 12:59:04 +09:00
yoon
cf4e687aab Merge branch 'main' into yoon 2025-02-18 11:15:51 +09:00
yoon
8b39912927 프로젝트 목록 2025-02-18 11:14:52 +09:00
12cd70c96d 권한 수정 2025-02-18 11:11:40 +09:00
9bab7cdffc 게시판 유저아이디값 수정 2025-02-18 10:05:25 +09:00
yoon
59d193733c get -> select 2025-02-17 15:02:59 +09:00
yoon
733389a2a3 Merge branch 'main' into yoon 2025-02-17 14:29:06 +09:00
yoon
ac5629c155 get -> select 2025-02-17 14:28:40 +09:00
103768d903 Merge branch 'khj' into main 2025-02-17 13:16:39 +09:00
5d791bbb3e 투표 추가 2025-02-17 13:16:09 +09:00
yoon
56edd2bc41 Merge branch 'main' into yoon 2025-02-17 10:33:17 +09:00
yoon
f33fd48eef 프로젝트 목록 리스트 2025-02-17 10:32:53 +09:00
yoon
aeb96802f9 getInt 추가 2025-02-17 10:32:40 +09:00
yoon
40932759a9 필요없는 로직 삭제 2025-02-17 10:32:29 +09:00
yoon
5539432b61 주석 변경 2025-02-17 10:31:58 +09:00
1563e9409a 휴가관리 기능 추가 2025-02-14 16:23:33 +09:00
9612b091ba 게시판,휴가 수정 2025-02-14 14:06:05 +09:00
e9c007d081 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-13 16:24:46 +09:00
ea3ce3b517 휴가관리 사원 연차사용정보 추가 2025-02-13 16:24:38 +09:00
yoon
2641cb258f "/api/project/**", ROLE_MEMBER 추가 2025-02-13 15:19:35 +09:00
yoon
7c3f646b36 updateColorYon map으로 변경 2025-02-13 15:19:04 +09:00
712ae8e9c2 개발용 세션 쿠키 내리기
차후 삭제*
2025-02-13 11:55:48 +09:00
0d6594b439 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-13 11:44:32 +09:00
87215dba93 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-11 16:18:52 +09:00
6456a6d1c8 휴가 수정 2025-02-11 16:18:45 +09:00
yoon
16ce027be9 project 경로 member 권한 추가 (테스트) 2025-02-11 09:55:39 +09:00
yoon
0779f6a2c8 프로젝트 년도 불러오기 2025-02-11 09:55:19 +09:00
bb886bf0cf d 2025-02-10 15:55:45 +09:00
331b5d53f5 s 2025-02-10 15:13:37 +09:00
2d0e4a9b5a 22 2025-02-10 14:33:15 +09:00
d8c653618c memberseq 임의값으로 수정(임시) 2025-02-10 14:28:44 +09:00
8d88545c2b Merge branch 'khj' into main 2025-02-10 10:53:14 +09:00
9c61c36928 용어집 userid 임시 2025-02-10 10:52:52 +09:00
yoon
691ffbff94 기존 비밀번호 체크 2025-02-10 10:18:57 +09:00
d1fc85c0f6 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-07 18:44:50 +09:00
87a9240a97 휴가관리,보드컨트롤러 수정 2025-02-07 16:20:03 +09:00
f8da4b8b0b Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-07 16:08:42 +09:00
bbb1bc4eae 게시판 로그링정보 수정 2025-02-07 15:25:28 +09:00
yoon
8fa323414a map으로 변경 2025-02-07 14:49:08 +09:00
d8f36fbf17 Merge branch 'khj' into main 2025-02-07 14:13:01 +09:00
32c0b31b5d 파람수정 2025-02-07 14:12:36 +09:00
yoon
fe9ac2f2e1 Merge branch 'main' into yoon 2025-02-07 14:08:27 +09:00
yoon
1a3c1333e3 게시판 권한 설정 2025-02-07 14:05:46 +09:00
yoon
7cadf7722d 필요없는 코드 삭제 2025-02-07 14:04:58 +09:00
78329b0502 필요ㅓ없는 코드삭제 2025-02-07 14:03:23 +09:00
275fe94c5a 용어집 수정 2025-02-07 14:01:57 +09:00
yoon
019300e662 Merge branch 'main' into yoon 2025-02-06 14:27:07 +09:00
yoon
74272f3233 비밀번호 재설정 2025-02-06 14:22:09 +09:00
yoon
7b32de158b 비밀번호 힌트 목록 불러오기 2025-02-06 14:21:31 +09:00
7dea689165 게시판 수정 2025-02-04 16:08:03 +09:00
50d3787a69 공통코드사용 수정 2025-02-03 16:16:46 +09:00
849b99e475 보드수정 2025-02-03 15:33:02 +09:00
358e12a222 유저 목록 수정 2025-02-03 15:09:30 +09:00
yoon
856dd1b618 Merge branch 'main' into yoon 2025-02-03 14:44:49 +09:00
yoon
7929d5a199 서비스 이름 변경 2025-02-03 14:44:11 +09:00
yoon
d3dde19c6a 주석 변경 2025-02-03 14:43:54 +09:00
yoon
1d3f7d7ddc login token 2025-02-03 14:43:38 +09:00
f2c330577a Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-01-24 14:45:00 +09:00
dce245ab71 파일용량제한검사 2025-01-24 14:44:47 +09:00
22afbcb093 프로필 경로 설정 2025-01-24 14:29:35 +09:00
yoon
b2e86d5350 Merge branch 'main' into yoon 2025-01-24 14:26:25 +09:00
yoon
237e60d1a7 프로필 파일 경로 변경, 허가여부 Y 2025-01-24 14:25:57 +09:00
9deed49a02 게시판 첨부파일 수정 2025-01-24 13:53:00 +09:00
873463f538 조회수 수정 2025-01-24 13:36:40 +09:00
165f9d7fd5 사원id 임시사용 추가 2025-01-24 12:54:54 +09:00
e9a4cf1276 보드서비스수정 2025-01-24 12:51:05 +09:00
b72ce018d5 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-01-24 12:38:36 +09:00
d42e4fa0ca 본문 이미지 수정 2025-01-24 12:38:24 +09:00
yoon
8972228213 다시 수정 2025-01-24 11:06:34 +09:00
yoon
4795be7748 file 명 변경 2025-01-24 10:56:33 +09:00
dac68fc3eb 수정 2025-01-24 10:29:41 +09:00
yoon
ea9870be56 file 파라미터명 변경 2025-01-24 10:00:53 +09:00
yoon
a479a60449 file-size 변경 2025-01-24 10:00:41 +09:00
yoon
5e35130d3c 상세주소, 생년월일 추가 2025-01-24 10:00:24 +09:00
9386b18ec4 게시글 작성 수정 2025-01-23 12:35:18 +09:00
yoon
aa91b4191c userController에 RegisterController 합침 2025-01-23 09:52:25 +09:00
yoon
69f3b46a49 server.servlet.murtipart -> Spring.servlet.murtipart
db정보 삭제
2025-01-23 09:51:54 +09:00
83a62afc8d handler Error 추가 2025-01-22 18:57:47 +09:00
d7ceef7d70 handler return 타입 수정 2025-01-21 22:51:50 +09:00
f065991a41 rememberMe 해결 2025-01-21 21:41:35 +09:00
yoon
b44906ad54 Merge branch 'main' into yoon 2025-01-21 20:46:40 +09:00
yoon
bb9553a033 등록 신청 컨트롤러, 서비스 2025-01-21 20:46:05 +09:00
yoon
a70de1f692 컬럼에 맞게 변경 2025-01-21 20:45:47 +09:00
yoon
379fef86e0 프로필 파일 업로드 서비스 2025-01-21 20:45:18 +09:00
yoon
1973322cbf member -> netmember 2025-01-21 20:35:43 +09:00
yoon
62a3de2161 member -> netmember db테이블 명으로 변경 2025-01-21 20:33:23 +09:00
a03c949853 정리 2025-01-21 15:43:11 +09:00
yoon
e7c4984c53 color, mbti, 등록신청 시 사용한 color 업데이트 2025-01-21 15:12:14 +09:00
yoon
ddefb2c3dc filePath profile 경로 추가 2025-01-21 15:11:27 +09:00