Commit Graph

538 Commits

Author SHA1 Message Date
9c28054001 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-28 18:50:43 +09:00
8d1748548e 파일선택 > 삭제했다가 다시 파일선택시 안들어감 2025-03-28 18:48:23 +09:00
5c5a2c63ef Merge branch 'main' into board-ji 2025-03-28 16:33:49 +09:00
9035d339ac 수정 에디터 2025-03-28 16:32:53 +09:00
ad3af31e37 검색 필터링 유지 2025-03-28 16:18:06 +09:00
d47ee95f56 공지 좋아요,댓글 없게 2025-03-28 15:23:34 +09:00
f733569211 Merge branch 'khj'
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-28 13:44:15 +09:00
7485b6e7c8 종료날짜 vaild 추가가 2025-03-28 13:43:51 +09:00
008adac7a5 Merge branch 'main' into board-ji 2025-03-28 13:19:35 +09:00
1dcde5eb6b 글수정 2025-03-28 13:17:33 +09:00
9bfd16efa2 Merge branch '250328_like_dislike' 2025-03-28 13:08:36 +09:00
ad4bcb511f 댓글 사용자 좋아요 싫어요 상태 업데이트 2025-03-28 13:08:21 +09:00
fdb1f6f339 Merge branch '250328_like_dislike' 2025-03-28 12:28:23 +09:00
3f8718831f 사용자의 게시글 좋아요 싫어요 상태 업데이트 2025-03-28 12:27:26 +09:00
d4bfc164a4 공지 복구 2025-03-28 11:19:41 +09:00
e447968ecf 게시글 수정 시 상세 페이지로 이동 하도록 변경 2025-03-28 10:29:11 +09:00
3b50c84118 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-28 10:08:29 +09:00
416ec12a20 250328 10am 2025-03-28 10:08:22 +09:00
6c7ccff8ea 공지사항 댓글,좋아요기능 삭제 2025-03-28 10:07:13 +09:00
a540feb851 250328_work 2025-03-28 09:22:44 +09:00
4a8f74c357 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-28 01:10:20 +09:00
de04cf679b 검색/페이징/필터링 후 수정시 검색어/페이징 풀림 2025-03-28 01:08:01 +09:00
42987e8554 공지 댓글 삭제 2025-03-27 16:22:17 +09:00
09afafdab1 수정정 2025-03-27 15:41:33 +09:00
c3d22b3e4f 검색수정정 2025-03-27 14:39:15 +09:00
f23a7a7e89 영역 수정정 2025-03-27 14:24:57 +09:00
838640e2d4 Merge branch 'khj' 2025-03-27 13:53:47 +09:00
e6242771b0 용어집수정정 2025-03-27 13:53:19 +09:00
fdf439246e 휴가 수정 2025-03-27 13:37:23 +09:00
c4ff151581 250327 작업 2025-03-27 12:04:07 +09:00
cdb40ed942 삭제된 댓글일떄 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-27 11:08:40 +09:00
b25d6758de 휴가 -3개이상 사용 x 2025-03-27 10:30:15 +09:00
9564788ad8 Merge branch 'main' into board-ji 2025-03-27 09:36:28 +09:00
031c5f35c6 비밀번호 입력 maxlength 8로 변경 2025-03-25 16:14:11 +09:00
c8662e72bf 휴가선물 마이너스일 때 불가능 2025-03-25 16:06:14 +09:00
bcf8e21ccd Merge branch 'khj' 2025-03-25 15:03:35 +09:00
4abb705a39 카드 크기 조정정 2025-03-25 15:03:09 +09:00
b7026afcbd 익명 댓글 수정 할 때 삭제 버튼 두 번 눌러야지 input나옴 >> 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-25 12:43:45 +09:00
30e06407e3 Merge branch '250325_board' 2025-03-25 12:28:10 +09:00
e6e2062474 수정 시 목록으로 이동에서 > 상세로 이동 2025-03-25 12:27:37 +09:00
46d9801689 Merge branch 'khj' 2025-03-25 11:04:43 +09:00
1dceec000c 수정사항 수정정 2025-03-25 11:04:08 +09:00
33cd40038f 커스텀 버튼 추가 2025-03-25 10:44:09 +09:00
0636f74c9b 이미 사용된 타입휴가 활성화 방지 2025-03-25 10:35:09 +09:00
52d520f5e4 게시글 에디터 이미지 수정, 제거 로직 추가 2025-03-24 14:01:06 +09:00
yoon
aa22023ca3 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-21 19:56:01 +09:00
yoon
fbb42682f0 용어집 css, 로직변경 2025-03-21 19:55:56 +09:00
7c5437312b Merge branch 'khj' 2025-03-21 15:05:09 +09:00
93d840cf5a 투표수정정 2025-03-21 15:04:27 +09:00
923f2683f0 . 2025-03-21 14:11:43 +09:00
1786d03061 체크박스 2025-03-21 14:11:04 +09:00
bbcce3b308 .
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-21 12:21:29 +09:00
a37d5378aa . 2025-03-21 12:19:26 +09:00
31ccd0c911 데이트 피커 위치조정 2025-03-21 11:20:58 +09:00
be3f8a8b36 댓글작성 수정정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-21 10:56:56 +09:00
e8753588ca 익명 닉네임 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-21 10:46:58 +09:00
8324095bf4 Merge branch 'main' into vacation 2025-03-21 10:16:11 +09:00
724816eb82 게시물 닉네임 수정,회원등록 경고문구 css 수정 2025-03-21 10:14:50 +09:00
93953aedcc 에디터 첨부파일 인덱스 업데이트 로직 추가 2025-03-20 16:12:54 +09:00
ae9c8735b1 커스텀 css 수정 2025-03-20 16:06:11 +09:00
7d70aef38d 폼 눌러도 달력 나오게 2025-03-20 16:02:50 +09:00
f3b7ae315f 날짜 폼만 눌러도 나오게 2025-03-20 15:26:32 +09:00
204b7a28a5 Merge branch 'khj' 2025-03-20 14:56:28 +09:00
946ec28ec8 투표수정정 2025-03-20 14:56:00 +09:00
yoon
2c81f1c110 new 반짝반짝 2025-03-20 14:06:26 +09:00
yoon
32bd8998d4 css 2025-03-20 13:32:24 +09:00
8d9f297138 Merge branch 'main' into board-ji 2025-03-20 13:02:08 +09:00
b67076a3ca 게시판 익명 닉네임, 경고문구css 수정 2025-03-20 13:00:55 +09:00
733510213a Merge branch 'khj' 2025-03-20 10:53:38 +09:00
ca8ce5e59a 재수정정 2025-03-20 10:53:13 +09:00
0abaea33fd 수정정 2025-03-20 10:52:59 +09:00
bd5b1db86b 수정정 2025-03-20 10:52:19 +09:00
e955ac144a Merge branch 'vacation' 2025-03-20 10:25:25 +09:00
c75e8a51ea Merge branch 'khj' 2025-03-20 10:16:38 +09:00
d78fab2143 용어집수정정 2025-03-20 10:16:05 +09:00
28067c7f02 휴가 수정 2025-03-20 09:58:25 +09:00
50d3b0d257 휴가 로직 변경 2025-03-19 17:51:28 +09:00
6a8d1ff042 Merge branch 'main' into workMain 2025-03-18 21:34:02 +09:00
6d883aacb3 Merge branch 'main' into vacation 2025-03-18 15:52:46 +09:00
dfb2a3e57e 필터 날짜 및 페이지 개수 100개 추가 2025-03-18 15:48:45 +09:00
2be48fe901 workMainViewPublish 2025-03-18 12:52:12 +09:00
6613fed587 게시물이 없을 때
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-18 12:41:20 +09:00
3d7257338b Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-18 12:34:25 +09:00
8c89de1731 게시글 비밀번호 입력란 노출 로직 변경 2025-03-18 12:34:16 +09:00
f2ad06756b 캐치문 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-18 12:26:52 +09:00
00acd58995 에러페이지 수정 2025-03-18 12:23:23 +09:00
00b2fa8c0f Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-18 10:56:59 +09:00
29d8095107 댓글 노출 기본 최신순, 수정시 수정됨 문구 표기 2025-03-18 10:56:48 +09:00
b393a29026 수정정 2025-03-18 10:56:12 +09:00
03bb18a1e8 Merge branch 'khj' 2025-03-18 10:50:28 +09:00
b26cf05019 내가한투표수정정 2025-03-18 10:50:00 +09:00
6e3ab7acd1 권한부여 css 2025-03-18 10:30:52 +09:00
53061dc5f1 Merge branch 'khj' 2025-03-18 10:28:39 +09:00
cdb08511b7 투표 오류수정정 2025-03-18 10:28:09 +09:00
c730ea6cd3 댓글 업데이트 로직 변경
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-17 22:47:57 +09:00
8feaf568a9 Merge branch 'khj' 2025-03-17 15:59:49 +09:00
145c188d19 투표 본인 ㄴ비활성화 막음음 2025-03-17 15:59:20 +09:00
yoon
0d05666532 board css 수정 2025-03-17 15:45:28 +09:00
cc8e347aa9 로딩 수정 2025-03-17 15:10:07 +09:00
ce1011b96f . 2025-03-17 15:00:56 +09:00