Commit Graph

417 Commits

Author SHA1 Message Date
박정민
464d1558f4 Merge branch 'backend' into 'master'
Revert "Merge branch 'Be/Report' into 'backend'"

See merge request s11-webmobile1-sub2/S11P12A701!191
2024-08-13 15:42:53 +09:00
김기창
dee178a635 Merge branch 'be/user' into 'backend'
feat: user 회원정보 수정 시 이름만 변경 기능 수정

See merge request s11-webmobile1-sub2/S11P12A701!183
2024-08-13 12:27:25 +09:00
kgc91747
66ef65e4d5 feat: user 회원정보 수정 시 이름만 변경 기능 수정 2024-08-13 12:25:45 +09:00
김한얼
1d307c006d Merge branch 'be/lecture' into 'backend'
feat: lecture, quiz 이미지 미포함 등록 불가 수정

See merge request s11-webmobile1-sub2/S11P12A701!176
2024-08-12 15:28:26 +09:00
kgc91747
01f6315cea Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/lecture 2024-08-12 15:26:10 +09:00
kgc91747
4cd713f580 feat: lecture, quiz 이미지 미포함 등록 불가 수정 2024-08-12 15:26:04 +09:00
박정민
3d1436ad47 Merge branch 'be/lecture' into 'backend'
feat: quiz, lecture 이미지 등록시 파일 형식 확인

See merge request s11-webmobile1-sub2/S11P12A701!173
2024-08-12 13:41:24 +09:00
kgc91747
a0b363d74f feat: quiz, lecture 이미지 등록시 파일 형식 확인 2024-08-12 13:40:18 +09:00
김기창
abcf4b7959 Merge branch 'be/quiz' into 'backend'
feat: 퀴즈 시작이후  해당 퀴즈 변경 불가

See merge request s11-webmobile1-sub2/S11P12A701!169
2024-08-12 11:07:41 +09:00
kgc91747
148b6c6db0 feat: 퀴즈 시작이후 해당 퀴즈 변경 불가 2024-08-12 10:10:33 +09:00
박정민
9930da9acc Merge branch 'BE/userinfo' into 'backend'
feat: qna page변수 수정

See merge request s11-webmobile1-sub2/S11P12A701!167
2024-08-12 09:54:33 +09:00
박정민
e37088c7ee feat: qna page변수 수정 2024-08-12 09:54:06 +09:00
박정민
852d0efc2e Merge branch 'be/lecture' into 'backend'
feat: lecture 강의 삭제시 저장소에서 사진 삭제

See merge request s11-webmobile1-sub2/S11P12A701!164
2024-08-12 09:50:07 +09:00
박정민
f28e690410 Merge branch 'BE/userinfo' into 'backend'
feat: qna 페이지네이션 수정

See merge request s11-webmobile1-sub2/S11P12A701!165
2024-08-12 09:50:01 +09:00
박정민
064881b851 feat: qna 페이지네이션 수정 2024-08-12 09:49:15 +09:00
kgc91747
7fe5ec3b2b feat: lecture 강의 삭제시 저장소에서 사진 삭제 2024-08-12 09:43:48 +09:00
박정민
d539bc39e7 Merge branch 'be/board' into 'backend'
feat: board 전체조회 결과가 없는 경우 수정

See merge request s11-webmobile1-sub2/S11P12A701!161
2024-08-12 09:30:43 +09:00
kgc91747
d4bd637abd feat: board 전체조회 결과가 없는 경우 수정 2024-08-12 09:29:25 +09:00
박정민
47645e86a8 Merge branch 'BE/userinfo' into 'backend'
feat: qna 페이지네이션 수정

See merge request s11-webmobile1-sub2/S11P12A701!160
2024-08-12 09:22:50 +09:00
박정민
a80fb528f6 feat: qna 페이지네이션 수정 2024-08-12 09:21:49 +09:00
김기창
e4d8ae4046 Merge branch 'Be/Lecture' into 'backend'
[Back-End] feat : lecture 역정렬

See merge request s11-webmobile1-sub2/S11P12A701!157
2024-08-09 17:59:49 +09:00
yulmam
879748d985 feat : lecture 역정렬 2024-08-09 17:58:23 +09:00
박정민
f7c445c683 Merge branch 'be/Quiz' into 'backend'
feat: quiz 빈 퀴즈셋 등록 요청시 거절 추가

See merge request s11-webmobile1-sub2/S11P12A701!155
2024-08-09 17:13:20 +09:00
kgc91747
6be1db104a feat: quiz 빈 퀴즈셋 등록 요청시 거절 추가 2024-08-09 17:11:43 +09:00
박정민
7a1aaf8f80 Merge branch 'Be/Report' into 'backend'
[Back-End] feat : cascade 추가

See merge request s11-webmobile1-sub2/S11P12A701!154
2024-08-09 16:43:52 +09:00
yulmam
d1e7f6d581 feat : cascade 추가 2024-08-09 16:42:58 +09:00
박정민
d4d8474eff Merge branch 'BE/userinfo' into 'backend'
Be/userinfo

See merge request s11-webmobile1-sub2/S11P12A701!151
2024-08-09 16:36:27 +09:00
박정민
4d479d702e feat: cascade 설정 2024-08-09 16:35:18 +09:00
박정민
5bc56fc2a7 qna 2024-08-09 16:12:03 +09:00
박정민
e8b75b671f feat qna수정 2024-08-09 15:57:19 +09:00
김한얼
8d19361601 Merge branch 'be/registration' into 'backend'
feat: registration cascade 옵션 추가

See merge request s11-webmobile1-sub2/S11P12A701!149
2024-08-09 15:54:48 +09:00
kgc91747
fc18137c54 Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/registration 2024-08-09 15:53:48 +09:00
kgc91747
1aaeac38fe feat: registration cascade 옵션 추가 2024-08-09 15:53:42 +09:00
박정민
8d70e5d438 Merge branch 'BE/userinfo' into 'backend'
feat: casacade 추기

See merge request s11-webmobile1-sub2/S11P12A701!148
2024-08-09 15:36:34 +09:00
박정민
4cc6cec8f8 feat: casacade 추기 2024-08-09 15:35:02 +09:00
박정민
341f7171ba Merge branch 'Be/Board' into 'backend'
[Back-End] feat : cascade 추가

See merge request s11-webmobile1-sub2/S11P12A701!146
2024-08-09 15:28:50 +09:00
박정민
b18070cfaa Merge branch 'BE/userinfo' into 'backend'
feat: ondelete 설정

See merge request s11-webmobile1-sub2/S11P12A701!147
2024-08-09 15:28:30 +09:00
박정민
00680262a4 feat: ondelete 설정 2024-08-09 15:27:51 +09:00
yulmam
67153ca786 feat : cascade 추가 2024-08-09 15:18:52 +09:00
박정민
f2ccdd5620 Merge branch 'BE/userinfo' into 'backend'
feat: on delete 설정

See merge request s11-webmobile1-sub2/S11P12A701!145
2024-08-09 15:17:49 +09:00
박정민
f628bbbd00 feat: on delete 설정 2024-08-09 15:17:28 +09:00
박정민
3027afd059 Merge branch 'Be/Board' into 'backend'
[Back-End] feat : 채점시 대소문자 체크

See merge request s11-webmobile1-sub2/S11P12A701!143
2024-08-09 14:46:16 +09:00
yulmam
3e509fa9eb feat : 채점시 대소문자 체크 2024-08-09 14:45:27 +09:00
박정민
b9c2a254b3 Merge branch 'BE/userinfo' into 'backend'
feat: 유저 정보 변경

See merge request s11-webmobile1-sub2/S11P12A701!142
2024-08-09 14:29:15 +09:00
박정민
0d8f5bc8a6 feat: 유저 정보 변경 2024-08-09 14:28:43 +09:00
김기창
5ccd0e87a9 Merge branch 'Be/Board' into 'backend'
[Back-End] feat : timezone 변경

See merge request s11-webmobile1-sub2/S11P12A701!141
2024-08-09 14:21:24 +09:00
yulmam
405e45b9d1 feat : timezone 변경 2024-08-09 14:20:31 +09:00
박정민
7f0a76d8cc Merge branch 'BE/userinfo' into 'backend'
feat: 회원정보 변경시 이메일 중복 검사

See merge request s11-webmobile1-sub2/S11P12A701!140
2024-08-09 14:19:50 +09:00
박정민
423332bacb feat: 회원정보 변경시 이메일 중복 검사 2024-08-09 14:19:10 +09:00
김기창
12c34005cd Merge branch 'Be/Board' into 'backend'
feat : timezone 변경

See merge request s11-webmobile1-sub2/S11P12A701!139
2024-08-09 14:02:52 +09:00