Commit Graph

216 Commits

Author SHA1 Message Date
박정민
e07f47213d feat: qna 조회 수정 2024-08-09 09:51:05 +09:00
박정민
4b5bdb5ae5 feat: qna answer,content 자료형 변경 2024-08-08 16:59:44 +09:00
박정민
349c85ff74 feat: qna createAT timestamp로 변경 2024-08-08 16:35:08 +09:00
kgc91747
8e411a974f Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/registration 2024-08-08 16:31:17 +09:00
kgc91747
159125a12a feat: registration 수강 현황 조회 추가 2024-08-08 16:31:12 +09:00
박정민
6b81a22d6f feat: qna 조회 수정 2024-08-08 16:10:45 +09:00
kgc91747
8c37e13cce Merge branch 'backend' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/quiz 2024-08-08 16:03:18 +09:00
kgc91747
ebadf5e5a7 feat: quiz 실시된 기록이 있는 퀴즈 수정 제한 2024-08-08 16:03:10 +09:00
박정민
1567e6ce07 feat: qna 수정 2024-08-08 13:05:08 +09:00
김기창
499afc2a76 Merge branch 'Be/Board' into 'backend'
[Back-End] refactor : 게시판 정렬 변경

See merge request s11-webmobile1-sub2/S11P12A701!104
2024-08-08 10:55:11 +09:00
yulmam
026e4c3766 refactor : 게시판 정렬 변경 2024-08-08 10:54:17 +09:00
박정민
35c98af73f feat: qna 수정 2024-08-08 10:51:07 +09:00
김한얼
c720d97985 Merge branch 'be/quiz' into 'backend'
feat: quiz 수정 불가능한 상태로 변경 기능 추가

See merge request s11-webmobile1-sub2/S11P12A701!101
2024-08-08 10:34:55 +09:00
yulmam
58ac496c41 feat : reportDetail 수정 2024-08-08 10:33:15 +09:00
kgc91747
b73b2b7920 merge backend 2024-08-08 10:17:22 +09:00
kgc91747
e78821332d feat: quiz 수정 불가능한 상태로 변경 기능 추가 2024-08-08 10:14:36 +09:00
김기창
8c936e1762 Merge branch 'Be/Board' into 'backend'
[Back-End] feat : 게시판 조회 최신순 조회로 변경

See merge request s11-webmobile1-sub2/S11P12A701!99
2024-08-08 09:48:51 +09:00
yulmam
918906de60 feat : 게시판 조회 최신순 조회로 변경 2024-08-08 09:47:06 +09:00
김한얼
2ca7146239 Merge branch 'backend' into 'Be/ReportSet' 2024-08-08 09:21:48 +09:00
yulmam
ccc2b998da feat : reportSet 기능 추가 2024-08-07 23:24:52 +09:00
김기창
7826ad4ae7 Merge branch 'be/email' into 'backend'
feat: 이메일 인증 수정

See merge request s11-webmobile1-sub2/S11P12A701!95
2024-08-07 17:46:40 +09:00
박정민
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
a732cb78c6 feat: 이메일 인증 수정 2024-08-07 17:42:13 +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