Commit Graph

795 Commits

Author SHA1 Message Date
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
3ba4718e0a 메뉴바 pc 고정 및 토글버튼 제거 2025-03-04 13:52:25 +09:00
8f79ed6680 휴가리스트 댓글개수 2025-03-04 10:42:39 +09:00
497d45e6df Merge branch 'main' into board-comment-2 2025-02-28 14:58:20 +09:00
6df2f00306 Merge branch 'main' into wordDict 2025-02-28 14:53:16 +09:00
42c6a32c3f Merge remote-tracking branch 'origin/main' into board-comment-2 2025-02-28 14:45:18 +09:00
8bc2152490 콘솔 삭제 2025-02-28 14:44:30 +09:00
e8c35bba82 게시판 글쓰기 다시수정 2025-02-28 14:43:19 +09:00
40584f0269 isDeleted 삭제후 메세지 남기기 하는중 2025-02-28 14:43:18 +09:00
Dang
64a915f0d8 용어집 수정 2025-02-28 14:40:57 +09:00
f5911247fb Merge branch 'board-comment-2' of http://192.168.0.251:3000/localnet/localhost-front into board-comment-2 2025-02-28 14:31:41 +09:00
e63f9498bd isDeleted 수정중 2025-02-28 14:31:36 +09:00
2a55574646 대댓글 익명일때 수정 2025-02-28 14:30:19 +09:00
86a6e5b27b 수정버튼 누르면 초기화 2025-02-28 14:12:33 +09:00
yoon
6526e80879 색상 미리보기 추가 2025-02-28 14:09:27 +09:00
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
f9289108c6 Merge branch 'board-write' 2025-02-28 13:58:19 +09:00
cdcc1cc552 Merge branch 'main' into board-write 2025-02-28 13:57:15 +09:00
6bff0e9ede 글쓰기 공백처리리 2025-02-28 13:56:51 +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
613d9f4c16 이미 수정중이면 비밀번호 창 no 2025-02-28 13:17:12 +09:00
ac71a9aa1f 휴가관리 수정 2025-02-28 13:03:52 +09:00
421ec4eaec 익명 댓글 비밀번호 나오는곳 수정해야함 2025-02-28 13:02:55 +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
a1773500bf Merge branch 'main' into project-list 2025-02-28 10:23:57 +09:00
yoon
8d14b0b214 수정시 바뀐거 없을 때 막기 2025-02-28 10:13:40 +09:00
yoon
86f85cce10 활성화 된 유저 앞으로 정렬 2025-02-28 10:13:23 +09:00
2cc280717d . 2025-02-28 10:09:45 +09:00
d1c91b30df 주석 삭제 2025-02-28 10:01:53 +09:00
0859ad72d0 메뉴 js 원복 2025-02-28 09:27:34 +09:00
d954a1b68c 댓글 수정 2025-02-28 00:58:38 +09:00
0968a616b6 익명 댓글 수정 완료 2025-02-27 16:46:49 +09:00
e30dd8f7b0 익명 댓글 수정 수정중 2025-02-27 16:35:20 +09:00
b02d99e4b1 댓글 익명 체크 수정 완료 2025-02-27 16:23:45 +09:00
3f81b57142 탑바 프로필 이미지 url 수정 2025-02-27 16:21:51 +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
00f632e607 콘솔삭제 2025-02-27 13:59:20 +09:00
0c67d70233 휴가,css 2025-02-27 13:38:51 +09:00
94a270caf8 날짜 포멧팅 함수 추가 2025-02-27 13:37:04 +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
4145fdc445 .. 2025-02-27 12:45:43 +09:00
9293bba077 비밀번호 확인부터 2025-02-27 12:41:31 +09:00
4e75c988de 로컬, 개발 실행설정 변경 2025-02-27 11:37:51 +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
yoon
bbaf744b45 프로젝트 store 생성 2025-02-27 11:06:25 +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
ed02d33099 검색창 엔터 2025-02-27 09:54:29 +09:00
22741cb803 검색 결과 없을시 2025-02-27 09:51:06 +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
yoon
8b34a6b5d3 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-25 14:38:51 +09:00
yoon
9cd4b35ced 인터셉터 변경 2025-02-25 14:38:47 +09:00
9984800c6b 머지충돌해결,댓글대댓글 익명저장 2025-02-25 14:27:15 +09:00
yoon
6e6c949487 Merge branch 'main' into commuters 2025-02-25 14:22:33 +09:00
f4f5ac45f6 Merge branch 'khj' 2025-02-25 14:21:23 +09:00
yoon
56fc9615de Merge branch 'main' into commuters 2025-02-25 14:21:05 +09:00
2292e24bf5 중복수정정 2025-02-25 14:20:55 +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
8ffb483aa1 파일 명 변경 2025-02-25 14:18:48 +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
d4682bc362 프로필 이미지 높이 설정 변경 2025-02-24 15:44:47 +09:00
yoon
68d96fa098 파일 명 변경 2025-02-24 15:44:01 +09:00
efbeee855a 휴가관리 수정정 2025-02-24 15:29:32 +09:00
84c43d5baf 공통 날짜 포멧팅 함수 추가 2025-02-24 15:27:45 +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
yoon
efa23d871f 카카오 맵 사용 2025-02-24 14:55:16 +09:00
2ba5121c85 Merge branch 'board-comment' of http://192.168.0.251:3000/localnet/localhost-front into board-comment 2025-02-24 14:04:21 +09:00
a935bcf4d5 로그인 익명 진행중 2025-02-24 14:04:17 +09:00
09e79cb690 휴가 선택 활성화 수정정 2025-02-24 13:58:48 +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
334aa3e22a menu, main 로딩 콘솔 주석처리 2025-02-24 12:47:31 +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
fba884ef92 중복 오류 주석처리 2025-02-22 17:43:20 +09:00
yoon
c30bac2f2e 필요없는 거 삭제 2025-02-22 17:42:48 +09:00
yoon
f621efca29 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-22 14:05:20 +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
ce1ecb5897 휴가 수정정 2025-02-21 16:21:26 +09:00
9bc34a02fc 에러메세지 2025-02-21 16:03:21 +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
3779e63142 리스트 빨간글씨삭제 2025-02-21 10:36:12 +09:00
54b3db91ab . 2025-02-21 09:58:10 +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
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
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
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
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
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
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