Commit Graph

253 Commits

Author SHA1 Message Date
박정민
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
박정민
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
박정민
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
박정민
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
박정민
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