yulmam
|
696fb85a21
|
feat : getter setter 변경
|
2024-08-09 10:10:46 +09:00 |
|
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 |
|
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 |
|
박정민
|
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 |
|
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 |
|
yulmam
|
772fb038c7
|
refactor : user 서비스 리펙토링
|
2024-08-05 10:22:16 +09:00 |
|
박정민
|
2636833458
|
feat: 강의 만들기/입장 로직 추가
|
2024-08-05 10:19:53 +09:00 |
|
박정민
|
4c019a6fb0
|
feat: access-token 재설정
|
2024-08-05 09:18:21 +09:00 |
|
박정민
|
a44d29ee1e
|
feat: user token exception
|
2024-08-02 17:39:51 +09:00 |
|
박정민
|
874b877399
|
reafactoring: mailsender
|
2024-08-02 17:24:50 +09:00 |
|
박정민
|
3302c8b51e
|
feat: token 수정
|
2024-08-02 17:19:17 +09:00 |
|
박정민
|
7461977156
|
feat: openvidu 설정
|
2024-08-02 17:02:00 +09:00 |
|
kgc91747
|
44e9308927
|
feat: Quiz 강사/학생 타입별 퀴즈 조회 결과 구분
|
2024-08-02 16:18:17 +09:00 |
|
박정민
|
d280424d55
|
feat: token exception (작업중)
|
2024-08-02 16:07:27 +09:00 |
|
kgc91747
|
75a4baf782
|
feat: Registration 미승인 수강신청 조회, 중복신청 확인 추가
|
2024-08-02 15:41:42 +09:00 |
|
박정민
|
3a8b244f14
|
feat: video controller
|
2024-08-02 13:50:35 +09:00 |
|
박정민
|
156955d847
|
feat: openvidu 수정
|
2024-08-02 13:48:23 +09:00 |
|
박정민
|
b22009ef75
|
feat: qna 기능수정
|
2024-08-02 13:41:07 +09:00 |
|
박정민
|
2db6511a19
|
feat: qna delete 수정
|
2024-08-02 13:20:02 +09:00 |
|
박정민
|
f0ef0a397d
|
feat: video 수정
|
2024-08-02 13:15:52 +09:00 |
|
박정민
|
679a885919
|
BE/uesrinfo
|
2024-08-02 12:56:05 +09:00 |
|
박정민
|
b05f555d9a
|
feat: user cors에러 수정
|
2024-08-02 11:24:45 +09:00 |
|
박정민
|
b798f04dfc
|
feat: video 수정
|
2024-08-02 11:18:19 +09:00 |
|