Commit Graph

554 Commits

Author SHA1 Message Date
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
d954a1b68c 댓글 수정 2025-02-28 00:58:38 +09:00
e30dd8f7b0 익명 댓글 수정 수정중 2025-02-27 16:35:20 +09:00
b02d99e4b1 댓글 익명 체크 수정 완료 2025-02-27 16:23:45 +09:00
495fe5850a Merge branch 'khj' 2025-02-27 15:45:18 +09:00
1063d82a29 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-27 15:44:57 +09:00
896ca99bdc randomList emit 오류류제거거 2025-02-27 15:44:30 +09:00
yoon
8b8c9f86fd 비밀번호 체크 수정 2025-02-27 14:57:36 +09:00
07740d0a96 Merge branch 'main' into board-comment-2 2025-02-27 14:51:19 +09:00
f248141108 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-27 14:48:55 +09:00
6942a9e063 디폴트 이미지 추가 2025-02-27 14:48:23 +09:00
Dang
3a78dc6355 용어집 수정 2025-02-27 14:21:19 +09:00
0c67d70233 휴가,css 2025-02-27 13:38:51 +09:00
yoon
f11de2f2ab Merge branch 'main' into project-list 2025-02-27 13:30:42 +09:00
yoon
581709430f 수정, 등록 나누고 삭제 추가 2025-02-27 13:28:52 +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
722df90b4d Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-27 13:08:21 +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
9293bba077 비밀번호 확인부터 2025-02-27 12:41:31 +09:00
Dang
3d41dc7730 용어집 수정 2025-02-27 11:23:56 +09:00
yoon
b00824bddc 첫번째 입력 값 공백 X 2025-02-27 11:07:03 +09:00
yoon
0e778df967 css 삭제 2025-02-27 11:06:47 +09:00
476437f2e6 . 2025-02-27 10:41:53 +09:00
90c90b7236 . 2025-02-27 10:40:53 +09:00
bb1715c71b 휴가 수정정 2025-02-27 10:33:48 +09:00
088f3feede 공통 버튼으로 수정 2025-02-27 10:29:57 +09:00
7ef2ef646b 프로필 부분 이미지 삭제 2025-02-27 09:56:22 +09:00
98aa44f497 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-27 09:48:33 +09:00
yoon
a7c27a19e4 update:alert 추가 2025-02-27 09:17:27 +09:00
yoon
7e484c12be 수정사항 완료 2025-02-26 19:09:04 +09:00
bd91e0a72d 보드 원복복 2025-02-25 16:27:22 +09:00
yoon
37c335fc12 로그인 시 메인페이지로 가지는데 화면은 안바뀌는거 해결 2025-02-25 16:00:45 +09:00
8e0700a659 min required 속성 추가가 2025-02-25 15:56:52 +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
6ecf2d5aa1 미완성 2025-02-25 14:18:56 +09:00
yoon
fc443dacdb 프로젝트 store로 관리 2025-02-25 14:18:20 +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
Dang
fc59cc4e5a Merge remote-tracking branch 'origin/main' into wordDict 2025-02-25 12:35:11 +09:00
a08607e0b1 Merge branch 'vacation' 2025-02-25 12:30:32 +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
yoon
68d96fa098 파일 명 변경 2025-02-24 15:44:01 +09:00
efbeee855a 휴가관리 수정정 2025-02-24 15:29:32 +09:00
yoon
55e5ebc2b3 map 2025-02-24 15:26:45 +09:00
5f80998da8 익명 확인중 2025-02-24 15:26:39 +09:00
yoon
10692e9ddd 엔터 2025-02-24 15:25:17 +09:00
170e472815 익명부분 수정중 2025-02-24 15:11:37 +09:00
yoon
76527da74f Merge branch 'main' into project-list 2025-02-24 14:56:45 +09:00
yoon
99d95cf5a1 주소 지도 추가 2025-02-24 14:55:55 +09:00
a935bcf4d5 로그인 익명 진행중 2025-02-24 14:04:17 +09:00
Dang
1e185e81c6 Merge remote-tracking branch 'origin/main' into wordDict 2025-02-24 13:27:25 +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
Dang
f92070018c Merge remote-tracking branch 'origin/main' into wordDict 2025-02-24 09:44:35 +09:00
yoon
e27425d773 게시물 없을 때 멘트 변경 2025-02-22 17:54:54 +09:00
yoon
4ff4e43235 토스트 및 에러 찍히는거 삭제 2025-02-22 17:44:26 +09:00
yoon
c30bac2f2e 필요없는 거 삭제 2025-02-22 17:42:48 +09:00
yoon
ac5cf6077c default img 추가 2025-02-22 14:02:05 +09:00
yoon
fc5f4463b1 select input 안나오는거 수정 2025-02-22 14:01:48 +09:00
yoon
c4b1a946ab profilePath 추가 2025-02-21 15:43:49 +09:00
yoon
0df7c5aec9 Merge branch 'main' into commuters 2025-02-21 14:53:24 +09:00
Dang
2fb0ca06dc 용어집 기본프로필 수정 2025-02-21 14:45:50 +09:00
yoon
2aa2c97ae5 출퇴근 현황 추가 2025-02-21 14:43:37 +09:00
yoon
8b45d5f048 defaultProfile 추가 2025-02-21 14:42:44 +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
ea1a3abf68 Merge branch 'board-comment' 2025-02-21 13:50:46 +09:00
6e4f1a1e81 디폴트 타입변경경 2025-02-21 13:29:24 +09:00
4076507fb7 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-21 13:08:51 +09:00
b727750178 Merge branch 'khj' 2025-02-21 13:06:05 +09:00
c6bb8788d8 익명 null 수정 2025-02-21 13:04:53 +09:00
7bb2f48dda forminput min 속성추가가 2025-02-21 13:02:56 +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
54b3db91ab . 2025-02-21 09:58:10 +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
2da40134c3 . 2025-02-20 19:49:53 +09:00
638f5c4de5 . 2025-02-20 19:37:01 +09:00
87acf373d9 댓글 삭제 진행중 2025-02-20 18:58:53 +09:00
fdb2d81e53 대댓글 수정중 2025-02-20 16:54:37 +09:00
yoon
52809ba743 주석추가 2025-02-20 15:43:37 +09:00
yoon
a816978ba3 Merge branch 'main' into project-list 2025-02-20 15:25:54 +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
yoon
b0239bacce Merge branch 'main' into project-list 2025-02-20 15:21:56 +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
yoon
4175ecd290 검색 , 카테고리 별 나오게 2025-02-20 15:16:50 +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
5c88ea3115 메인 비밀번호 입력창 2025-02-20 12:09:42 +09:00
yoon
0aab690dc7 Merge branch 'main' into project-list 2025-02-20 09:21:58 +09:00
yoon
d6883c3a34 Merge branch 'main' into wordDict 2025-02-20 09:20:57 +09:00
yoon
7c784464a1 수정 로직 추가 2025-02-20 09:19:52 +09:00
yoon
521bb8ded4 click 이벤트 .stop 추가 2025-02-20 09:19:04 +09:00
bba4c60cb2 대댓글 수정중 2025-02-19 23:38:40 +09:00
yoon
1b3339fa94 Merge branch 'main' into project-list 2025-02-18 15:05:30 +09:00
yoon
6f43657941 프로젝트 목록 미완성 2025-02-18 15:04:25 +09:00
8c29873731 머지 2025-02-18 14:46:20 +09:00
6d705d1093 boardCommentArea 2025-02-18 14:42:14 +09:00
2c28645488 머지 2025-02-18 14:30:14 +09:00
Dang
8b56ce4e42 작업 내용 설명 2025-02-18 14:26:24 +09:00
eab2971c87 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-18 13:49:51 +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
1304d38fdb Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-18 11:12:35 +09:00
99b7296f00 투표 수정정 2025-02-18 11:12:06 +09:00
ce2ccde4fd 머지 2025-02-18 11:02:02 +09:00
ac97d5fcfb Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-18 10:37:35 +09:00
2b57883edd Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-18 10:33:47 +09:00
e376e5ff59 보드코맨트머지지 2025-02-18 10:33:45 +09:00
Dang
10d1aa4d8c 용어집 수정 2025-02-18 10:33:12 +09:00
yoon
deddbf7856 Merge branch 'main' into project-list 2025-02-18 10:32:49 +09:00
yoon
ec5f5e5e12 프로젝트 목록 2025-02-18 10:22:22 +09:00
ae4f4a807b Merge remote-tracking branch 'origin/main' into board-comment 2025-02-18 10:22:14 +09:00
25ae933ebe . 2025-02-18 10:21:22 +09:00
c65fc7f3a5 비밀번호 입력창 - 부모 페이지로 옮김 2025-02-18 00:48:22 +09:00
a90bdab5a0 boardProfile 수정전 2025-02-17 15:47:28 +09:00
Dang
0507663a1a Merge branch 'khj' into wordDict 2025-02-17 15:10:01 +09:00
yoon
e81127ee8a log, 프로젝트 수정 2025-02-17 15:07:10 +09:00
yoon
26041d4b90 프로젝트 수정을 위한 modelValue 추가 2025-02-17 15:06:43 +09:00
yoon
eead7902c4 import 경로 수정 2025-02-17 15:06:01 +09:00
Dang
62c97e0a18 용어집 수정 2025-02-17 15:04:56 +09:00
ee0b34dad0 qeditor수정정 2025-02-17 14:56:01 +09:00
5fe85dcd3b 댓글 좋아요 완료 2025-02-17 13:56:02 +09:00
yoon
d6789656ce userlist 로직 변경 2025-02-17 10:35:15 +09:00
2aaafcc782 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-17 10:26:10 +09:00
2b7dabf27e . 2025-02-17 09:45:27 +09:00
yoon
3047011de8 프로젝트 목록 2025-02-17 09:29:23 +09:00
ff2524bcfa 세션 쿠키 유지를 위한 https 적용 2025-02-17 09:23:44 +09:00
5a4b770fa1 사원리스트 모달추가 2025-02-14 16:22:42 +09:00
fbc578c307 휴가수정,버튼추가 2025-02-14 14:50:23 +09:00
yoon
bbc8d8b6b9 useUserStore -> useUserInfoStore 2025-02-14 13:25:47 +09:00
a1efaf1d90 . 2025-02-14 12:55:18 +09:00
a8d33a2555 . 2025-02-14 12:50:37 +09:00
cf4e56472a 프로필 부분 정리 2025-02-14 12:47:39 +09:00
e14af4de3d Merge branch 'wordDict' 2025-02-14 11:07:39 +09:00
Dang
d71db81856 용어집 카테고리 등록 2025-02-14 11:02:45 +09:00
af36b11b6e . 2025-02-14 03:02:38 +09:00
737481cbae 대댓글완료 2025-02-14 03:01:30 +09:00
f7ca508a9c 휴가가리스트 모달 2025-02-13 16:25:20 +09:00
yoon
1e1834213b Merge branch 'main' into project-list 2025-02-13 14:58:51 +09:00
yoon
264bb09dd5 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-13 14:50:54 +09:00
yoon
6edb911d43 프로젝트 목록 2025-02-13 14:48:51 +09:00
yoon
380fd9cb1d 모달 수정 2025-02-13 14:48:44 +09:00
yoon
9007e60f26 공통 불러오는 코드 수정 2025-02-13 14:48:25 +09:00
yoon
40dd760700 코드 수정 2025-02-13 14:48:12 +09:00
yoon
1e305ea86d class 수정 2025-02-13 14:48:05 +09:00
yoon
3378dcf93c is-row 추가 2025-02-13 14:47:46 +09:00
yoon
18d4095f1b class 수정 2025-02-13 14:47:24 +09:00
04ab0325b7 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-13 13:27:51 +09:00
7426dd8926 좋아요/싫어요버튼 머지 2025-02-13 13:25:22 +09:00
e4c8b0aa1f 휴가관리 사원프로필 2025-02-13 13:20:44 +09:00
7774bfe80a 대댓글 진행중 2025-02-13 13:20:11 +09:00
e81229db4c 댓글 조회 및 등록 2025-02-13 12:03:43 +09:00
cfa46c0a6d 개발용도의 쿠키 세팅 2025-02-13 11:54:38 +09:00
12538f0046 댓글등록 진행중 2025-02-12 23:43:38 +09:00
f33cada52f 익명일때 코멘트 익명 인풋 완료 2025-02-12 17:39:35 +09:00
e4455e94e5 휴가 사원리스트추가 2025-02-11 16:18:05 +09:00
024807ccda board-view-content 머지 2025-02-11 15:10:02 +09:00