Commit Graph

182 Commits

Author SHA1 Message Date
6affb7dade 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-17 13:06:58 +09:00
31cad333d1 게시글 수정 페이지 접근 시 비밀번호 확인 2025-03-17 13:06:48 +09:00
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
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
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
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
yoon
0e4a9e6716 연도 최신순 정렬 2025-02-28 15:50:21 +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
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
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
yoon
a7e3dfd23d Merge branch 'main' into yoon 2025-02-25 09:47:48 +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
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
yoon
7e8090dead 비밀번호 중복체크 2025-02-22 18:08:43 +09:00
873910358c 휴가 수정 2025-02-21 16:21: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
e2ef67a3d9 휴가 수정 2025-02-20 16:19:52 +09:00
ab66477be2 투표 조회 쿼리 수정 2025-02-20 14:59:27 +09:00
b6097165ca Merge branch 'khj' into main 2025-02-20 11:17:47 +09:00
68b8a26322 수정 2025-02-20 11:16:48 +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
8b39912927 프로젝트 목록 2025-02-18 11:14:52 +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
40932759a9 필요없는 로직 삭제 2025-02-17 10:32:29 +09:00
1563e9409a 휴가관리 기능 추가 2025-02-14 16:23:33 +09:00
9612b091ba 게시판,휴가 수정 2025-02-14 14:06:05 +09:00
ea3ce3b517 휴가관리 사원 연차사용정보 추가 2025-02-13 16:24:38 +09:00
yoon
7c3f646b36 updateColorYon map으로 변경 2025-02-13 15:19:04 +09:00
yoon
0779f6a2c8 프로젝트 년도 불러오기 2025-02-11 09:55:19 +09:00
331b5d53f5 s 2025-02-10 15:13:37 +09:00
87a9240a97 휴가관리,보드컨트롤러 수정 2025-02-07 16:20:03 +09:00
bbb1bc4eae 게시판 로그링정보 수정 2025-02-07 15:25:28 +09:00
yoon
8fa323414a map으로 변경 2025-02-07 14:49:08 +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
1d3f7d7ddc login token 2025-02-03 14:43:38 +09:00
yoon
8972228213 다시 수정 2025-01-24 11:06:34 +09:00
dac68fc3eb 수정 2025-01-24 10:29:41 +09:00
yoon
5e35130d3c 상세주소, 생년월일 추가 2025-01-24 10:00:24 +09:00
yoon
b44906ad54 Merge branch 'main' into yoon 2025-01-21 20:46:40 +09:00
yoon
62a3de2161 member -> netmember db테이블 명으로 변경 2025-01-21 20:33:23 +09:00
a03c949853 정리 2025-01-21 15:43:11 +09:00