Commit Graph

514 Commits

Author SHA1 Message Date
236928f1da 권한부여 2025-03-14 13:58:15 +09:00
fe8abc7f7c 용어집 수정정 2025-03-14 13:16:47 +09:00
89b5a330d7 휴가,게시판에디터 수정 2025-03-14 10:23:50 +09:00
84f5cf4412 댓글 수정시 공백체크 2025-03-14 01:53:35 +09:00
ec2f7cae09 휴가 수정정 2025-03-13 16:16:55 +09:00
yoon
062742c602 Merge branch 'main' into commuters
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-13 12:15:29 +09:00
e9f7b5d358 Merge branch 'khj' 2025-03-13 12:09:09 +09:00
d38f89c5bc 휴가수정2 2025-03-13 12:08:39 +09:00
5f6a3c0fcf 투표cssㅜㅅ정정 2025-03-13 12:08:24 +09:00
be2608a112 비밀번호 자동입력 제외 추가, 버튼 위치 조정 2025-03-13 11:26:19 +09:00
yoon
495c714b80 Merge branch 'main' into commuters 2025-03-13 11:15:08 +09:00
yoon
a772a2b4e6 출퇴근 2025-03-13 11:14:38 +09:00
979321d533 . 2025-03-13 11:10:26 +09:00
a73ace7ac3 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-13 11:04:31 +09:00
45c1ddf17c 게시판 검색바 위치 수정 2025-03-13 11:04:29 +09:00
ff6a032cd6 Merge branch 'boardview' 2025-03-13 11:03:06 +09:00
5cb6f4ae38 인증 필요시 로그인 페이지 이동, 공통함수 설명 추가, 댓글 이미지 경로 변경(공통함수로), alert 을 토스트로 변경 2025-03-13 11:02:41 +09:00
2c1566f49e 게시판 리스트 css 수정 2025-03-13 10:59:35 +09:00
4a5ab6238c 게시판 에디터 사진넘치는거 수정 2025-03-13 10:21:20 +09:00
52c211bf08 Merge branch 'boardview' 2025-03-11 16:14:22 +09:00
5b84ef9350 삭제시 댓글 비밀번호 입력창 비활성화 2025-03-11 16:13:53 +09:00
ff663c0c39 휴가관리 2025-03-11 16:05:58 +09:00
69fb0669be 휴가 수정완
Some checks failed
LocalNet_front/pipeline/head There was a failure building this commit
2025-03-11 16:00:12 +09:00
a3ea106265 Merge branch 'boardmodify3' 2025-03-11 15:56:55 +09:00
1454719bae 1 2025-03-11 15:56:40 +09:00
d2bc6f4272 캘린더 높이 오토 2025-03-11 15:29:52 +09:00
3fa7eff7d9 휴가 저장 2025-03-11 15:17:16 +09:00
9c47467ba7 Merge branch 'boardmodify3' 2025-03-11 15:03:50 +09:00
757370cf91 다운로드 드랍다운 메뉴 우측에 안가리게 z-index 수정 2025-03-11 15:03:30 +09:00
ac8daab212 휴가 로그삭제제
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-11 14:36:56 +09:00
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
72f3622216 Merge branch 'boardmodify3' 2025-03-11 13:59:39 +09:00
538413c963 익명일때 수정,삭제 비밀번호 폼 한번 더 클릭시 폼 닫히게 2025-03-11 13:59:21 +09:00
10c429f9f1 휴가 기능오류수정 2025-03-11 13:57:36 +09:00
6e161fc2b3 Merge branch 'boardmodify3' 2025-03-11 13:35:03 +09:00
ef1101d9ee 수정 토글 닫기도 되게 수정 2025-03-11 13:33:06 +09:00
5778a5dd4a Merge branch 'boardmodify3' 2025-03-11 12:38:18 +09:00
fb8c00fd6b 게시글 프로필 이미지 보이게 익명일경우도 익명이미지 노출하도록 2025-03-11 12:38:03 +09:00
8135926150 Merge branch 'style' 2025-03-11 10:48:38 +09:00
ff3bbebfd5 Merge branch 'main' into style 2025-03-11 10:47:53 +09:00
19fad56ae6 Merge branch 'boardmodify3' 2025-03-11 10:42:54 +09:00
7044526284 게시글 삭제 재수정 2025-03-11 10:42:37 +09:00
61935cfb68 Merge branch 'boardmodify3' 2025-03-11 10:38:47 +09:00
93f6d1f3b9 게시글 삭제 수정 2025-03-11 10:38:12 +09:00
ccc195435c Merge branch 'main' into board-ji 2025-03-11 10:34:51 +09:00
7ec6424667 댓글 삭제수정 2025-03-11 10:34:10 +09:00
0aad1516b7 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-11 10:21:43 +09:00
6d1905ba03 버튼변경경 2025-03-11 10:21:11 +09:00
yoon
400eadf3d9 휴가관리 aside style 수정 2025-03-10 21:58:23 +09:00
159dd41e4a Merge branch 'boardmodify3'
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-10 16:25:03 +09:00
c90220785c 수정시 공백체크, 수정 시 toast 2025-03-10 16:24:25 +09:00
915e2476e3 용어집 수정정 2025-03-10 15:18:07 +09:00
16b95d546c Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-10 13:00:38 +09:00
d5a62f832c 휴가 수정 2025-03-10 12:52:23 +09:00
3ac834dd4a 휴가 여려년도 삭제 수정 2025-03-10 10:21:23 +09:00
a76bfbcc25 익명이아닐경우비밀번호창안나오게&댓글maxlength설정 2025-03-10 10:08:40 +09:00
f7e11a5466 로딩삭제제 2025-03-07 16:24:35 +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
dae3ef8ede Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-07 14:22:40 +09:00
a4ee364aad Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-07 14:22:31 +09:00
e340319595 휴가 css 수정 2025-03-07 14:19:12 +09:00
627e29ec7a 인증 관련 토스트 제거 및 브라우저 비밀번호 저장안뜨게 2025-03-07 14:16:57 +09:00
144738028d 로딩 이미지 수정 2025-03-07 14:05:34 +09:00
dd855634a0 로딩 2025-03-07 13:37:54 +09:00
4641800676 수정정 2025-03-07 13:19:19 +09:00
39dd213949 Merge branch 'main' into loading 2025-03-07 13:13:04 +09:00
2cc3166756 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-07 13:11:18 +09:00
0d016ca2e1 휴가관리 로딩페이지 추가 2025-03-07 12:51:33 +09:00
2d29bc56ec 로딩페이지(게시판 상세,투표리스트) 2025-03-07 12:40:43 +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
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
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
243b970227 게시글 수정 화면 작업 2025-03-07 10:22:22 +09:00
21fb66bafe 화면 반응형으로 수정 2025-03-06 16:23:29 +09:00
63dacb4c3c Merge branch 'khj' 2025-03-06 15:29:59 +09:00
e5f821e15a 용어집 수정정 2025-03-06 15:29:19 +09:00
19ce33e503 수정 2025-03-06 15:09:36 +09:00
6904902755 휴가 css 수정 2025-03-06 15:02:15 +09:00
d74c0ddacb 버튼 간격 수정 및 비밀번호입력창 추가 2025-03-06 12:21:50 +09:00
cd1c707b12 휴가관리 수정 2025-03-06 12:17:52 +09:00
5ae3d3bc75 게시판 삭제된 댓글 안보이게 2025-03-06 09:47:37 +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
8bc2152490 콘솔 삭제 2025-02-28 14:44:30 +09:00
e8c35bba82 게시판 글쓰기 다시수정 2025-02-28 14:43:19 +09:00
Dang
64a915f0d8 용어집 수정 2025-02-28 14:40:57 +09:00
e63f9498bd isDeleted 수정중 2025-02-28 14:31:36 +09:00
86a6e5b27b 수정버튼 누르면 초기화 2025-02-28 14:12:33 +09:00
cdcc1cc552 Merge branch 'main' into board-write 2025-02-28 13:57:15 +09:00
6bff0e9ede 글쓰기 공백처리리 2025-02-28 13:56:51 +09:00
08dabf4191 Merge remote-tracking branch 'origin/main' into board-comment-2 2025-02-28 13:19:27 +09:00
613d9f4c16 이미 수정중이면 비밀번호 창 no 2025-02-28 13:17:12 +09:00
ac71a9aa1f 휴가관리 수정 2025-02-28 13:03:52 +09:00
421ec4eaec 익명 댓글 비밀번호 나오는곳 수정해야함 2025-02-28 13:02:55 +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
2cc280717d . 2025-02-28 10:09:45 +09:00
d1c91b30df 주석 삭제 2025-02-28 10:01:53 +09:00
d954a1b68c 댓글 수정 2025-02-28 00:58:38 +09:00
0968a616b6 익명 댓글 수정 완료 2025-02-27 16:46:49 +09:00
e30dd8f7b0 익명 댓글 수정 수정중 2025-02-27 16:35:20 +09:00
b02d99e4b1 댓글 익명 체크 수정 완료 2025-02-27 16:23:45 +09:00
07740d0a96 Merge branch 'main' into board-comment-2 2025-02-27 14:51:19 +09:00
Dang
3a78dc6355 용어집 수정 2025-02-27 14:21:19 +09:00
00f632e607 콘솔삭제 2025-02-27 13:59:20 +09:00
0c67d70233 휴가,css 2025-02-27 13:38:51 +09:00
2eea7d3f53 Merge remote-tracking branch 'origin/wordDict' 2025-02-27 13:23:29 +09:00
beb05db225 Merge branch 'khj' 2025-02-27 13:08:34 +09:00
7f71d5b589 투표수정정 2025-02-27 13:06:35 +09:00
92904c5001 Merge branch 'vacation' 2025-02-27 13:06:29 +09:00
80e59e4355 vacation 수정, 게시판 글쓰기 수정 2025-02-27 13:05:10 +09:00
4145fdc445 .. 2025-02-27 12:45:43 +09:00
9293bba077 비밀번호 확인부터 2025-02-27 12:41:31 +09:00
Dang
3d41dc7730 용어집 수정 2025-02-27 11:23:56 +09:00
bb1715c71b 휴가 수정정 2025-02-27 10:33:48 +09:00
ed02d33099 검색창 엔터 2025-02-27 09:54:29 +09:00
22741cb803 검색 결과 없을시 2025-02-27 09:51:06 +09:00
bd91e0a72d 보드 원복복 2025-02-25 16:27:22 +09:00
yoon
9087d605e2 Merge branch 'main' into commuters 2025-02-25 15:52:57 +09:00
56757155ee Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-25 15:26:30 +09:00
47ab2b6054 투표수정정 2025-02-25 15:25:56 +09:00
9984800c6b 머지충돌해결,댓글대댓글 익명저장 2025-02-25 14:27:15 +09:00
yoon
56fc9615de Merge branch 'main' into commuters 2025-02-25 14:21:05 +09:00
yoon
008fd6c9a9 Merge branch 'main' into wordDict 2025-02-25 14:20:22 +09:00
yoon
8ffb483aa1 파일 명 변경 2025-02-25 14:18:48 +09:00
b2eafbb9aa Merge branch 'board-comment' 2025-02-25 14:12:56 +09:00
f71651729e 휴가css 수정정 2025-02-25 14:09:31 +09:00
Dang
72c2865b0b 용어집 수정 2025-02-25 14:08:33 +09:00
b0735cfec0 휴가관리 수정 및 공통포맷분리 2025-02-25 12:29:35 +09:00
a2da67b043 복구 2025-02-25 10:13:29 +09:00
99d89008ed 댓글과 대댓글 익명으로 저장장 2025-02-25 10:04:41 +09:00
efbeee855a 휴가관리 수정정 2025-02-24 15:29:32 +09:00
5f80998da8 익명 확인중 2025-02-24 15:26:39 +09:00
170e472815 익명부분 수정중 2025-02-24 15:11:37 +09:00
a935bcf4d5 로그인 익명 진행중 2025-02-24 14:04:17 +09:00
09e79cb690 휴가 선택 활성화 수정정 2025-02-24 13:58:48 +09:00
02f0cda3b4 Merge branch 'khj' 2025-02-24 13:21:20 +09:00
213329198f 용어집 수정정 2025-02-24 13:20:48 +09:00
f2b364f4f8 휴가관리 수정 2025-02-24 12:08:02 +09:00
ce1ecb5897 휴가 수정정 2025-02-21 16:21:26 +09:00
9bc34a02fc 에러메세지 2025-02-21 16:03:21 +09:00
yoon
0df7c5aec9 Merge branch 'main' into commuters 2025-02-21 14:53:24 +09:00
yoon
2aa2c97ae5 출퇴근 현황 추가 2025-02-21 14:43:37 +09:00
6e4382f473 board-comment 다시머지지 2025-02-21 14:34:35 +09:00
692d363756 Merge remote-tracking branch 'origin/wordDict' 2025-02-21 14:32:42 +09:00
8d6ae54a9b 익명 수정 2025-02-21 14:18:08 +09:00
Dang
c612a8a90f 용어집 수정 및 삭제 2025-02-21 14:01:28 +09:00
4076507fb7 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-21 13:08:51 +09:00
c6bb8788d8 익명 null 수정 2025-02-21 13:04:53 +09:00
cd01f0767e . 2025-02-21 12:58:11 +09:00
c88b01f78f 댓글 수정 삭제 보완 2025-02-21 12:29:16 +09:00
8d2799e0a1 댓글 수정 삭제 완 2025-02-21 11:54:54 +09:00
909be29d74 공휴일js 공통으로뻄 2025-02-21 10:46:46 +09:00
3779e63142 리스트 빨간글씨삭제 2025-02-21 10:36:12 +09:00
a2551e0e58 . 2025-02-21 09:56:39 +09:00
c46bda283f Merge remote-tracking branch 'origin/main' into board-comment 2025-02-21 09:55:47 +09:00
3f4743cac2 댓글 비밀번호 진행중 2025-02-21 09:52:10 +09:00
04b7db1560 board-list-d머지 2025-02-21 09:50:09 +09:00
62361b7ae9 댓글 비밀번호 진행중 2025-02-21 03:50:17 +09:00
87acf373d9 댓글 삭제 진행중 2025-02-20 18:58:53 +09:00
917b701663 . 2025-02-20 16:59:42 +09:00
a21bf8f6a1 대댓글 2025-02-20 16:57:27 +09:00
fdb2d81e53 대댓글 수정중 2025-02-20 16:54:37 +09:00
yoon
c1c4f68901 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-20 15:25:12 +09:00
Dang
018d5fa4f9 Merge remote-tracking branch 'origin/main' into wordDict 2025-02-20 15:21:46 +09:00
91d2492c13 휴가 삭제기능 2025-02-20 15:21:08 +09:00
4440946c74 익명일때 익명 체크박스 2025-02-20 15:20:07 +09:00
f7617e11a6 댓글 좋아요 2025-02-20 15:12:12 +09:00
Dang
8e20066b87 용어집 수정 2025-02-20 14:19:35 +09:00
2226782662 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-20 12:35:46 +09:00
e2d765cb15 게시판 수정, 삭제 완료 2025-02-20 12:33:10 +09:00
5c88ea3115 메인 비밀번호 입력창 2025-02-20 12:09:42 +09:00
5ece56e31d . 2025-02-20 10:56:29 +09:00
yoon
d6883c3a34 Merge branch 'main' into wordDict 2025-02-20 09:20:57 +09:00
bba4c60cb2 대댓글 수정중 2025-02-19 23:38:40 +09:00
8c29873731 머지 2025-02-18 14:46:20 +09:00
656b7f92ca 페이지네이션 완료 2025-02-18 14:31:20 +09:00
2c28645488 머지 2025-02-18 14:30:14 +09:00
Dang
8b56ce4e42 작업 내용 설명 2025-02-18 14:26:24 +09:00
6890269faa 페이지네이션 진행중 2025-02-18 14:13:25 +09:00
922b7e0904 ㅇㅇ 2025-02-18 13:19:21 +09:00
9a5261bbc7 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-18 13:04:53 +09:00
27f5db0c6c Merge branch 'main' into wordDict 2025-02-18 11:19:36 +09:00
Dang
e4c8c19d7b Merge remote-tracking branch 'origin/main' into wordDict 2025-02-18 11:15:57 +09:00
46db001c56 Merge branch 'khj' 2025-02-18 11:12:53 +09:00