Commit Graph

420 Commits

Author SHA1 Message Date
bba4c60cb2 대댓글 수정중 2025-02-19 23:38:40 +09:00
yoon
1daafb3c75 주석 품 2025-02-18 15:46:11 +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
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
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
499162639a 댓글 부분 id에서 commentId로 수정 2025-02-17 10:43:18 +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
yoon
a169d71c1d useUserStore -> useUserInfoStore 2025-02-14 13:24:26 +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
8e438ff900 t용어집수정정 2025-02-14 12:16:24 +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
yoon
c8ca8f936f 주석 변경 2025-02-13 14:46:38 +09:00
yoon
558008acc5 commonApi 로직 수정 2025-02-13 14:38:07 +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
34a1c8360d . 2025-02-12 23:48:33 +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
4daab961cf 휴가저장장 2025-02-11 15:03:25 +09:00
yoon
8ab9e79b5a userlist 코드 수정 2025-02-11 12:59:49 +09:00
yoon
724f0afc61 headers 경로 추가 -> 응답 다르게 하기 2025-02-11 10:33:40 +09:00
yoon
c3b2bcec66 응답 인터셉터 수정 2025-02-11 10:33:09 +09:00
baed45ebc9 css정리 2025-02-11 10:21:59 +09:00
5a64d77502 머지 2025-02-10 16:24:11 +09:00
yoon
3cb3281a86 카테고리 목록 불러오기 수정 2025-02-10 16:10:28 +09:00
yoon
8fcc702d9b Merge branch 'main' into project-list 2025-02-10 16:08:45 +09:00
yoon
d96de3745e Merge branch 'main' into wordDict 2025-02-10 16:07:51 +09:00
yoon
34acf8aedb 프로젝트 목록 2025-02-10 16:07:24 +09:00
yoon
608f7be852 label, value 형식으로 수정 2025-02-10 16:07:09 +09:00
yoon
d47e3f0d6d yearCategory, cateList 추가 2025-02-10 16:06:22 +09:00
Dang
8fd19938ba 용어집 등록 2025-02-10 16:04:33 +09:00
296dd2452a 보드프로필 2025-02-10 15:57:23 +09:00
yoon
62047cbf80 Merge branch 'main' into project-list 2025-02-10 15:13:16 +09:00
yoon
4ebab7cf95 disabled 추가 2025-02-10 15:11:07 +09:00
yoon
23cd85d727 프로젝트 목록 2025-02-10 14:59:56 +09:00
yoon
2e270291f5 Merge branch 'main' into project-list 2025-02-10 14:47:04 +09:00
yoon
9d1911be9a Merge branch 'main' into login 2025-02-10 14:45:39 +09:00
yoon
8a15c9c1cc 프로젝트 목록 추가 2025-02-10 14:45:13 +09:00
yoon
4413001d9d 로그인 로직 변경 2025-02-10 14:44:29 +09:00
yoon
6704f5531a 응답 인터셉터 추가 2025-02-10 14:41:37 +09:00
c8dbd53e3a 보드프로필 머지 2025-02-10 14:02:27 +09:00