Commit Graph

391 Commits

Author SHA1 Message Date
박정민
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
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
박정민
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
박정민
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
박정민
2636833458 feat: 강의 만들기/입장 로직 추가 2024-08-05 10:19:53 +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
박정민
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
박정민
7461977156 feat: openvidu 설정 2024-08-02 17:02:00 +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
박정민
3a8b244f14 feat: video controller 2024-08-02 13:50:35 +09:00
박정민
bd5e03d184 Merge branch 'BE/userinfo' into 'backend'
feat: openvidu 수정

See merge request s11-webmobile1-sub2/S11P12A701!26
2024-08-02 13:50:04 +09:00
박정민
156955d847 feat: openvidu 수정 2024-08-02 13:48:23 +09:00
박정민
169c1bc9dc Merge branch 'BE/userinfo' into 'backend'
feat: qna 기능수정

See merge request s11-webmobile1-sub2/S11P12A701!25
2024-08-02 13:41:43 +09:00
박정민
b22009ef75 feat: qna 기능수정 2024-08-02 13:41:07 +09:00
박정민
788eddc4a5 Merge branch 'BE/userinfo' into 'backend'
feat: qna delete 수정

See merge request s11-webmobile1-sub2/S11P12A701!22
2024-08-02 13:20:46 +09:00
박정민
2db6511a19 feat: qna delete 수정 2024-08-02 13:20:02 +09:00
박정민
ca1437f34c Merge branch 'BE/userinfo' into 'backend'
feat: video 수정

See merge request s11-webmobile1-sub2/S11P12A701!21
2024-08-02 13:16:35 +09:00
박정민
f0ef0a397d feat: video 수정 2024-08-02 13:15:52 +09:00
박정민
fe26e1760c Merge branch 'BE/userinfo' into 'backend'
BE/uesrinfo

See merge request s11-webmobile1-sub2/S11P12A701!20
2024-08-02 12:56:39 +09:00
박정민
679a885919 BE/uesrinfo 2024-08-02 12:56:05 +09:00
박정민
fe6dd89322 Merge branch 'BE/userinfo' into 'backend'
feat: user cors에러 수정

See merge request s11-webmobile1-sub2/S11P12A701!18
2024-08-02 11:25:17 +09:00
박정민
b05f555d9a feat: user cors에러 수정 2024-08-02 11:24:45 +09:00
박정민
0ab2e3502c Merge branch 'BE/userinfo' into 'backend'
feat: video 수정

See merge request s11-webmobile1-sub2/S11P12A701!17
2024-08-02 11:18:52 +09:00
박정민
b798f04dfc feat: video 수정 2024-08-02 11:18:19 +09:00
박정민
e452fcc226 Merge branch 'BE/userinfo' into 'backend'
Be/userinfo

See merge request s11-webmobile1-sub2/S11P12A701!16
2024-08-02 11:15:41 +09:00
박정민
8fdda0f6af BE/userinfo 2024-08-02 11:14:41 +09:00
박정민
9a520316ca Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into BE/userinfo 2024-08-02 09:51:25 +09:00
박정민
cc195bb447 Merge branch 'be/Lecture' into 'backend'
refactor: Lecture 강의 상세조회 리팩토링

See merge request s11-webmobile1-sub2/S11P12A701!12
2024-08-01 17:02:22 +09:00
kgc91747
c36e444d9c refactor: Lecture 강의 상세조회 리팩토링 2024-08-01 17:01:00 +09:00