박정민
|
c517413845
|
Merge branch 'backend' into 'BE/userinfo'
# Conflicts:
# backend/src/main/java/com/edufocus/edufocus/mail/service/MailServiceImpl.java
|
2024-08-07 17:46:16 +09:00 |
|
박정민
|
1711fcaf95
|
feat: qna 수정
|
2024-08-07 17:44:27 +09:00 |
|
kgc91747
|
78cfed17e7
|
feat: 이메일 인증 실패시 반환값 변경
|
2024-08-07 17:27:46 +09:00 |
|
kgc91747
|
896e530d68
|
Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/email
|
2024-08-07 17:19:14 +09:00 |
|
kgc91747
|
e9d0db30e5
|
feat: 이메일 인증 코드 재요청시 기존 코드 삭제 추가
|
2024-08-07 17:19:07 +09:00 |
|
박정민
|
25f7343b04
|
feat:qna 수정
|
2024-08-07 17:04:19 +09:00 |
|
박정민
|
8d4d9e0227
|
feat: qna 수정
|
2024-08-07 16:57:38 +09:00 |
|
박정민
|
47d480210e
|
Merge branch 'BE/userinfo' into 'backend'
feat: qna 답변 수정
See merge request s11-webmobile1-sub2/S11P12A701!88
|
2024-08-07 15:31:16 +09:00 |
|
박정민
|
c3c574baf3
|
feat: qna 답변 수정
|
2024-08-07 15:30:54 +09:00 |
|
kgc91747
|
9032a156c4
|
feat: redis password 설정 추가
|
2024-08-07 14:23:44 +09:00 |
|
kgc91747
|
779538d2e8
|
Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/email
|
2024-08-07 13:42:24 +09:00 |
|
kgc91747
|
919b61c47c
|
refactor: email API 경로명 수정
|
2024-08-07 13:42:17 +09:00 |
|
박정민
|
45cfe09389
|
Merge branch 'Be/Board' into 'backend'
feat : 게시판 댓글 작성자 체크
See merge request s11-webmobile1-sub2/S11P12A701!83
|
2024-08-07 11:09:01 +09:00 |
|
yulmam
|
208bd69d5b
|
feat : 게시판 댓글 작성자 체크
|
2024-08-07 11:08:26 +09:00 |
|
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 |
|