Commit Graph

366 Commits

Author SHA1 Message Date
yoon
c1c4f68901 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-20 15:25:12 +09:00
91d2492c13 휴가 삭제기능 2025-02-20 15:21:08 +09:00
Dang
8e20066b87 용어집 수정 2025-02-20 14:19:35 +09:00
yoon
d6883c3a34 Merge branch 'main' into wordDict 2025-02-20 09:20:57 +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
2c28645488 머지 2025-02-18 14:30:14 +09:00
Dang
8b56ce4e42 작업 내용 설명 2025-02-18 14:26:24 +09:00
922b7e0904 ㅇㅇ 2025-02-18 13:19:21 +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
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
yoon
d6789656ce userlist 로직 변경 2025-02-17 10:35:15 +09:00
28cfb7fcc5 . 2025-02-17 09:53:08 +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
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
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
2304c3d4d3 grayscaleImg 2025-02-13 14:51:25 +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