Commit Graph

293 Commits

Author SHA1 Message Date
ada6654edd 휴가쿼리문 수정
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-03-17 12:32:16 +09:00
e9f4cb2fc5 Admin 권한 2025-03-17 12:06:33 +09:00
yoon
778ffb5edf 필요없는 import 삭제 2025-03-17 12:04:38 +09:00
yoon
2a730cdf0b Merge branch 'main' into yoon 2025-03-17 12:02:50 +09:00
yoon
606c3c586c 개인참여기간 추가 2025-03-17 12:01:39 +09:00
e7d6db5e94 Merge branch 'khj' into main 2025-03-17 11:13:20 +09:00
920af2adfe Merge branch 'khj' into main 2025-03-17 10:55:14 +09:00
dfca1a9ee2 수정 2025-03-17 10:54:42 +09:00
yoon
558e732f62 Merge branch 'main' of
http://192.168.0.251:3000/localnet/localhost-back.git into main
2025-03-17 09:38:21 +09:00
87bf1c37de 관리자권한부여 2025-03-14 13:16:31 +09:00
yoon
1673ddccac get -> select 변경 2025-03-14 12:12:06 +09:00
yoon
214f4ec8a0 Merge branch 'main' into yoon
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-03-13 12:14:10 +09:00
yoon
d0f9cefa80 출퇴근 2025-03-13 12:13:31 +09:00
d34fdf1fda 응답용 프로세스 변경 2025-03-13 11:00:45 +09:00
c182f749b8 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-03-13 10:37:23 +09:00
c277eb1a27 응답 처리 변경 2025-03-13 10:37:16 +09:00
yoon
1c42e51664 주석 수정 2025-03-12 21:39:05 +09:00
cae7928017 휴가 쿼리문 수정 2025-03-11 16:14:09 +09:00
f52b5be47c Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-03-11 12:46:49 +09:00
a125ad3c25 게시글 및 댓글 이미지 조회 프로세스 추가 2025-03-11 12:45:20 +09:00
3d03663896 댓글 삭제 수정 2025-03-11 10:33:37 +09:00
799945e154 게시판 댓글갯수 수정
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-03-10 15:49:27 +09:00
yoon
0f2777916e Merge branch 'main' into yoon 2025-03-10 15:46:32 +09:00
yoon
e8ae11250e 출퇴근 2025-03-10 15:45:58 +09:00
yoon
eb7b65aed7 연도 불러오기 쿼리 변경 2025-03-10 15:45:50 +09:00
8f3f5901da 댓글 대댓글 조회쿼리 최신순으로 변경
All checks were successful
LOCALNET-DEV/pipeline/head This commit looks good
2025-03-10 11:18:05 +09:00
yoon
b29c2df5e3 사용자가 속한 프로젝트 조회 쿼리 변경 2025-03-10 10:26:39 +09:00
yoon
1326e0e33f Merge branch 'main' into yoon 2025-03-09 20:48:16 +09:00
yoon
fb4c2c2180 사용자가 속한 프로젝트 조회 2025-03-09 20:47:38 +09:00
2a9fc778fb 코드수정 2025-03-07 16:19:11 +09:00
269c80eb95 Merge branch 'khj' into main 2025-03-07 13:33:05 +09:00
yoon
7091e41a18 Merge branch 'main' into yoon 2025-03-07 11:14:06 +09:00
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