Commit Graph

536 Commits

Author SHA1 Message Date
c9271aebfc 휴가 수정 2025-03-11 14:35:45 +09:00
936be84a6f Merge branch 'khj' 2025-03-11 14:27:01 +09:00
058f0c00fa 투표수정정 2025-03-11 14:26:30 +09:00
10c429f9f1 휴가 기능오류수정 2025-03-11 13:57:36 +09:00
bd3d689ddd Merge branch 'boardmodify3' 2025-03-11 12:51:40 +09:00
003e9da85e console 제거 2025-03-11 12:51:21 +09:00
5778a5dd4a Merge branch 'boardmodify3' 2025-03-11 12:38:18 +09:00
fb8c00fd6b 게시글 프로필 이미지 보이게 익명일경우도 익명이미지 노출하도록 2025-03-11 12:38:03 +09:00
e04d1c65fe 휴가css 수정 2025-03-11 11:09:26 +09:00
408c72d3c0 Merge branch 'boardmodify3' 2025-03-11 11:03:33 +09:00
c3dabc4262 비밀번호 alert 노출위치 변경 2025-03-11 11:03:17 +09:00
ff3bbebfd5 Merge branch 'main' into style 2025-03-11 10:47:53 +09:00
23f39170da 버튼수정정 2025-03-11 10:29:42 +09:00
6d1905ba03 버튼변경경 2025-03-11 10:21:11 +09:00
yoon
65e620d579 Merge branch 'main' into commuters 2025-03-11 09:24:00 +09:00
yoon
400eadf3d9 휴가관리 aside style 수정 2025-03-10 21:58:23 +09:00
8c2bbe188b Merge branch 'khj' 2025-03-10 16:19:29 +09:00
f70096e975 카테고리 버튼 초기화 추가가 2025-03-10 16:18:24 +09:00
yoon
eca45a84c4 Merge branch 'main' into project-list 2025-03-10 15:45:01 +09:00
yoon
2f1464bf6b 날짜 min 2025-03-10 15:44:15 +09:00
c30ccea258 휴가 수정 2025-03-10 15:38:12 +09:00
915e2476e3 용어집 수정정 2025-03-10 15:18:07 +09:00
2aa31ab64f 수정 아이콘 수정정 2025-03-10 15:10:48 +09:00
d7cc2c056a Merge branch 'khj' 2025-03-10 15:05:07 +09:00
9e48e2bc03 수정정 2025-03-10 15:04:46 +09:00
yoon
c2bac1c3fb 전화번호 숫자만, 주소 디세이블, 컬러 변경 시 alert 2025-03-10 14:57:05 +09:00
yoon
1384ae571d 출근 2025-03-10 14:25:07 +09:00
aac2e21c08 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-10 14:24:49 +09:00
df024efdd3 댓글, 비밀번호 입력 감지 경고문구 제거 2025-03-10 13:02:09 +09:00
96b9e96d7a Merge branch 'khj' 2025-03-10 13:00:53 +09:00
16b95d546c Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-10 13:00:38 +09:00
1e50403e57 튜표 수정정 2025-03-10 13:00:15 +09:00
129cc04f53 Merge branch 'main' into vacation 2025-03-10 12:53:01 +09:00
d5a62f832c 휴가 수정 2025-03-10 12:52:23 +09:00
dc4ae608eb 1.대댓글 슬롯형태로 변경 2.대댓글익명클릭시해당대댓글에비밀번호입력이나오게수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-10 11:22:45 +09:00
3ac834dd4a 휴가 여려년도 삭제 수정 2025-03-10 10:21:23 +09:00
9c01a84749 Merge branch 'boardmodify3' 2025-03-10 10:09:30 +09:00
a76bfbcc25 익명이아닐경우비밀번호창안나오게&댓글maxlength설정 2025-03-10 10:08:40 +09:00
e9c0b09d93 Merge branch 'khj' 2025-03-07 16:21:31 +09:00
f2c231288c Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-07 16:20:27 +09:00
2bb292c48d 수정 투표표 2025-03-07 16:20:06 +09:00
bdcb75fc58 휴가css 수정정 2025-03-07 14:45:24 +09:00
dae3ef8ede Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-07 14:22:40 +09:00
e340319595 휴가 css 수정 2025-03-07 14:19:12 +09:00
627e29ec7a 인증 관련 토스트 제거 및 브라우저 비밀번호 저장안뜨게 2025-03-07 14:16:57 +09:00
4641800676 수정정 2025-03-07 13:19:19 +09:00
02b3c8dd41 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-07 12:16:04 +09:00
a2f2199587 수정 2025-03-07 12:15:41 +09:00
c733197336 Merge branch 'khj' 2025-03-07 12:13:07 +09:00
564e53b6f2 Merge branch 'main' into vacation-css 2025-03-07 12:12:45 +09:00
114b56ddc7 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-07 12:12:36 +09:00
yoon
3fe47a83bf Merge branch 'main' into project-list 2025-03-07 12:10:08 +09:00
yoon
cbc3c9dda5 종료된 프로젝트 관련 2025-03-07 12:09:37 +09:00
73b831a13f Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-07 12:09:36 +09:00
f7d688bb60 Merge branch 'main' into vacation-css 2025-03-07 11:21:19 +09:00
6e00c338ea 휴가 css 수정완 2025-03-07 11:20:27 +09:00
7a51ee37c8 수정정 2025-03-07 11:18:58 +09:00
a1de83b5cc 용어집 수정정 2025-03-07 11:12:56 +09:00
ad6ed9df55 Merge branch 'boardmodify'
All checks were successful
LocalNet_front/pipeline/head This commit looks good
123
2025-03-07 10:24:47 +09:00
21fb66bafe 화면 반응형으로 수정 2025-03-06 16:23:29 +09:00
63dacb4c3c Merge branch 'khj' 2025-03-06 15:29:59 +09:00
c3b1331128 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-06 15:29:39 +09:00
e5f821e15a 용어집 수정정 2025-03-06 15:29:19 +09:00
19ce33e503 수정 2025-03-06 15:09:36 +09:00
yoon
17fb20ae1e Merge branch 'main' into login 2025-03-06 13:16:47 +09:00
yoon
2331a345aa 회원가입 시 색상 체크 2025-03-06 13:16:07 +09:00
d74c0ddacb 버튼 간격 수정 및 비밀번호입력창 추가 2025-03-06 12:21:50 +09:00
cd1c707b12 휴가관리 수정 2025-03-06 12:17:52 +09:00
6ac3d587f8 아이콘 간격 수정 2025-03-06 12:15:37 +09:00
708309f6a0 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-06 09:50:56 +09:00
0cfeb2fc1d 게시판 댓글삭제제 2025-03-04 17:42:46 +09:00
27c9392d68 게시판 수정중 2025-03-04 16:37:49 +09:00
8f79ed6680 휴가리스트 댓글개수 2025-03-04 10:42:39 +09:00
497d45e6df Merge branch 'main' into board-comment-2 2025-02-28 14:58:20 +09:00
6df2f00306 Merge branch 'main' into wordDict 2025-02-28 14:53:16 +09:00
42c6a32c3f Merge remote-tracking branch 'origin/main' into board-comment-2 2025-02-28 14:45:18 +09:00
40584f0269 isDeleted 삭제후 메세지 남기기 하는중 2025-02-28 14:43:18 +09:00
Dang
64a915f0d8 용어집 수정 2025-02-28 14:40:57 +09:00
f5911247fb Merge branch 'board-comment-2' of http://192.168.0.251:3000/localnet/localhost-front into board-comment-2 2025-02-28 14:31:41 +09:00
e63f9498bd isDeleted 수정중 2025-02-28 14:31:36 +09:00
2a55574646 대댓글 익명일때 수정 2025-02-28 14:30:19 +09:00
yoon
6526e80879 색상 미리보기 추가 2025-02-28 14:09:27 +09:00
yoon
469688b2d0 지도 휠 안돼는거 수정 2025-02-28 14:09:13 +09:00
c68e8839b3 Merge remote-tracking branch 'origin/main' into board-comment-2 2025-02-28 14:07:19 +09:00
yoon
00a6e9f2e9 Merge branch 'main' into project-list 2025-02-28 14:06:10 +09:00
yoon
ea7735839f @input 추가 2025-02-28 14:05:27 +09:00
64cb7e30c1 대댓글 내용없을때 입력 안되게 2025-02-28 13:59:49 +09:00
yoon
6a7ed19d54 Merge branch 'main' into login 2025-02-28 13:39:48 +09:00
yoon
3eaafa606d color 색 미리보기 추가, mbti 이미지 추가 2025-02-28 13:38:53 +09:00
08dabf4191 Merge remote-tracking branch 'origin/main' into board-comment-2 2025-02-28 13:19:27 +09:00
ac71a9aa1f 휴가관리 수정 2025-02-28 13:03:52 +09:00
785df5c51f 비밀번호 입력창 초기화 2025-02-28 12:18:09 +09:00
3678b40e1c 댓글 수정중 2025-02-28 12:01:59 +09:00
4720e61958 warning수정 2025-02-28 11:09:10 +09:00
63f8f167eb 경고 수정중 2025-02-28 10:57:25 +09:00
yoon
3e0987657c Merge branch 'main' into login 2025-02-28 10:36:24 +09:00
yoon
e07593c13b 수정 리로드 삭제 2025-02-28 10:35:43 +09:00
yoon
8d14b0b214 수정시 바뀐거 없을 때 막기 2025-02-28 10:13:40 +09:00
yoon
86f85cce10 활성화 된 유저 앞으로 정렬 2025-02-28 10:13:23 +09:00
d1c91b30df 주석 삭제 2025-02-28 10:01:53 +09:00