kgc91747
|
d9adb66800
|
fix: conflict solve
|
2024-08-07 10:45:35 +09:00 |
|
kgc91747
|
b4ec889080
|
merge backend
|
2024-08-07 10:41:52 +09:00 |
|
kgc91747
|
509a41fd0a
|
feat: email 비밀번호 찾기 이메일 인증 추가
|
2024-08-07 10:39:16 +09:00 |
|
김한얼
|
fc88f02aba
|
Merge branch 'BE/userinfo' into 'backend'
feat: report 학생,강사 조회 기능 추가
See merge request s11-webmobile1-sub2/S11P12A701!80
|
2024-08-07 10:15:53 +09:00 |
|
박정민
|
e8c88f9b1b
|
feat: report 학생,강사 조회 기능 추가
|
2024-08-07 10:15:12 +09:00 |
|
박정민
|
b6672b9fa3
|
Merge branch 'Be/user' into 'backend'
[Back-End] feat : 이메일 중복 체크 추가
See merge request s11-webmobile1-sub2/S11P12A701!78
|
2024-08-07 09:50:51 +09:00 |
|
yulmam
|
96e3949700
|
feat : 이메일 중복 체크 추가
|
2024-08-07 09:48:35 +09:00 |
|
김기창
|
eaa268acf0
|
Merge branch 'Be/lecture' into 'backend'
[Back-End] feat : onlinestate 체크 컨트롤러 추가
See merge request s11-webmobile1-sub2/S11P12A701!77
|
2024-08-07 09:10:33 +09:00 |
|
yulmam
|
747af409fa
|
feat : onlinestate 체크 컨트롤러 추가
|
2024-08-07 09:09:40 +09:00 |
|
박정민
|
84e56206dc
|
feat: report 제출 및 채점 기능
|
2024-08-06 17:08:00 +09:00 |
|
박정민
|
cc15074d9a
|
Merge branch 'Be/Board' into 'backend'
refactor : board name 출력 변경
See merge request s11-webmobile1-sub2/S11P12A701!70
|
2024-08-06 16:48:56 +09:00 |
|
yulmam
|
a4b3bab290
|
refactor : board name 출력 변경
|
2024-08-06 16:47:01 +09:00 |
|
박정민
|
d8b236960f
|
feat: report 조회 기능 추가
|
2024-08-06 16:32:45 +09:00 |
|
김기창
|
8474cc9c18
|
Merge branch 'Be/Board' into 'backend'
[Back-End] refactor : summary 수정
See merge request s11-webmobile1-sub2/S11P12A701!67
|
2024-08-06 14:42:30 +09:00 |
|
yulmam
|
a14ba8b04b
|
refactor : summary 수정
|
2024-08-06 14:40:54 +09:00 |
|
박정민
|
6925c50349
|
feat: deleteroom 수정
|
2024-08-06 14:01:22 +09:00 |
|
박정민
|
57acdf06d6
|
db변경
|
2024-08-06 13:38:27 +09:00 |
|
박정민
|
62b690b205
|
feat: update -> create
|
2024-08-06 13:24:31 +09:00 |
|
박정민
|
31faa12d83
|
feat: 퀴즈 채점 기능 수정
|
2024-08-06 13:18:26 +09:00 |
|
박정민
|
cb28eb2cd2
|
feat: joinroom,makeroom,deleteroom 수정
|
2024-08-05 17:12:11 +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 |
|
박정민
|
38c747e7d4
|
feat: 방 삭제
|
2024-08-05 16:45:56 +09:00 |
|
박정민
|
1a7e6c1bba
|
feat: joinroom 수정
|
2024-08-05 16:33:53 +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 |
|
박정민
|
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
|
09d86ebcdf
|
feat: Lecture 내 강의 조회 수정
|
2024-08-05 15:35:11 +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 |
|
박정민
|
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 |
|
박정민
|
4c019a6fb0
|
feat: access-token 재설정
|
2024-08-05 09:18:21 +09:00 |
|
박정민
|
a44d29ee1e
|
feat: user token exception
|
2024-08-02 17:39:51 +09:00 |
|
박정민
|
874b877399
|
reafactoring: mailsender
|
2024-08-02 17:24:50 +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 |
|
kgc91747
|
75a4baf782
|
feat: Registration 미승인 수강신청 조회, 중복신청 확인 추가
|
2024-08-02 15:41:42 +09:00 |
|
박정민
|
3a8b244f14
|
feat: video controller
|
2024-08-02 13:50:35 +09:00 |
|
박정민
|
156955d847
|
feat: openvidu 수정
|
2024-08-02 13:48:23 +09:00 |
|
박정민
|
b22009ef75
|
feat: qna 기능수정
|
2024-08-02 13:41:07 +09:00 |
|
박정민
|
2db6511a19
|
feat: qna delete 수정
|
2024-08-02 13:20:02 +09:00 |
|
박정민
|
f0ef0a397d
|
feat: video 수정
|
2024-08-02 13:15:52 +09:00 |
|
박정민
|
679a885919
|
BE/uesrinfo
|
2024-08-02 12:56:05 +09:00 |
|
박정민
|
b05f555d9a
|
feat: user cors에러 수정
|
2024-08-02 11:24:45 +09:00 |
|
박정민
|
b798f04dfc
|
feat: video 수정
|
2024-08-02 11:18:19 +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 |
|
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 |
|
박정민
|
88693ac9b5
|
jenkins setting
|
2024-08-01 16:33:41 +09:00 |
|
박정민
|
3cc05cb961
|
feat: 오류수정
|
2024-08-01 15:21:52 +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 |
|
박정민
|
6c36715a25
|
feat: 수강중 확인 기능 수정
|
2024-08-01 13:18:42 +09:00 |
|
박정민
|
cdf8dbc30e
|
Merge branch 'be/Lecture' into 'backend'
feat: Lecture, Quiz 이미지 저장 위치 설정 추가
See merge request s11-webmobile1-sub2/S11P12A701!4
|
2024-08-01 10:59:29 +09:00 |
|
박정민
|
25bcd5203f
|
Merge branch 'be/user' into 'backend'
[Back-End] feat: user중복로그인 체크
See merge request s11-webmobile1-sub2/S11P12A701!3
|
2024-08-01 10:53:15 +09:00 |
|
박정민
|
430543bf18
|
gitlab jenkins test
|
2024-08-01 10:45:07 +09:00 |
|
kgc91747
|
eaf11abec3
|
Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/Lecture
|
2024-08-01 10:29:28 +09:00 |
|
kgc91747
|
9f1ccf8b2e
|
feat: Lecture, Quiz 이미지 저장 위치 설정 추가
|
2024-08-01 10:29:22 +09:00 |
|
yulmam
|
555df4106c
|
feat: user중복로그인 체크
|
2024-08-01 10:26:47 +09:00 |
|
박정민
|
1fc4ec876e
|
gitlab runner test
|
2024-08-01 09:35:52 +09:00 |
|
박정민
|
a8df7b39ad
|
feat: video
|
2024-07-31 16:04:27 +09:00 |
|
박정민
|
a117b8ef86
|
feat: 비밀번호 암호화 , 회원정보 변경 기능 수정
|
2024-07-31 15:28:00 +09:00 |
|
박정민
|
b28b6b7637
|
feat: cors
|
2024-07-31 15:20:25 +09:00 |
|
박정민
|
c854debbe7
|
feat: cors
|
2024-07-31 15:11:49 +09:00 |
|
박정민
|
051ea7cad4
|
feat: cors설정
|
2024-07-31 14:11:54 +09:00 |
|
박정민
|
9934fef06c
|
faet: cookie
|
2024-07-31 13:50:34 +09:00 |
|
박정민
|
47d8649057
|
feat: sameorigin 설정
|
2024-07-31 13:02:33 +09:00 |
|
yulmam
|
cfb999e7e7
|
Merge branch 'backend' into be/ws
|
2024-07-31 12:57:29 +09:00 |
|
yulmam
|
b9cc9b8a50
|
feat : rabbitmq 추가 완료
|
2024-07-31 12:52:40 +09:00 |
|
Jungmin
|
80fc29a195
|
Merge pull request #149 from TeamBNBN/be/Registration
feat: Registration 강의별 수강신청 현황 조회 추가
|
2024-07-31 12:43:02 +09:00 |
|
박정민
|
60baa59027
|
feat: openvidu 설정
|
2024-07-31 12:37:37 +09:00 |
|
kgc9007
|
ca821ca3e3
|
fix: conflict 수정 후 merge
|
2024-07-31 11:27:00 +09:00 |
|
kgc9007
|
34050e912d
|
feat: Registration 강의별 수강신청 현황 조회 추가
|
2024-07-31 11:17:46 +09:00 |
|
박정민
|
62dde35a66
|
feat: global exception 수정
|
2024-07-31 11:07:11 +09:00 |
|
박정민
|
f813e55733
|
BE/userinfo
|
2024-07-31 10:37:40 +09:00 |
|
박정민
|
ce4c6a1c8d
|
feat: refresh token 예외처리
|
2024-07-30 17:35:37 +09:00 |
|
박정민
|
4573f43355
|
feat: user test기능 추가
|
2024-07-30 15:38:42 +09:00 |
|
박정민
|
96a124a822
|
feat: user login 수정
|
2024-07-30 15:00:31 +09:00 |
|
kgc9007
|
fbcaff40dd
|
Merge branch 'backend' of https://github.com/TeamBNBN/edufocus into be/Quiz
|
2024-07-30 14:23:47 +09:00 |
|
kgc9007
|
97c25fff13
|
feat: Quiz 사진 등록, 목록 조회 추가
|
2024-07-30 14:23:41 +09:00 |
|
박정민
|
bfa6387a72
|
feat: 유저 회원정보 수정 기능
|
2024-07-30 13:04:45 +09:00 |
|
kgc9007
|
10ef02eaf4
|
Merge branch 'backend' of https://github.com/TeamBNBN/edufocus into be/Quiz
|
2024-07-30 10:17:15 +09:00 |
|
yulmam
|
ace52afb55
|
Merge pull request #131 from TeamBNBN/be/Lecture
fix: Lecture 빈 목록 조회시 반환 타입 수정
|
2024-07-30 10:09:33 +09:00 |
|
박정민
|
78b37baf9f
|
feat: openvidu 수정
|
2024-07-30 09:32:37 +09:00 |
|
kgc9007
|
8dd5676a26
|
feat: Quiz 등록, 조회 요청 형식 변경 반영
|
2024-07-29 17:54:27 +09:00 |
|
yulmam
|
c94827259f
|
feat : rabbitmq 추가
|
2024-07-29 17:53:55 +09:00 |
|
박정민
|
764f5bd30d
|
feat: video
|
2024-07-29 15:18:37 +09:00 |
|
박정민
|
bcf36665f9
|
feat: cors 설정
|
2024-07-29 15:11:25 +09:00 |
|
박정민
|
32d2592841
|
feat: cors
|
2024-07-29 14:58:44 +09:00 |
|