Commit Graph

228 Commits

Author SHA1 Message Date
박정민
874aa9a68d Merge branch 'BE/userinfo' into 'backend'
gitlab jenkins test

See merge request s11-webmobile1-sub2/S11P12A701!5
2024-08-01 10:45:43 +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
박정민
56970789d2 Merge branch 'BE/userinfo' into 'backend'
gitlab runner test

See merge request s11-webmobile1-sub2/S11P12A701!2
2024-08-01 09:38:01 +09:00
박정민
1fc4ec876e gitlab runner test 2024-08-01 09:35:52 +09:00
Jungmin
fe8e5f1bd0
Merge pull request #158 from TeamBNBN/BE/userinfo
feat: video
2024-07-31 16:05:15 +09:00
박정민
a8df7b39ad feat: video 2024-07-31 16:04:27 +09:00
Jungmin
9bb362302a
Merge pull request #157 from TeamBNBN/BE/userinfo
feat: 비밀번호 암호화 , 회원정보 변경 기능 수정
2024-07-31 15:28:43 +09:00
박정민
a117b8ef86 feat: 비밀번호 암호화 , 회원정보 변경 기능 수정 2024-07-31 15:28:00 +09:00
Jungmin
4f05eac0c7
Merge pull request #156 from TeamBNBN/BE/userinfo
feat: cors
2024-07-31 15:20:59 +09:00
박정민
b28b6b7637 feat: cors 2024-07-31 15:20:25 +09:00
Jungmin
0f52f01b7e
Merge pull request #155 from TeamBNBN/BE/userinfo
feat: cors
2024-07-31 15:12:18 +09:00
박정민
c854debbe7 feat: cors 2024-07-31 15:11:49 +09:00
Jungmin
176b1554e9
Merge pull request #154 from TeamBNBN/BE/userinfo
feat: cors설정
2024-07-31 14:12:36 +09:00
박정민
051ea7cad4 feat: cors설정 2024-07-31 14:11:54 +09:00
Jungmin
cf845f6d8e
Merge pull request #153 from TeamBNBN/BE/userinfo
faet: cookie
2024-07-31 13:51:15 +09:00
박정민
9934fef06c faet: cookie 2024-07-31 13:50:34 +09:00
Jungmin
29e146253b
Merge pull request #152 from TeamBNBN/BE/userinfo
feat: sameorigin 설정
2024-07-31 13:03:30 +09:00
박정민
47d8649057 feat: sameorigin 설정 2024-07-31 13:02:33 +09:00
Jungmin
6dd847f440
Merge pull request #151 from TeamBNBN/be/ws
[Back-End] feat : RabbitMQ 추가 완
2024-07-31 12:57:50 +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
Jungmin
f4bbfb27ae
Merge pull request #150 from TeamBNBN/BE/userinfo
feat: openvidu 설정
2024-07-31 12:38:17 +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
Jungmin
3625f42c04
Merge pull request #148 from TeamBNBN/BE/userinfo
feat: global exception 수정
2024-07-31 11:07:50 +09:00
박정민
62dde35a66 feat: global exception 수정 2024-07-31 11:07:11 +09:00
Jungmin
a98e2c73eb
Merge pull request #147 from TeamBNBN/BE/userinfo
BE/userinfo
2024-07-31 10:38:12 +09:00
박정민
f813e55733 BE/userinfo 2024-07-31 10:37:40 +09:00
Jungmin
94ff99ad14
Merge pull request #145 from TeamBNBN/BE/userinfo
feat: refresh token 예외처리
2024-07-30 17:36:10 +09:00
박정민
ce4c6a1c8d feat: refresh token 예외처리 2024-07-30 17:35:37 +09:00
Jungmin
7cd5f493cf
Merge pull request #143 from TeamBNBN/BE/userinfo
feat: user test기능 추가
2024-07-30 15:39:25 +09:00
박정민
4573f43355 feat: user test기능 추가 2024-07-30 15:38:42 +09:00
Jungmin
5aba095060
Merge pull request #142 from TeamBNBN/BE/userinfo
feat: user login 수정
2024-07-30 15:01:03 +09:00
박정민
96a124a822 feat: user login 수정 2024-07-30 15:00:31 +09:00
Jungmin
3fc1f37b1a
Merge pull request #140 from TeamBNBN/be/Quiz
feat: Quiz 등록, 조회 요청 형식 변경 반영
2024-07-30 14:33:46 +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
Jungmin
97db5b2bbb
Merge pull request #141 from TeamBNBN/BE/userinfo
feat: 유저 회원정보 수정 기능
2024-07-30 13:05:25 +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
Jungmin
31177d35a5
Merge pull request #139 from TeamBNBN/BE/registration
feat: openvidu 수정
2024-07-30 09:33:43 +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