Commit Graph

805 Commits

Author SHA1 Message Date
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
8dd206d32d console.log 삭제 2025-03-13 19:07:02 +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
ec2f7cae09 휴가 수정정 2025-03-13 16:16:55 +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
d38f89c5bc 휴가수정2 2025-03-13 12:08:39 +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
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
2661929cb0 . 2025-03-13 10:33:21 +09:00
4a5ab6238c 게시판 에디터 사진넘치는거 수정 2025-03-13 10:21:20 +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
52c211bf08 Merge branch 'boardview' 2025-03-11 16:14:22 +09:00
5b84ef9350 삭제시 댓글 비밀번호 입력창 비활성화 2025-03-11 16:13:53 +09:00
44e72c9532 검색 바 포커스 아웃할때 검색되는거 수정 2025-03-11 16:11:58 +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
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
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
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
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
23f39170da 버튼수정정 2025-03-11 10:29:42 +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
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
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
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
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
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
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
yoon
b08e72b813 console 삭제 2025-03-07 14:08:26 +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
b222e606c2 Merge branch 'main' into loading 2025-03-07 13:12:52 +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
2af99d9b51 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-07 12:44:24 +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
abfc872d04 탑바 css 수정 2025-03-07 12:14:54 +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
243b970227 게시글 수정 화면 작업 2025-03-07 10:22:22 +09:00
21fb66bafe 화면 반응형으로 수정 2025-03-06 16:23:29 +09:00
8636bd1ab9 탑바 고정 2025-03-06 16:19:11 +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
85f197b001 .. 2025-03-06 15:09:09 +09:00
04bcbcb781 . 2025-03-06 15:03:26 +09:00
6904902755 휴가 css 수정 2025-03-06 15:02:15 +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
6c4fc7ac8e 라이트 모드, 다크모드 아이콘 주석처리 2025-03-06 10:14:19 +09:00
708309f6a0 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-06 09:50:56 +09:00
5ae3d3bc75 게시판 삭제된 댓글 안보이게 2025-03-06 09:47:37 +09:00
0cfeb2fc1d 게시판 댓글삭제제 2025-03-04 17:42:46 +09:00
4dc807c452 Merge remote-tracking branch 'origin/main' into board-file 2025-03-04 17:01:22 +09:00
27c9392d68 게시판 수정중 2025-03-04 16:37:49 +09:00