Commit Graph

909 Commits

Author SHA1 Message Date
박정민
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
a974de241b Merge branch 'FE/Logout' into 'frontend'
[Front-End] fix: logout 요청 메서드 get -> post

See merge request s11-webmobile1-sub2/S11P12A701!23
2024-08-02 13:42:30 +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
정기영
f5f3995c92 Merge branch 'fe/liveConference' into 'frontend'
[Front-End] feat: 화상회의 추가

See merge request s11-webmobile1-sub2/S11P12A701!24
2024-08-02 13:41:31 +09:00
박정민
b22009ef75 feat: qna 기능수정 2024-08-02 13:41:07 +09:00
2ab53ecc12 feat: 화상회의 추가 2024-08-02 13:40:14 +09:00
정기영
d231c8ec46 fix : logout 요청 post로 변경 2024-08-02 13:25:21 +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
3540180742 Merge branch 'FE/QuizsetListPage' into 'frontend'
[Front-End] feat: quizsetListPage 추가 외

See merge request s11-webmobile1-sub2/S11P12A701!19
2024-08-02 12:08:21 +09:00
정기영
715bb2d042 fix: 불필요한 주석 삭제 2024-08-02 11:36:06 +09:00
정기영
1d0cc39f4c fix: accessToken 콘솔 로그 삭제 2024-08-02 11:33:59 +09:00
정기영
fe7cf10f03 feat: Quizset 생성 및 조회, 로그아웃 기능 임시 추가 2024-08-02 11:30:47 +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
정기영
561f91481c feat: QuizSet Create / Read 2024-08-01 17:52:22 +09:00
조민우
a9fdeecae7 Merge branch 'fe/pageLayoutLoading' into 'frontend'
[Front-End] fix: PageLayout에 로딩 인디케이터 중앙 정렬

See merge request s11-webmobile1-sub2/S11P12A701!15
2024-08-01 17:49:21 +09:00
cff1250b4c fix: PageLayout에 로딩 인디케이터 중앙 정렬 2024-08-01 17:47:52 +09:00
정기영
ebaf3d13e0 Merge branch 'fe/fixLoadingIndicator' into 'frontend'
[Front-End] Fe/fix loading indicator

See merge request s11-webmobile1-sub2/S11P12A701!14
2024-08-01 17:21:30 +09:00
d3d325cf6f fix: loading indicator 속성 이름 fix 2024-08-01 17:19:28 +09:00
정기영
1321e2ca1a Merge branch 'fe/chaturl' into 'frontend'
[Front-End] 채팅 url 변경, 로딩 인디케이터 추가

See merge request s11-webmobile1-sub2/S11P12A701!13
2024-08-01 17:14:29 +09:00
0746b8b180 Merge branch 'frontend' into 'fe/chaturl'
# Conflicts:
#   frontend/src/components/Layout/LectureLayout.jsx
2024-08-01 17:13:52 +09:00
a5020532e4 feat: 로딩 인디케이터 추가 2024-08-01 17:11:11 +09:00
b51a604697 fix: 채팅 url 업데이트 2024-08-01 17:09:35 +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
박정민
48d08f0816 feat: lecetureServiceImpl Refactoring 2024-08-01 16:50:42 +09:00
박정민
4f64d316d8 Merge branch 'be/Quiz' into 'backend'
refactor: Quiz 리팩토링

See merge request s11-webmobile1-sub2/S11P12A701!10
2024-08-01 16:46:15 +09:00
박정민
09fa7947a5 Merge branch 'BE/userinfo' into 'backend'
jenkins setting

See merge request s11-webmobile1-sub2/S11P12A701!11
2024-08-01 16:34:18 +09:00
박정민
88693ac9b5 jenkins setting 2024-08-01 16:33:41 +09:00
박정민
c5840e5a34 Merge branch 'BE/userinfo' into 'backend'
feat: 오류수정

See merge request s11-webmobile1-sub2/S11P12A701!9
2024-08-01 15:22:14 +09:00
박정민
3cc05cb961 feat: 오류수정 2024-08-01 15:21:52 +09:00
박정민
693e69c7d1 Merge branch 'BE/userinfo' into 'backend'
feat: user수정

See merge request s11-webmobile1-sub2/S11P12A701!8
2024-08-01 15:14:29 +09:00
박정민
15399f1e6b feat: user수정 2024-08-01 15:14:00 +09:00
kgc91747
3a7204cfba refactor: Quiz 리팩토링 2024-08-01 15:02:44 +09:00
45f63e4819 Merge branch 'FE/EditLecturePage' into 'frontend'
[Front-End] feat: LectureEditPage, Lecutre Delete 추가

See merge request s11-webmobile1-sub2/S11P12A701!7
2024-08-01 14:46:05 +09:00
정기영
f37c344249 feat: LectureEditPage, Lecutre Delete 추가 2024-08-01 14:44:13 +09:00
박정민
8c49670a89 Merge branch 'BE/userinfo' into 'backend'
feat: 수강중 확인 기능 수정

See merge request s11-webmobile1-sub2/S11P12A701!6
2024-08-01 13:19:29 +09:00
박정민
6c36715a25 feat: 수강중 확인 기능 수정 2024-08-01 13:18:42 +09:00