Commit Graph

909 Commits

Author SHA1 Message Date
박정민
6925c50349 feat: deleteroom 수정 2024-08-06 14:01:22 +09:00
박정민
797286b71e Merge branch 'BE/userinfo' into 'backend'
db변경

See merge request s11-webmobile1-sub2/S11P12A701!65
2024-08-06 13:39:53 +09:00
박정민
57acdf06d6 db변경 2024-08-06 13:38:27 +09:00
박정민
f1bcc1dc50 Merge branch 'BE/userinfo' into 'backend'
feat: update -> create

See merge request s11-webmobile1-sub2/S11P12A701!64
2024-08-06 13:25:31 +09:00
박정민
62b690b205 feat: update -> create 2024-08-06 13:24:31 +09:00
minwucho
4527f92110 feat: 자유게시판 생성 수정 삭제 2024-08-06 13:20:30 +09:00
박정민
7d396c2eab Merge branch 'BE/userinfo' into 'backend'
feat: 퀴즈 채점 기능 수정

See merge request s11-webmobile1-sub2/S11P12A701!63
2024-08-06 13:18:51 +09:00
박정민
31faa12d83 feat: 퀴즈 채점 기능 수정 2024-08-06 13:18:26 +09:00
ab774a8131 Merge branch 'FE/QuizsetForm' into 'frontend'
[Front-End] feat: quizsetForm 디자인 변경

See merge request s11-webmobile1-sub2/S11P12A701!62
2024-08-06 10:49:58 +09:00
정기영
7459f999af design: X 버튼 색깔 변경 2024-08-06 10:46:21 +09:00
정기영
48863c4d11 feat: 수강신청 중(onPending) 시 수강 신청을 막는 기능 추가 2024-08-06 10:42:30 +09:00
정기영
65567379b2 desgin: 퀴즈 생성/ 수정 디자인 변경 2024-08-06 10:26:03 +09:00
2c07306561 Merge branch 'fe/detailChange' into 'frontend'
[Front-end] fix: 공지사항에서는 댓글 작성 안보이게 수정

See merge request s11-webmobile1-sub2/S11P12A701!61
2024-08-06 10:14:35 +09:00
minwucho
0647558b32 feat: 공지사항은 댓글 안 받게 추가 2024-08-06 10:10:12 +09:00
faca0c7980 Merge branch 'fe/imgPath' into 'frontend'
[Front-End] fix: 이미지 경로 수정

See merge request s11-webmobile1-sub2/S11P12A701!60
2024-08-06 10:08:07 +09:00
351118fa7b fix: 이미지 경로 수정 2024-08-06 09:40:38 +09:00
조민우
fc1f16e725 Merge branch 'FE/ClassCard' into 'frontend'
[Front-End] fix: ClassCard 이미지 누락 수정

See merge request s11-webmobile1-sub2/S11P12A701!59
2024-08-06 09:00:26 +09:00
정기영
95ad3c312c fix: ClassCard img 누락 수정 2024-08-06 08:57:41 +09:00
조민우
614d3a3cf8 Merge branch 'FE/QuizCard' into 'frontend'
[Front-End] feat: QuizsetEditPage 기능 완성 및 스타일 일부 추가

See merge request s11-webmobile1-sub2/S11P12A701!58
2024-08-05 17:53:52 +09:00
정기영
3a245781f5 Merge branch 'frontend' into 'FE/QuizCard'
# Conflicts:
#   frontend/src/components/ClassCard/ClassCard.jsx
2024-08-05 17:52:06 +09:00
정기영
0980d5d0fc feat: QuizsetEditPage 기능 완성 및 스타일 일부 추가 2024-08-05 17:50:00 +09:00
조민우
08747814a0 Merge branch 'fe/liveUX' into 'frontend'
feat: 라이브 페이지 ux 개선

See merge request s11-webmobile1-sub2/S11P12A701!57
2024-08-05 17:34:04 +09:00
4448a1114c feat: 라이브 페이지 ux 개선 2024-08-05 17:32:34 +09:00
조민우
16a0c8740d Merge branch 'fe/designs' into 'frontend'
Fe/designs

See merge request s11-webmobile1-sub2/S11P12A701!56
2024-08-05 17:20:11 +09:00
ad4952fec7 feat: 라이브 페이지 권한 체크 추가 2024-08-05 17:18:39 +09:00
aeecb835c5 fix: useNotices가 suspense 사용하도록 수정 2024-08-05 17:17:48 +09:00
c52ee36ec5 design: 내 강의 스타일 수정 2024-08-05 17:17:05 +09:00
박정민
7201e0aa5c Merge branch 'BE/userinfo' into 'backend'
feat: joinroom,makeroom,deleteroom 수정

See merge request s11-webmobile1-sub2/S11P12A701!55
2024-08-05 17:12:31 +09:00
박정민
cb28eb2cd2 feat: joinroom,makeroom,deleteroom 수정 2024-08-05 17:12:11 +09:00
박정민
a63af73773 Merge branch 'be/Quiz' into 'backend'
feat: Quiz 수정시 문제 추가 기능 구현

See merge request s11-webmobile1-sub2/S11P12A701!54
2024-08-05 17:00:51 +09:00
kgc91747
525166776d Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/Quiz 2024-08-05 16:59:19 +09:00
kgc91747
3c5909926b feat: Quiz 수정시 문제 추가 기능 구현 2024-08-05 16:59:14 +09:00
박정민
aaf347b68b Merge branch 'BE/userinfo' into 'backend'
feat: 방 삭제

See merge request s11-webmobile1-sub2/S11P12A701!53
2024-08-05 16:47:05 +09:00
박정민
38c747e7d4 feat: 방 삭제 2024-08-05 16:45:56 +09:00
0f8a106804 Merge branch 'fe/useAcceptLecture' into 'frontend'
[Front-end] 강의 수강 요청 주고 받기 기능 추가

See merge request s11-webmobile1-sub2/S11P12A701!52
2024-08-05 16:39:23 +09:00
조민우
30e159273e Merge branch 'frontend' into 'fe/useAcceptLecture'
# Conflicts:
#   frontend/src/Router.jsx
2024-08-05 16:36:11 +09:00
박정민
d494e1f1b9 Merge branch 'BE/userinfo' into 'backend'
feat: joinroom 수정

See merge request s11-webmobile1-sub2/S11P12A701!51
2024-08-05 16:34:10 +09:00
박정민
1a7e6c1bba feat: joinroom 수정 2024-08-05 16:33:53 +09:00
minwucho
7a5576613f feat: 강의 수강 신청 주고 받기 기능 구현 2024-08-05 16:25:32 +09:00
김한얼
285e19dc89 Merge branch 'be/Lecture' into 'backend'
feat: Lecture 내 강의 조회 수정

See merge request s11-webmobile1-sub2/S11P12A701!47
2024-08-05 16:25:10 +09:00
박정민
9b39ba977a Merge branch 'BE/userinfo' into 'backend'
feat: joinromm 수정:

See merge request s11-webmobile1-sub2/S11P12A701!50
2024-08-05 16:16:48 +09:00
박정민
77a5aed6ec feat: joinromm 수정: 2024-08-05 16:16:14 +09:00
박정민
2a090a3016 Merge branch 'BE/userinfo' into 'backend'
feat: 어드민,학생 방 입장 로직 변경

See merge request s11-webmobile1-sub2/S11P12A701!49
2024-08-05 16:08:10 +09:00
박정민
6a6852b4f5 feat: 어드민,학생 방 입장 로직 변경 2024-08-05 16:07:37 +09:00
정기영
7f3d00dda4 Merge branch 'fe/screenSharePermission' into 'frontend'
feat: 강사만 화면 공유 할 수 있게 변경

See merge request s11-webmobile1-sub2/S11P12A701!48
2024-08-05 15:56:51 +09:00
fd52489416 feat: 강사만 화면 공유 할 수 있게 변경 2024-08-05 15:55:50 +09:00
조민우
0a9639e7fb Merge branch 'fe/errorPage' into 'frontend'
feat: 에러 페이지 추가

See merge request s11-webmobile1-sub2/S11P12A701!46
2024-08-05 15:48:13 +09:00
f44ad7e500 feat: 에러 페이지 추가 2024-08-05 15:46:30 +09:00
352a8b82a9 Merge branch 'FE/QuizsetEditPage' into 'frontend'
[Front-End] feat: quizsetEditPage 추가

See merge request s11-webmobile1-sub2/S11P12A701!45
2024-08-05 15:44:04 +09:00
정기영
5724480160 feat: QuizsetEditPage 기능 추가 2024-08-05 15:41:14 +09:00