kgc91747
|
72ce32dfb0
|
Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/Lecture
|
2024-08-05 15:35:16 +09:00 |
|
kgc91747
|
09d86ebcdf
|
feat: Lecture 내 강의 조회 수정
|
2024-08-05 15:35:11 +09:00 |
|
김한얼
|
0147dc7c25
|
Merge branch 'be/Quiz' into 'backend'
feat: Quiz 수정 추가
See merge request s11-webmobile1-sub2/S11P12A701!44
|
2024-08-05 15:32:42 +09:00 |
|
kgc91747
|
e224f0096b
|
merge backend
|
2024-08-05 14:38:40 +09:00 |
|
kgc91747
|
f29ca87ee7
|
feat: Quiz 수정 추가
|
2024-08-05 14:35:13 +09:00 |
|
|
|
08b680ecdb
|
Merge branch 'FE/useQuizsetDetail' into 'frontend'
fix: 커밋 누락사항(quizset, updateinfo) 재반영
See merge request s11-webmobile1-sub2/S11P12A701!43
|
2024-08-05 13:26:06 +09:00 |
|
정기영
|
4d4a2b579f
|
fix: 커밋 누락사항(quizset, updateinfo) 재반영
|
2024-08-05 13:23:39 +09:00 |
|
박정민
|
547cff9330
|
Merge branch 'BE/userinfo' into 'backend'
Be/userinfo
See merge request s11-webmobile1-sub2/S11P12A701!42
|
2024-08-05 13:23:32 +09:00 |
|
박정민
|
e0dcdee366
|
feat: db update
|
2024-08-05 13:21:59 +09:00 |
|
박정민
|
3baad15fdd
|
Merge branch 'BE/userinfo' into 'backend'
feat: 강의 만들기/입장 로직 추가
See merge request s11-webmobile1-sub2/S11P12A701!36
|
2024-08-05 13:18:24 +09:00 |
|
정기영
|
fedebaeb0f
|
Merge branch 'fe/liveHeader' into 'frontend'
feat: 라이브 강의 헤더 변경
See merge request s11-webmobile1-sub2/S11P12A701!41
|
2024-08-05 13:11:12 +09:00 |
|
|
|
2106a35b81
|
feat: 라이브 강의 헤더 변경
|
2024-08-05 13:10:11 +09:00 |
|
조민우
|
a8069bb562
|
Merge branch 'FE/DefaultHomePage' into 'frontend'
[Front-End] fix : img 링크 수정
See merge request s11-webmobile1-sub2/S11P12A701!40
|
2024-08-05 12:05:36 +09:00 |
|
정기영
|
4bee96490c
|
Merge branch 'fe/livekit' into 'frontend'
[Front-End] feat: 라이브 수업 구현
See merge request s11-webmobile1-sub2/S11P12A701!39
|
2024-08-05 12:05:29 +09:00 |
|
|
|
3ed79652bd
|
Merge branch 'frontend' into 'fe/livekit'
# Conflicts:
# frontend/src/hooks/api/useAuth.js
# frontend/src/pages/MyInfoChangePage/MyInfoChangePage.jsx
# frontend/src/pages/PasswordChangePage/PasswordChangePage.jsx
|
2024-08-05 11:44:59 +09:00 |
|
정기영
|
cbb4a20ac1
|
fix : img 링크 수정
|
2024-08-05 11:43:34 +09:00 |
|
|
|
676bba7cbd
|
Merge branch 'FE/DefaultHomePage' into 'frontend'
[Front-End] feat: DefaultHomePage 추가
See merge request s11-webmobile1-sub2/S11P12A701!38
|
2024-08-05 11:43:28 +09:00 |
|
|
|
ba6945de05
|
feat: 라이브 수업 구현
|
2024-08-05 11:42:40 +09:00 |
|
정기영
|
490c6eb1d9
|
fix: put/post 이후 리다이렉트 수정
|
2024-08-05 11:15:53 +09:00 |
|
정기영
|
087393e400
|
fix: 강의 생성 시 강의 목록으로 리다이렉트
|
2024-08-05 11:08:58 +09:00 |
|
정기영
|
5512f2f596
|
feat: 메인페이지 이미지 url 추가
|
2024-08-05 11:00:57 +09:00 |
|
정기영
|
3ef118ca0f
|
feat: DefaultStudentPage 추가
|
2024-08-05 10:52:33 +09:00 |
|
박정민
|
5115cc41d7
|
Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into BE/userinfo
|
2024-08-05 10:35:54 +09:00 |
|
김한얼
|
a4b0275956
|
Merge branch 'be/Quiz' into 'backend'
feat: Quiz 강사/학생 타입별 퀴즈 조회 결과 구분
See merge request s11-webmobile1-sub2/S11P12A701!29
|
2024-08-05 10:25:50 +09:00 |
|
박정민
|
a140ce8192
|
Merge branch 'Be/user' into 'backend'
[Back-End] refactor : user 서비스 리펙토링
See merge request s11-webmobile1-sub2/S11P12A701!37
|
2024-08-05 10:23:53 +09:00 |
|
yulmam
|
772fb038c7
|
refactor : user 서비스 리펙토링
|
2024-08-05 10:22:16 +09:00 |
|
|
|
e3667f1b73
|
Merge branch 'FE/useQuizsetWrite' into 'frontend'
[Front-End] feat: useQuizsetWrite 추가 외
See merge request s11-webmobile1-sub2/S11P12A701!32
|
2024-08-05 10:21:26 +09:00 |
|
박정민
|
2636833458
|
feat: 강의 만들기/입장 로직 추가
|
2024-08-05 10:19:53 +09:00 |
|
정기영
|
9727b55e0d
|
feat: updatePassword, updateInfo 기능 연결
|
2024-08-05 10:18:29 +09:00 |
|
박정민
|
ec839ab8f0
|
Merge branch 'BE/userinfo' into 'backend'
feat: access-token 재설정
See merge request s11-webmobile1-sub2/S11P12A701!35
|
2024-08-05 09:19:24 +09:00 |
|
박정민
|
4c019a6fb0
|
feat: access-token 재설정
|
2024-08-05 09:18:21 +09:00 |
|
FF
|
ef4e56c860
|
fix: 코드 테스트용 주석 제거
|
2024-08-03 10:11:48 +09:00 |
|
FF
|
4c958a68d9
|
feat: QuizsetWrite 카드 삭제기능 추가
|
2024-08-03 10:10:02 +09:00 |
|
박정민
|
65a26f74d6
|
Merge branch 'BE/userinfo' into 'backend'
feat: user token exception
See merge request s11-webmobile1-sub2/S11P12A701!34
|
2024-08-02 17:40:25 +09:00 |
|
박정민
|
a44d29ee1e
|
feat: user token exception
|
2024-08-02 17:39:51 +09:00 |
|
박정민
|
03ff837ad5
|
Merge branch 'BE/userinfo' into 'backend'
reafactoring: mailsender
See merge request s11-webmobile1-sub2/S11P12A701!33
|
2024-08-02 17:25:24 +09:00 |
|
박정민
|
874b877399
|
reafactoring: mailsender
|
2024-08-02 17:24:50 +09:00 |
|
박정민
|
41a04df278
|
Merge branch 'BE/userinfo' into 'backend'
Be/userinfo
See merge request s11-webmobile1-sub2/S11P12A701!31
|
2024-08-02 17:20:10 +09:00 |
|
박정민
|
3302c8b51e
|
feat: token 수정
|
2024-08-02 17:19:17 +09:00 |
|
정기영
|
f14a7c2095
|
design: LectureCreatePage 디자인 수정
|
2024-08-02 17:15:46 +09:00 |
|
정기영
|
1eaf3f6fa1
|
feat: PasswordChangePage 기능 연결(미완성)
|
2024-08-02 17:04:48 +09:00 |
|
박정민
|
7461977156
|
feat: openvidu 설정
|
2024-08-02 17:02:00 +09:00 |
|
|
|
ee32d8813a
|
Merge branch 'fe/useQnaEdit' into 'frontend'
[Front-end] feat: Qna와 Answer 수정 삭제 생성 기능 추가
See merge request s11-webmobile1-sub2/S11P12A701!30
|
2024-08-02 16:44:06 +09:00 |
|
조민우
|
777495ae4b
|
Merge branch 'frontend' into 'fe/useQnaEdit'
# Conflicts:
# frontend/src/Router.jsx
|
2024-08-02 16:43:41 +09:00 |
|
minwucho
|
bdcd01acb7
|
feat: Qna와 Answer 수정 삭제 생성 기능 추가
|
2024-08-02 16:26:36 +09:00 |
|
kgc91747
|
44e9308927
|
feat: Quiz 강사/학생 타입별 퀴즈 조회 결과 구분
|
2024-08-02 16:18:17 +09:00 |
|
박정민
|
d280424d55
|
feat: token exception (작업중)
|
2024-08-02 16:07:27 +09:00 |
|
박정민
|
176a68dfb8
|
Merge branch 'be/Registration' into 'backend'
feat: Registration 미승인 수강신청 조회, 중복신청 확인 추가
See merge request s11-webmobile1-sub2/S11P12A701!28
|
2024-08-02 15:47:54 +09:00 |
|
kgc91747
|
75a4baf782
|
feat: Registration 미승인 수강신청 조회, 중복신청 확인 추가
|
2024-08-02 15:41:42 +09:00 |
|
박정민
|
e0f5168638
|
Merge branch 'BE/userinfo' into 'backend'
feat: video controller
See merge request s11-webmobile1-sub2/S11P12A701!27
|
2024-08-02 13:50:55 +09:00 |
|
