Commit Graph

391 Commits

Author SHA1 Message Date
yulmam
49bf79dd05 feat : 시간대 변경 2024-08-09 10:10:24 +09:00
박정민
042d63640b Merge branch 'BE/userinfo' into 'backend'
feat: qna answer,content 자료형 변경

See merge request s11-webmobile1-sub2/S11P12A701!122
2024-08-09 09:52:23 +09:00
박정민
e07f47213d feat: qna 조회 수정 2024-08-09 09:51:05 +09:00
kgc91747
5740b6f53a feat: Lecture 강의 정보 컬럼 변경 2024-08-09 09:47:04 +09:00
박정민
862ed541a0 Merge branch 'Be/Report' into 'backend'
[Back-End] Be/report

See merge request s11-webmobile1-sub2/S11P12A701!121
2024-08-09 08:57:36 +09:00
yulmam
5dfbcb3dd2 feat : reportSet delete 추가 2024-08-08 22:04:47 +09:00
yulmam
0f60c9c4cf feat : 게시판 댓글 형 text로 변경 2024-08-08 21:57:39 +09:00
yulmam
1962d5b2df feat : report, reportSet 추가시 시간 갱신 2024-08-08 21:55:54 +09:00
김한얼
8dafe75cf1 Merge branch 'Be/Registartion' into 'backend'
[Back-End] Be/registartion

See merge request s11-webmobile1-sub2/S11P12A701!120
2024-08-08 21:53:47 +09:00
yulmam
6ba555de62 refactor : registartion 오타 정정 2024-08-08 21:52:53 +09:00
yulmam
d746a0006f refactor : report 오타 수정 2024-08-08 21:49:11 +09:00
박정민
4b5bdb5ae5 feat: qna answer,content 자료형 변경 2024-08-08 16:59:44 +09:00
박정민
56689c8b14 Merge branch 'BE/userinfo' into 'backend'
feat: qna createAT timestamp로 변경

See merge request s11-webmobile1-sub2/S11P12A701!114
2024-08-08 16:35:58 +09:00
박정민
349c85ff74 feat: qna createAT timestamp로 변경 2024-08-08 16:35:08 +09:00
김한얼
95f06da233 Merge branch 'be/registration' into 'backend'
feat: registration 수강 현황 조회 추가

See merge request s11-webmobile1-sub2/S11P12A701!113
2024-08-08 16:32:30 +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
박정민
570d85e13c Merge branch 'BE/userinfo' into 'backend'
feat: qna 조회 수정

See merge request s11-webmobile1-sub2/S11P12A701!111
2024-08-08 16:11:59 +09:00
박정민
6b81a22d6f feat: qna 조회 수정 2024-08-08 16:10:45 +09:00
김한얼
7f20b2f1ae Merge branch 'be/quiz' into 'backend'
feat: quiz 실시된 기록이 있는 퀴즈 수정 제한

See merge request s11-webmobile1-sub2/S11P12A701!109
2024-08-08 16:05:14 +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
박정민
d0a73e0e72 Merge branch 'BE/userinfo' into 'backend'
feat: qna 수정

See merge request s11-webmobile1-sub2/S11P12A701!106
2024-08-08 13:05:30 +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
박정민
b736e30832 Merge branch 'BE/userinfo' into 'backend'
feat:  qna 수정

See merge request s11-webmobile1-sub2/S11P12A701!103
2024-08-08 10:51:41 +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
김기창
afab33f4c3 Merge branch 'Be/QuizSet' into 'backend'
[Back-End] feat : reportDetail 수정

See merge request s11-webmobile1-sub2/S11P12A701!102
2024-08-08 10:34:52 +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
김기창
1abd73f745 Merge branch 'Be/ReportSet' into 'backend'
feat : reportSet 기능 추가

See merge request s11-webmobile1-sub2/S11P12A701!97
2024-08-08 09:22:44 +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
박정민
5bdd170f1f Merge branch 'BE/userinfo' into 'backend'
feat: qna 수정

See merge request s11-webmobile1-sub2/S11P12A701!94
2024-08-07 17:46:19 +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
a0b8e641da Merge branch 'be/email' of https://lab.ssafy.com/s11-webmobile1-sub2/S11P12A701 into be/email 2024-08-07 17:42:59 +09:00
kgc91747
a732cb78c6 feat: 이메일 인증 수정 2024-08-07 17:42:13 +09:00
kgc91747
65849b65dc feat: 이메일 인증 수정 2024-08-07 17:37:59 +09:00
kgc91747
25fb49a4ba feat: 이메일 인증 수정 2024-08-07 17:37:19 +09:00
김기창
0ca31ea84a Merge branch 'be/email' into 'backend'
feat: 이메일 인증 실패시 반환값 변경

See merge request s11-webmobile1-sub2/S11P12A701!93
2024-08-07 17:28:22 +09:00
kgc91747
78cfed17e7 feat: 이메일 인증 실패시 반환값 변경 2024-08-07 17:27:46 +09:00
박정민
a02884e2dd Merge branch 'be/email' into 'backend'
feat: 이메일 인증 코드 재요청시 기존 코드 삭제 추가

See merge request s11-webmobile1-sub2/S11P12A701!92
2024-08-07 17:20:36 +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