Commit Graph

511 Commits

Author SHA1 Message Date
f2b364f4f8 휴가관리 수정 2025-02-24 12:08:02 +09:00
ce1ecb5897 휴가 수정정 2025-02-21 16:21:26 +09:00
9bc34a02fc 에러메세지 2025-02-21 16:03:21 +09:00
yoon
0df7c5aec9 Merge branch 'main' into commuters 2025-02-21 14:53:24 +09:00
yoon
2aa2c97ae5 출퇴근 현황 추가 2025-02-21 14:43:37 +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
4076507fb7 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-21 13:08:51 +09:00
c6bb8788d8 익명 null 수정 2025-02-21 13:04:53 +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
3779e63142 리스트 빨간글씨삭제 2025-02-21 10:36:12 +09:00
a2551e0e58 . 2025-02-21 09:56:39 +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
87acf373d9 댓글 삭제 진행중 2025-02-20 18:58:53 +09:00
917b701663 . 2025-02-20 16:59:42 +09:00
a21bf8f6a1 대댓글 2025-02-20 16:57:27 +09:00
fdb2d81e53 대댓글 수정중 2025-02-20 16:54:37 +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
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
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
e2d765cb15 게시판 수정, 삭제 완료 2025-02-20 12:33:10 +09:00
5c88ea3115 메인 비밀번호 입력창 2025-02-20 12:09:42 +09:00
5ece56e31d . 2025-02-20 10:56:29 +09:00
yoon
d6883c3a34 Merge branch 'main' into wordDict 2025-02-20 09:20:57 +09:00
bba4c60cb2 대댓글 수정중 2025-02-19 23:38:40 +09:00
8c29873731 머지 2025-02-18 14:46:20 +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
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
99b7296f00 투표 수정정 2025-02-18 11:12:06 +09:00
ce2ccde4fd 머지 2025-02-18 11:02:02 +09:00
e376e5ff59 보드코맨트머지지 2025-02-18 10:33:45 +09:00
Dang
10d1aa4d8c 용어집 수정 2025-02-18 10:33:12 +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
62c97e0a18 용어집 수정 2025-02-17 15:04:56 +09:00
5fe85dcd3b 댓글 좋아요 완료 2025-02-17 13:56:02 +09:00
499162639a 댓글 부분 id에서 commentId로 수정 2025-02-17 10:43:18 +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
5a4b770fa1 사원리스트 모달추가 2025-02-14 16:22:42 +09:00
fbc578c307 휴가수정,버튼추가 2025-02-14 14:50:23 +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
737481cbae 대댓글완료 2025-02-14 03:01:30 +09:00
f7ca508a9c 휴가가리스트 모달 2025-02-13 16:25:20 +09:00
04ab0325b7 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-13 13:27:51 +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
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
4daab961cf 휴가저장장 2025-02-11 15:03:25 +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
Dang
8fd19938ba 용어집 등록 2025-02-10 16:04:33 +09:00
yoon
2e270291f5 Merge branch 'main' into project-list 2025-02-10 14:47:04 +09:00
yoon
8a15c9c1cc 프로젝트 목록 추가 2025-02-10 14:45:13 +09:00
fee7b52384 board-view-content 머지 2025-02-10 14:00:30 +09:00
05dca89be0 휴가저장,리스트 2025-02-07 14:40:25 +09:00
yoon
646c775d6a Merge branch 'main' into wordDict 2025-02-07 09:39:57 +09:00
Dang
e61bcd20ce 용어집 등록 2025-02-06 16:16:25 +09:00
69afdab946 용어집 카테고리 수정 2025-02-06 13:26:07 +09:00
67d5bede32 용여집 수정정 2025-02-06 10:29:08 +09:00
yoon
f3ca41f9ad Merge branch 'main' into login 2025-02-06 09:26:50 +09:00
yoon
c95a2ae80b Merge branch 'main' into wordDict 2025-02-06 09:25:59 +09:00
yoon
4329d9febd Merge branch 'main' into board-view-content 2025-02-06 09:25:12 +09:00
yoon
7304b9f03b 비밀번호 재설정 추가 2025-02-06 09:24:13 +09:00
67bb83277a 게시판 리스트 번호 수정 2025-02-04 16:21:07 +09:00
68c096b43f 게시판리스트 수정정 2025-02-04 16:15:47 +09:00
815019e02a Merge remote-tracking branch 'origin/main' into board-view-content 2025-02-04 16:06:43 +09:00
552f307c45 좋아요 작업중 2025-02-04 16:05:48 +09:00
Dang
69b5216963 용어집 입력 및 입력 수정 중 2025-02-04 15:59:28 +09:00
0209dcbdc0 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-04 15:56:10 +09:00
1de0c882dd 보드리스트 수정 및 보드카드 원복 2025-02-04 15:56:08 +09:00
57c81b36a5 날짜 수정 완료 2025-02-04 13:38:26 +09:00
233a345ae2 용어집 수정ㅇㅇㅇ 2025-02-04 11:12:09 +09:00
d3170637c0 Merge branch 'main' into khj 2025-02-04 11:01:47 +09:00
822223ff0d Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-04 11:01:10 +09:00
64b0de3e7f 용어집 수정 2025-02-04 10:59:49 +09:00
d1aa5fb438 날짜 변환전, 좋아요 해결완료 2025-02-04 10:57:18 +09:00
8cfffa6610 글쓰기 카테고리 공통코드 수정정 2025-02-03 16:18:31 +09:00
927b742fab Merge branch 'wordDict' 2025-02-03 16:06:46 +09:00
Dang
e6efc307ca 용어집 목록 수정 2025-02-03 15:57:03 +09:00
9937e8591e 게시판머지2 2025-02-03 14:51:51 +09:00
f853c4e25d board-view-profile1 머지 2025-02-03 14:31:48 +09:00
dbc0ad83ae 보드리스트 width 수정 2025-02-03 10:48:21 +09:00
e4df111725 썸네일 이미지 2025-01-24 15:39:30 +09:00
yoon
758a717d47 Merge branch 'main' into board-view-profile 2025-01-24 15:18:25 +09:00
e177ddec1a Merge remote-tracking branch 'origin/main' into board-view-profile 2025-01-24 15:14:15 +09:00
a95e971f49 Merge remote-tracking branch 'origin/main' into board-content 2025-01-24 15:13:47 +09:00
yoon
11d936bcc5 Merge branch 'main' into wordDict 2025-01-24 15:12:09 +09:00
yoon
dfbfbabc2e Merge branch 'main' into khj 2025-01-24 15:06:45 +09:00
Dang
f32a45c69c 용어집 작업 2025-01-24 15:03:55 +09:00
e5ccaa1a12 투표 컴포넌트 추가가 2025-01-24 15:02:19 +09:00
480ba2bd8a 사용자 목록 공통통 2025-01-24 15:02:07 +09:00
fb12e345a7 게시판 저장 수정정,파일제한 추가 2025-01-24 14:44:18 +09:00
dd9a94e3a9 말줄임 및 컨텐츠 수정 2025-01-24 14:09:09 +09:00
2f0f5fd378 첨부파일저장 수정 2025-01-24 13:53:38 +09:00
8b38019b95 프로필, 댓글 디자인 정리 2025-01-24 12:26:46 +09:00
yoon
5cab531cdd Merge branch 'main' into khj 2025-01-23 12:43:26 +09:00
c97996f85d 게시판 수정 2025-01-23 12:39:21 +09:00
yoon
aeecd3836d Merge branch 'main' into login 2025-01-21 20:48:49 +09:00
affaf916be board-notice-select 머지 2025-01-21 15:45:06 +09:00
yoon
324c0a44a1 Merge branch 'main' into login 2025-01-21 14:58:38 +09:00
yoon
e7c3833640 등록신청 2025-01-21 14:54:11 +09:00
05c26f7b7b 라디오박스수정 2025-01-21 14:04:33 +09:00
3cef681449 board-select 머지 2025-01-21 13:34:40 +09:00
yoon
6c83a28721 login 2025-01-21 13:33:58 +09:00
888eaba2e9 파일명 수정 2025-01-21 13:16:27 +09:00
795f740ee9 ㅁㅁㅁ 2025-01-21 13:02:57 +09:00
61fe8ace7c 게시판 작성하기,상세 2025-01-21 13:02:47 +09:00
882284bbb4 board-0117머지 2025-01-20 16:23:30 +09:00
yoon
c9efaf9643 api 경로 수정 2025-01-17 15:15:32 +09:00
yoon
0d7fb525ac Merge branch 'main' into login 2025-01-17 14:16:52 +09:00
831dc8d333 지희수정정 2025-01-17 13:57:41 +09:00
yoon
f7d5f2d121 Merge branch 'main' into login 2025-01-17 13:26:45 +09:00
yoon
eef87a18d1 Merge branch 'main' into wordDict 2025-01-17 13:24:41 +09:00
yoon
bd22c51684 login api 추가 2025-01-17 13:20:36 +09:00
Dang
3fed028259 용어집 작업 2025-01-17 12:52:30 +09:00
yoon
a2780f1914 Merge branch 'main' into login 2025-01-17 11:01:59 +09:00
yoon
d5f08d8ede 로그인 view 2025-01-17 11:00:40 +09:00
yoon
c6e4cc9089 등록신청 view 2025-01-17 11:00:32 +09:00
ae2dbd4992 board-list 머지 2025-01-16 16:09:47 +09:00
68d1b41f11 api보드리스트 수정정 2025-01-16 09:56:21 +09:00
yoon
93693c4479 Merge branch 'main' into login 2025-01-16 09:22:49 +09:00
d87a87450a 게시판 수정 업데이트 2025-01-14 16:08:33 +09:00
a093a1b394 api 수정 2025-01-14 12:46:21 +09:00
e87957c88a 경로 수정 및 테스트트 2025-01-14 12:23:13 +09:00
559212e9e1 수정정 2025-01-13 13:01:11 +09:00
4df399ac36 게시판 insert예시 2025-01-13 12:52:44 +09:00
yoon
82ce223a15 폴더 명 변경 2025-01-09 13:51:01 +09:00
yoon
372d12edb7 LogoHeader 수정 2025-01-09 13:44:46 +09:00
76c02d04d1 작성버튼추가가 2025-01-09 12:37:50 +09:00
yoon
7787f77a29 login view 추가 2025-01-09 10:58:27 +09:00
76981b956a 버튼,휴가관리 추가가 2025-01-09 10:49:35 +09:00
yoon
a1d5ec28b7 목록 , 작성 -> 아이콘으로 변경 2025-01-07 15:32:03 +09:00
45b8d97898 목록 수정 2024-12-19 13:06:00 +09:00
cc748e6d32 검색 이벤트 추가 2024-12-19 11:28:14 +09:00
618814acfd 게시판 목록 업데이트 2024-12-19 11:17:23 +09:00
cea58be11a input 경고창 추가 2024-12-19 09:38:23 +09:00
dac352e0cf 수정 2024-12-18 20:58:25 +09:00
4144b48ec0 목록 부분 수정 2024-12-17 15:49:47 +09:00
9b08a56061 editor update 2024-12-17 15:46:47 +09:00
2361ea977c Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2024-12-17 15:09:41 +09:00
be7c03e244 quill editor 추가 font 추가 2024-12-17 15:09:05 +09:00
64241132ab 게시판 첨부파일 드롭다운으로 수정 2024-12-17 14:59:54 +09:00
da35336812 게시판 첨부파일 기능 추가 2024-12-17 14:11:40 +09:00
80f293c203 게시판 리스트 수정 2024-12-17 14:01:16 +09:00
77f6dc4297 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2024-12-17 13:13:37 +09:00
eebe08452e 게시판 코멘트 익명, 비밀번호 추가 2024-12-17 13:13:34 +09:00
2efc60106c 카테고리 변경 2024-12-17 12:53:36 +09:00
724ffa5ca0 게시판 오류 수정 2024-12-17 10:44:07 +09:00
5d4595e2e5 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2024-12-17 10:42:24 +09:00
38772b3109 Merg68.0.251:3000/localnet/le branch 'main' of http://192.1ocalhost-front 2024-12-17 10:42:19 +09:00
67416262a7 rouuter push 추가 2024-12-17 10:38:01 +09:00
6d0b078bc6 게시판 view 수정 2024-12-17 10:32:18 +09:00
5d232d8cc9 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2024-12-17 10:32:13 +09:00
aec813bb92 file props,emit 추가 2024-12-17 10:32:12 +09:00
871e8cf9c2 메인페이지 2024-12-17 10:26:36 +09:00
c56acf60f8 게시판 컴포넌트 분리 및 네이밍 수정 2024-12-17 10:04:51 +09:00
726b6bb979 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2024-12-17 09:55:53 +09:00
fb88e248f8 editor emit 추가 2024-12-17 09:55:52 +09:00
70373a070b 게시판 위치 조정 2024-12-17 09:54:02 +09:00
ef6beed0d5 게시판 테스트 글 삭제 2024-12-17 09:47:32 +09:00
fb26f6d701 write 수정 컴포넌트 추가 2024-12-17 09:09:56 +09:00
0f89f506eb 게시판 상세 수정 2024-12-16 16:23:07 +09:00
e95ddbbcde 게시판 상세 추가 2024-12-16 16:21:25 +09:00
528961561e boardView 수정3 2024-12-16 16:20:07 +09:00
51f5dfb167 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2024-12-16 16:19:35 +09:00
a54ae90fa8 boardView 수정2 2024-12-16 16:19:15 +09:00
44f33abc2f boardvie 수정 2024-12-16 16:17:05 +09:00
243c2e0f05 게시판 작성 생성 - continue 2024-12-16 16:14:47 +09:00
9f40ead724 test2 2024-12-16 15:14:38 +09:00
ed5ac156e9 test 2024-12-16 15:12:29 +09:00
72f7c3a0fe 1 2024-12-16 15:08:22 +09:00
54729e06c1 라우터 구조 변경 2024-12-16 14:11:49 +09:00
c77af5ca2a 라우터 변경 페이지 변경 2024-12-16 13:39:11 +09:00
bc8c32f06c 라우터 변경 2024-12-16 13:13:17 +09:00
bd39f84fb7 메뉴 수정 2024-12-16 11:24:32 +09:00
13b488a617 기본 레이아웃 잡음 2024-12-13 15:46:12 +09:00
8d3ddfda0b favicon 변경 이미지 변경 2024-12-13 15:03:23 +09:00
643d99830a first source commit 2024-12-13 14:33:50 +09:00