Commit Graph

1122 Commits

Author SHA1 Message Date
caba716ac6 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-04-03 10:12:49 +09:00
e1cc692085 메인 달력 사원 이미지 url 수정 2025-04-03 10:12:46 +09:00
3cf6aeab9a Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-04-03 10:07:07 +09:00
7e2caa5f09 . 2025-04-03 10:07:05 +09:00
ff0ea598ec 메인달력 STYLE 이 다른곳에 적용안되게 수정, 2025-04-03 10:02:50 +09:00
4c5da13291 메인달력 오류 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-04-01 19:56:39 +09:00
61767d6b68 main 달력 css 수정 2025-04-01 18:51:03 +09:00
fabda99d78 수정 2025-04-01 16:20:17 +09:00
b348fb14ae Merge branch 'khj' 2025-04-01 16:17:17 +09:00
61a3041a5e 메인 -용어집 투표진행 추가가 2025-04-01 16:16:42 +09:00
a42b5ac191 . 2025-04-01 15:45:59 +09:00
6357a8eb44 아이콘 반응형 2025-04-01 15:45:02 +09:00
9785b96de6 메인 수정 2025-04-01 15:32:19 +09:00
2cb2c81f84 . 2025-04-01 15:29:12 +09:00
58cbb8f534 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-04-01 15:24:55 +09:00
0bf6b99189 1 2025-04-01 15:24:54 +09:00
869423c764 맑음 이미지 변환 2025-04-01 15:21:22 +09:00
81909fa6e0 . 2025-04-01 14:50:55 +09:00
e5acfa5cf3 날씨 api 백엔드로 수정 2025-04-01 14:45:21 +09:00
f975273c47 탑바수정
Some checks failed
LocalNet_front/pipeline/head There was a failure building this commit
2025-04-01 14:18:26 +09:00
6ac05b2a99 Merge branch 'mypage' 2025-04-01 14:12:23 +09:00
37dc13a92a 탑바 날씨 2025-04-01 14:11:15 +09:00
51e3065400 오늘 날짜 클릭시 초록색 -> 하늘색 2025-04-01 14:08:58 +09:00
453f1d46f7 Merge branch '250401_main_park' 2025-04-01 13:10:41 +09:00
b6e2623fe3 사원 등록 api 작업 완료 2025-04-01 13:10:19 +09:00
c6f2743d82 . 2025-04-01 11:44:45 +09:00
5cb43eac9f 리스트...추가,공지좋아요,댓글 없애기 2025-04-01 11:22:07 +09:00
ebad7d3d5f dd 2025-04-01 11:13:20 +09:00
f2a9ad693f 메인병합 2025-04-01 10:58:14 +09:00
13cf6e56ab Merge branch 'main' into mypage 2025-04-01 10:55:25 +09:00
05769d18ff .. 2025-04-01 10:54:43 +09:00
675eb93587 메인보드 2025-04-01 10:52:24 +09:00
826aeca42a Merge branch 'khj' 2025-04-01 10:27:33 +09:00
5abf73892b 메인 컴포넌트 추가가 2025-04-01 10:27:03 +09:00
7a0df53121 Merge branch 'main' into mypage 2025-04-01 09:46:30 +09:00
3e3849d0d1 . 2025-04-01 09:44:17 +09:00
e9f3a6c8a6 게시글 수정 원복 2025-03-31 20:24:03 +09:00
yoon
9e2b3a072d boder-color 추가 2025-03-31 19:10:50 +09:00
yoon
551569c1c6 뒤로가기 수정 2025-03-31 18:47:26 +09:00
yoon
12297153e4 map 2025-03-31 17:20:16 +09:00
yoon
19777906a4 비번 체크 2025-03-31 16:46:39 +09:00
f054467887 내가쓴 투표일때 이름밀림 수정정 2025-03-31 16:06:10 +09:00
2e596009ad 게시판 메인인 2025-03-31 16:01:05 +09:00
02ec5271b3 프로필 크기 크게 변경경 2025-03-31 15:57:29 +09:00
f0ff9ced0d 메인 2025-03-31 15:50:42 +09:00
7f6caed69e Merge branch 'main' into mypage 2025-03-31 15:46:06 +09:00
931c4b6c9a 마이페이지지 2025-03-31 14:52:55 +09:00
666c081813 카드 크기 변경
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 14:00:41 +09:00
174867fc35 장소 입력 maxlength 20 2025-03-31 13:48:05 +09:00
8375ffee38 . 2025-03-31 13:37:28 +09:00
330f05e92b 사원등록 if 조건 변경 2025-03-31 13:32:01 +09:00
ac7b4d558e 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 13:29:30 +09:00
1c57198839 오류 수정 2025-03-31 13:25:31 +09:00
yoon
6430d45279 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 13:14:13 +09:00
yoon
7c485dc711 위치 로직 수정, 퇴근위치 설정 2025-03-31 13:14:09 +09:00
f5038a5f8e Merge branch 'workMain'
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 13:04:18 +09:00
972fd6ae96 1303 2025-03-31 13:03:45 +09:00
yoon
09fd2df838 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 12:22:03 +09:00
yoon
ceada27663 오타 수정 및 아이디 길이 체크 추가 2025-03-31 12:21:57 +09:00
c1274cf9a0 메인 이벤트 달력 2025-03-31 11:22:26 +09:00
95d1547400 Merge branch 'khj' 2025-03-31 11:19:52 +09:00
c0801c20a3 종료투표색변경경 2025-03-31 11:19:21 +09:00
18f47fff5f . 2025-03-31 11:11:43 +09:00
68607e3d1f .
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 11:02:54 +09:00
9811ed7ca2 .
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 11:00:47 +09:00
c139358135 휴가 왕관 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 10:54:56 +09:00
fcb8d4535e 휴가 왕관 아이콘
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-31 10:26:12 +09:00
e270b0bb88 파일선택 > 삭제했다가 다시 파일선택시 안들어감 2025-03-28 18:53:40 +09:00
9c28054001 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-28 18:50:43 +09:00
8d1748548e 파일선택 > 삭제했다가 다시 파일선택시 안들어감 2025-03-28 18:48:23 +09:00
yoon
5b82d3d315 Merge branch 'main' into commuters 2025-03-28 17:05:31 +09:00
yoon
da13750404 map 2025-03-28 17:04:45 +09:00
5c5a2c63ef Merge branch 'main' into board-ji 2025-03-28 16:33:49 +09:00
9035d339ac 수정 에디터 2025-03-28 16:32:53 +09:00
ad3af31e37 검색 필터링 유지 2025-03-28 16:18:06 +09:00
yoon
5af68dcf3d Merge branch 'main' into commuters
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-28 15:59:04 +09:00
yoon
657312b473 map 공통 파일 뺴기 미완성 2025-03-28 15:58:33 +09:00
yoon
c90ce680fc min 삭제 2025-03-28 15:57:56 +09:00
d47ee95f56 공지 좋아요,댓글 없게 2025-03-28 15:23:34 +09:00
2c0a6f5ffc Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-28 15:22:08 +09:00
969f566187 삭제된것 디세이블 투표표 2025-03-28 15:22:06 +09:00
yoon
525a484615 스타일 삭제 2025-03-28 15:15:44 +09:00
yoon
48dd6c5b9c 비밀번호 4자리 alert 누락 추가 2025-03-28 15:11:00 +09:00
yoon
51f750ae1c Merge branch 'main' into commuters 2025-03-28 15:02:57 +09:00
yoon
89f151d7bc 커서추가 2025-03-28 15:02:19 +09:00
yoon
767c160acd kakao 확인 2025-03-28 14:04:53 +09:00
21165d1d54 Merge branch '250328_comment'
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-28 14:00:01 +09:00
7fd115ddc7 댓글 수정사항 없으면 submit 버튼 disabled 처리 2025-03-28 13:59:38 +09:00
f733569211 Merge branch 'khj'
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-28 13:44:15 +09:00
7485b6e7c8 종료날짜 vaild 추가가 2025-03-28 13:43:51 +09:00
2baebdf1e9 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-28 13:21:59 +09:00
750cbf4b74 1 2025-03-28 13:21:58 +09:00
008adac7a5 Merge branch 'main' into board-ji 2025-03-28 13:19:35 +09:00
1dcde5eb6b 글수정 2025-03-28 13:17:33 +09:00
9bfd16efa2 Merge branch '250328_like_dislike' 2025-03-28 13:08:36 +09:00
ad4bcb511f 댓글 사용자 좋아요 싫어요 상태 업데이트 2025-03-28 13:08:21 +09:00
fdb1f6f339 Merge branch '250328_like_dislike' 2025-03-28 12:28:23 +09:00
3f8718831f 사용자의 게시글 좋아요 싫어요 상태 업데이트 2025-03-28 12:27:26 +09:00
d4bfc164a4 공지 복구 2025-03-28 11:19:41 +09:00
e447968ecf 게시글 수정 시 상세 페이지로 이동 하도록 변경 2025-03-28 10:29:11 +09:00
3b50c84118 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-28 10:08:29 +09:00
416ec12a20 250328 10am 2025-03-28 10:08:22 +09:00
6c7ccff8ea 공지사항 댓글,좋아요기능 삭제 2025-03-28 10:07:13 +09:00
a540feb851 250328_work 2025-03-28 09:22:44 +09:00
4a8f74c357 Merge branch 'main' of http://192.168.0.251:3000/localhost/localhost-front 2025-03-28 01:10:20 +09:00
de04cf679b 검색/페이징/필터링 후 수정시 검색어/페이징 풀림 2025-03-28 01:08:01 +09:00
yoon
4395be2e90 달력 모달 2025-03-27 18:53:44 +09:00
yoon
9e468d6ea9 Merge branch 'main' into commuters
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-27 18:12:55 +09:00
yoon
dd268c0df6 퇴근지 추가 2025-03-27 18:12:11 +09:00
42987e8554 공지 댓글 삭제 2025-03-27 16:22:17 +09:00
yoon
8dcb69bcb6 select 디폴트옵션 이상한거 수정 2025-03-27 15:54:52 +09:00
6e14790e41 Merge branch 'khj' 2025-03-27 15:42:11 +09:00
09afafdab1 수정정 2025-03-27 15:41:33 +09:00
3631c49e43 Merge branch 'main' into board-ji 2025-03-27 14:46:10 +09:00
948199c724 검색 2글자 이상 2025-03-27 14:43:01 +09:00
c3d22b3e4f 검색수정정 2025-03-27 14:39:15 +09:00
f23a7a7e89 영역 수정정 2025-03-27 14:24:57 +09:00
43bcaf1b75 Merge branch 'khj' 2025-03-27 14:08:39 +09:00
a6904fce09 커서 줌줌 2025-03-27 14:08:13 +09:00
yoon
d40646ff76 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-03-27 13:56:18 +09:00
yoon
913146393f log -> 등록,수정자로 변경 2025-03-27 13:55:52 +09:00
838640e2d4 Merge branch 'khj' 2025-03-27 13:53:47 +09:00
e6242771b0 용어집수정정 2025-03-27 13:53:19 +09:00
fdf439246e 휴가 수정 2025-03-27 13:37:23 +09:00
92b7d5d4ac 첨부파일 변경 2025-03-27 12:07:59 +09:00
c4ff151581 250327 작업 2025-03-27 12:04:07 +09:00
cdb40ed942 삭제된 댓글일떄 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-27 11:08:40 +09:00
b25d6758de 휴가 -3개이상 사용 x 2025-03-27 10:30:15 +09:00
5b42847028 250327 중간 커밋 2025-03-27 09:39:03 +09:00
9564788ad8 Merge branch 'main' into board-ji 2025-03-27 09:36:28 +09:00
yoon
4ff3aa8fa3 위치
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-25 18:48:22 +09:00
yoon
4f0bec0df3 위치 확인
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-25 18:45:30 +09:00
yoon
921e140aa4 datepicker 공통파일 2025-03-25 18:38:45 +09:00
yoon
6a4820628b 혹시몰라 추가 2025-03-25 18:12:26 +09:00
yoon
8328020eb3 오류
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-25 18:03:48 +09:00
yoon
041a69a173 오류 확인
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-25 17:56:35 +09:00
yoon
6abb6a532b 프젝 오류
Some checks failed
LocalNet_front/pipeline/head There was a failure building this commit
2025-03-25 17:53:20 +09:00
yoon
ecaf40ced2 Merge branch 'main' into commuters
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-25 17:44:50 +09:00
yoon
0da0d604e0 프로젝트 참여인원 많은 순 정렬 2025-03-25 17:44:07 +09:00
yoon
a391d677bd 이름 -> 프로젝트명 2025-03-25 17:43:46 +09:00
yoon
cf52ab8a1b 비밀번호 4자리 alert 2025-03-25 17:43:24 +09:00
031c5f35c6 비밀번호 입력 maxlength 8로 변경 2025-03-25 16:14:11 +09:00
c8662e72bf 휴가선물 마이너스일 때 불가능 2025-03-25 16:06:14 +09:00
a79a8bde73 투표종료 가능능 2025-03-25 15:21:12 +09:00
bcf8e21ccd Merge branch 'khj' 2025-03-25 15:03:35 +09:00
4abb705a39 카드 크기 조정정 2025-03-25 15:03:09 +09:00
69234678d1 Merge branch '250325_board'
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-25 12:55:32 +09:00
e393574ae6 댓글 작성 시 줄바꿈 하고 글 쓰면 반영이 안됌 >> 반영되서 댓글 나오게 수정 2025-03-25 12:55:15 +09:00
b7026afcbd 익명 댓글 수정 할 때 삭제 버튼 두 번 눌러야지 input나옴 >> 수정
All checks were successful
LocalNet_front/pipeline/head This commit looks good
2025-03-25 12:43:45 +09:00
30e06407e3 Merge branch '250325_board' 2025-03-25 12:28:10 +09:00