Commit Graph

671 Commits

Author SHA1 Message Date
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
yoon
13a80e479a 로그인 오류 관련 alert 수정 2025-03-20 11:00:19 +09:00
733510213a Merge branch 'khj' 2025-03-20 10:53:38 +09:00
bd5b1db86b 수정정 2025-03-20 10:52:19 +09:00
e955ac144a Merge branch 'vacation' 2025-03-20 10:25:25 +09:00
3026550abe Merge branch 'main' into vacation 2025-03-20 10:24:52 +09:00
a50799c021 카테타입추가가 2025-03-20 10:18:39 +09:00
f8cf106a54 my work temp save 2025-03-20 10:17:03 +09:00
c75e8a51ea Merge branch 'khj' 2025-03-20 10:16:38 +09:00
d78fab2143 용어집수정정 2025-03-20 10:16:05 +09:00
f25ad7ffed 카테고리수정정 2025-03-20 10:11:13 +09:00
28067c7f02 휴가 수정 2025-03-20 09:58:25 +09:00
184bf4bd2b Merge branch 'main' into vacation 2025-03-20 09:46:50 +09:00
50d3b0d257 휴가 로직 변경 2025-03-19 17:51:28 +09:00
yoon
90d21869b3 프로젝트 참여자 관련 수정 2025-03-19 14:05:27 +09:00
6a8d1ff042 Merge branch 'main' into workMain 2025-03-18 21:34:02 +09:00
yoon
86602d7ffe 비밀번호 재설정 2025-03-18 16:01:46 +09:00
yoon
f1b113f2a6 수정 완료시 바로 반영 2025-03-18 15:58:54 +09:00
yoon
8c6e54316a 비밀번호 4자리 이상 2025-03-18 15:50:29 +09:00
2be48fe901 workMainViewPublish 2025-03-18 12:52:12 +09:00
yoon
4c380efec7 캘린더 반응형 css 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-18 12:50:43 +09:00
00acd58995 에러페이지 수정 2025-03-18 12:23:23 +09:00
yoon
adbc5d0383 투표 css 수정 2025-03-18 12:17:24 +09:00
yoon
e353309c19 아이콘 pe-none 2025-03-18 12:17:15 +09:00
yoon
bdf2bf41bf toast css 2025-03-18 11:03:06 +09:00
yoon
e79bbf207c 에디터 css 2025-03-18 10:42:33 +09:00
yoon
0e0c4ceed4 필요없는 코드 삭제 2025-03-18 10:35:15 +09:00
1a93a15b44 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-18 10:28:42 +09:00
53061dc5f1 Merge branch 'khj' 2025-03-18 10:28:39 +09:00
yoon
1fcff89176 커스텀 에러 처리 2025-03-18 10:28:30 +09:00
cdb08511b7 투표 오류수정정 2025-03-18 10:28:09 +09:00
yoon
942f2c660c Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-17 16:04:22 +09:00
yoon
2cc0db21ac btn css 수정 2025-03-17 16:04:19 +09:00
8feaf568a9 Merge branch 'khj' 2025-03-17 15:59:49 +09:00
145c188d19 투표 본인 ㄴ비활성화 막음음 2025-03-17 15:59:20 +09:00
yoon
0a514fa3a0 css 수정 2025-03-17 15:21:11 +09:00
yoon
1abd8f02d8 투표 css 2025-03-17 14:09:24 +09:00
69887a798f Merge branch 'khj' 2025-03-17 13:56:47 +09:00
4962ff4c92 용어어등록수정 2025-03-17 13:55:59 +09:00
626c8a97cb 익명 댓글과 회원 댓글 디폴트 이미지 구분
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-17 13:26:51 +09:00
yoon
1b83422555 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-17 13:22:53 +09:00
yoon
051bdcf0a0 style 삭제 2025-03-17 13:22:50 +09:00
90dc01b98d 게시글 답변 css 공통으로 변경 2025-03-17 13:19:24 +09:00
de9c8d5638 Merge branch 'khj' 2025-03-17 13:08:14 +09:00
55d9ea0ebe 버튼 수정 2025-03-17 13:07:44 +09:00
yoon
f7abeba675 개인참여기간 2025-03-17 12:00:26 +09:00
4258881d4b 용어집수정정 2025-03-17 10:24:41 +09:00
c51da7f56d 코드수정정 2025-03-14 15:37:42 +09:00
9e4207de95 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-14 15:27:43 +09:00
d5c54d8195 투표 수정 2025-03-14 15:26:50 +09:00
2166bc66a9 Merge branch 'main' into vacation 2025-03-14 14:32:21 +09:00
236928f1da 권한부여 2025-03-14 13:58:15 +09:00
fe8abc7f7c 용어집 수정정 2025-03-14 13:16:47 +09:00
24b75776df Merge branch 'board_comment5' 2025-03-14 10:53:04 +09:00
f761e3e15e 비밀번호 경고문 input 아래에 2025-03-14 10:52:30 +09:00
yoon
c0ea8469db 맨위로 가는 버튼 2025-03-14 10:48:22 +09:00
yoon
e949e4a0a8 Merge branch 'main' into commuters 2025-03-14 10:04:00 +09:00
yoon
1eba161060 출퇴근 2025-03-14 10:03:34 +09:00
84f5cf4412 댓글 수정시 공백체크 2025-03-14 01:53:35 +09:00
yoon
2ec81f274d 날짜 min 수정 2025-03-13 21:45:18 +09:00
yoon
946e3441e3 Merge branch 'main' into login 2025-03-13 21:18:18 +09:00
yoon
2a21c12017 전화번호 2025-03-13 21:15:39 +09:00
09a665d079 front public 이미지 경로 변경
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-13 19:03:43 +09:00
dabeac68c1 익명일 경우 익명 이미지로 2025-03-13 18:57:11 +09:00
yoon
f100706a83 현재위치
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-13 12:28:44 +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
yoon
8ef12c66d6 출퇴근 2025-03-13 12:14:44 +09:00
e9f7b5d358 Merge branch 'khj' 2025-03-13 12:09:09 +09:00
5f6a3c0fcf 투표cssㅜㅅ정정 2025-03-13 12:08:24 +09:00
f369712a81 휴가수정 2025-03-13 12:06:18 +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
ff6a032cd6 Merge branch 'boardview' 2025-03-13 11:03:06 +09:00
5cb6f4ae38 인증 필요시 로그인 페이지 이동, 공통함수 설명 추가, 댓글 이미지 경로 변경(공통함수로), alert 을 토스트로 변경 2025-03-13 11:02:41 +09:00
2661929cb0 . 2025-03-13 10:33:21 +09:00
yoon
10aaae307e Merge branch 'main' into commuters 2025-03-12 23:02:09 +09:00
yoon
ccad3596c7 출퇴근 2025-03-12 23:00:52 +09:00
fabb1c2c3f 수정 ,삭제시 비밀번호 폼에 공백 방지지 2025-03-11 16:21:20 +09:00
44e72c9532 검색 바 포커스 아웃할때 검색되는거 수정 2025-03-11 16:11:58 +09:00
3fa7eff7d9 휴가 저장 2025-03-11 15:17:16 +09:00
c8418ba292 Merge branch 'boardmodify3' 2025-03-11 14:50:29 +09:00
15bfd59c59 대댓글 폼 여는 버튼 한번 더 클릭시 닫히는데 그때 x버튼으로 바뀌게 2025-03-11 14:50:11 +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
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