|
|
640ec9ae80
|
Merge branch 'FE/StudentReportDetailPage' into 'frontend'
[Front-End] fix: queryKey 중복 수정
See merge request s11-webmobile1-sub2/S11P12A701!98
|
2024-08-08 09:48:01 +09:00 |
|
yulmam
|
918906de60
|
feat : 게시판 조회 최신순 조회로 변경
|
2024-08-08 09:47:06 +09:00 |
|
정기영
|
9667eb319a
|
fix: queryKey 중복 제거
|
2024-08-08 09:42:05 +09:00 |
|
정기영
|
d9963e4b29
|
feat: StudentReportDetailPage 기본 형태 추가
|
2024-08-08 09:37:40 +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 |
|
|
|
ff39d1475c
|
Merge branch 'FE/PasswordResetPage' into 'frontend'
[Front-End] feat: passwordResetAuthPage 추가 외
See merge request s11-webmobile1-sub2/S11P12A701!96
|
2024-08-07 17:57:16 +09:00 |
|
정기영
|
803055467b
|
design: 퀴즈 상세정보 표시용 카드 임시 적용
|
2024-08-07 17:54:45 +09:00 |
|
정기영
|
ee8fa54ab0
|
feat: 비밀번호 찾기 페이지 추가
|
2024-08-07 17:54:11 +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 |
|
kgc91747
|
e9d0db30e5
|
feat: 이메일 인증 코드 재요청시 기존 코드 삭제 추가
|
2024-08-07 17:19:07 +09:00 |
|
박정민
|
60d6f35928
|
Merge branch 'BE/userinfo' into 'backend'
feat:qna 수정
See merge request s11-webmobile1-sub2/S11P12A701!91
|
2024-08-07 17:05:56 +09:00 |
|
박정민
|
25f7343b04
|
feat:qna 수정
|
2024-08-07 17:04:19 +09:00 |
|
박정민
|
3df25f872f
|
Merge branch 'BE/userinfo' into 'backend'
feat: qna 수정
See merge request s11-webmobile1-sub2/S11P12A701!90
|
2024-08-07 16:58:36 +09:00 |
|
박정민
|
8d4d9e0227
|
feat: qna 수정
|
2024-08-07 16:57:38 +09:00 |
|
정기영
|
43028d5fbb
|
merge: 작업 중
|
2024-08-07 16:08:34 +09:00 |
|
정기영
|
69c6cee3ab
|
Merge branch 'fe/studentReport' into 'frontend'
[Front-end] feat: 학생 퀴즈성적 전체 조회페이지 추가
See merge request s11-webmobile1-sub2/S11P12A701!89
|
2024-08-07 16:06:31 +09:00 |
|
조민우
|
04df5b2ccd
|
Merge branch 'frontend' into 'fe/studentReport'
# Conflicts:
# frontend/src/Router.jsx
|
2024-08-07 16:06:05 +09:00 |
|
minwucho
|
39506ff829
|
feat: 학생 퀴즈성적 전체 조회페이지 추가
|
2024-08-07 16:02:47 +09:00 |
|
정기영
|
2a7fac057c
|
feat: passwordReset 작업 중(merge)
|
2024-08-07 15:32:45 +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 |
|
조민우
|
54b4673720
|
Merge branch 'fe/splitLive' into 'frontend'
[Front-End] refactor: 라이브 강의 코드 분리
See merge request s11-webmobile1-sub2/S11P12A701!87
|
2024-08-07 14:46:22 +09:00 |
|
|
|
d57d522335
|
refactor: 라이브 강의 코드 분리
|
2024-08-07 14:44:32 +09:00 |
|
정기영
|
4035fbb250
|
Merge branch 'fe/fixLiveQuiz' into 'frontend'
[Front-End] 퀴즈 API 변경사항 반영
See merge request s11-webmobile1-sub2/S11P12A701!86
|
2024-08-07 14:29:37 +09:00 |
|
|
|
e45cdbeef3
|
feat: 퀴즈 API 변경사항 적용
|
2024-08-07 14:24:15 +09:00 |
|
kgc91747
|
9032a156c4
|
feat: redis password 설정 추가
|
2024-08-07 14:23:44 +09:00 |
|
|
|
0216c2aa3c
|
design: 레이아웃 너비 수정
|
2024-08-07 14:07:30 +09:00 |
|
김기창
|
0a7e65420b
|
Merge branch 'be/email' into 'backend'
refactor: email API 경로명 수정
See merge request s11-webmobile1-sub2/S11P12A701!85
|
2024-08-07 13:43:26 +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 |
|
정기영
|
d2e4d2e5a4
|
Merge branch 'fe/improveUX' into 'frontend'
[Front-End] Fe/improve ux
See merge request s11-webmobile1-sub2/S11P12A701!84
|
2024-08-07 13:08:41 +09:00 |
|
|
|
50894126af
|
design: 최소 너비 1340px
|
2024-08-07 13:07:02 +09:00 |
|
정기영
|
7e63b1b866
|
fix: 에러 useState 단순화
|
2024-08-07 12:42:20 +09:00 |
|
|
|
659eeb7c01
|
Merge branch 'frontend' into fe/improveUX
|
2024-08-07 12:40:57 +09:00 |
|
|
|
7f3b1b9900
|
fix: 퀴즈 제한시간 수정
|
2024-08-07 12:40:31 +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 |
|
