Commit Graph

168 Commits

Author SHA1 Message Date
Jungmin
9465ae0307
Merge pull request #83 from TeamBNBN/be/Lecture
refactor: Lecture 일부 코드 리팩토링
2024-07-22 17:55:16 +09:00
kgc9007
4ebed1ca3a Merge branch 'backend' of https://github.com/TeamBNBN/edufocus into be/Registration 2024-07-22 17:52:04 +09:00
kgc9007
3eac0e45b2 feat: Registration 수강신청, 승인, 거절 수정 2024-07-22 17:51:57 +09:00
Jungmin
418490abee
Merge pull request #85 from TeamBNBN/BE/report
feat: report 수정
2024-07-22 17:34:38 +09:00
박정민
6d09dc0cb5 feat: report 수정 2024-07-22 17:34:11 +09:00
yulmam
4b483eea2d feat : chatController 추가 2024-07-22 17:32:23 +09:00
kgc9007
bb27d409d6 Merge branch 'backend' of https://github.com/TeamBNBN/edufocus into be/Lecture 2024-07-22 17:24:58 +09:00
kgc9007
588758c581 refactor: Lecture 일부 코드 리팩토링 2024-07-22 17:24:51 +09:00
김기창
9499b06208
Merge pull request #82 from TeamBNBN/BE/useranswer
feat: user report, answer 채점기능
2024-07-22 16:12:16 +09:00
박정민
d4b7e5e14c feat: user report, answer 채점기능 2024-07-22 16:11:13 +09:00
Jungmin
10828ff11e
Merge pull request #77 from TeamBNBN/be/Quiz
feat: Quiz
2024-07-22 13:10:11 +09:00
kgc9007
65d43acb91 feat: Quiz
퀴즈 등록, 조회 기능 추가
2024-07-22 13:06:51 +09:00
Jungmin
16fc14a19d
Merge pull request #68 from TeamBNBN/be/Lecture
feat: Lecture 강의 상세조회 수정
2024-07-19 15:59:44 +09:00
kgc9007
f3859e6a65 feat: Lecture 강의 상세조회 수정
강의 상세조회시 유저정보를 확인해 수강중인지 여부를 추가로 전달
2024-07-19 15:57:48 +09:00
김기창
be1d1293ed
Merge pull request #65 from TeamBNBN/master
[Action] backend 브랜치에 master 변경사항 적용
2024-07-19 14:57:50 +09:00
d3094a3ca2
Merge pull request #64 from TeamBNBN/action/pr
[Action] fix: 스크립트 경로 수정
2024-07-19 14:55:02 +09:00
7250a0e519 fix: 스크립트 경로 수정 2024-07-19 14:53:16 +09:00
yulmam
3273a705c3
Merge pull request #62 from TeamBNBN/revert-61-master
Revert "[Action] master 변경사항 backend에 적용"
2024-07-19 14:50:08 +09:00
d108709e4d
Revert "[Action] master 변경사항 backend에 적용" 2024-07-19 14:49:25 +09:00
yulmam
1a556ff91f feat : websocket conifg 추가 2024-07-19 14:48:23 +09:00
yulmam
f2a7672f73
Merge pull request #61 from TeamBNBN/master
[Action] master 변경사항 backend에 적용
2024-07-19 14:46:54 +09:00
Jungmin
bbaef38a52
Merge pull request #57 from TeamBNBN/be/ws
[Back-end] feat : websocket 의존성 추가
2024-07-19 14:45:34 +09:00
1994297acc
Merge pull request #59 from TeamBNBN/action/pr
[Action] chore: pr base 브랜치 변경 스크립트 추가
2024-07-19 14:41:25 +09:00
04716e4e1e chore: pr base 브랜치 변경 스크립트 추가 2024-07-19 14:40:21 +09:00
yulmam
4b0de024c9 Merge branch 'backend' of github.com:TeamBNBN/edufocus into be/ws 2024-07-19 14:29:07 +09:00
yulmam
76b54ccf5d feat : websocket 의존성 추가 2024-07-19 14:28:26 +09:00
Jungmin
787fd419ec
Merge pull request #55 from TeamBNBN/be/Lecture
feat: Lecture 강의 정보 수정, 내 강의목록 조회 추가
2024-07-19 13:49:14 +09:00
kgc9007
8dd010b6c5 Merge branch 'backend' of https://github.com/TeamBNBN/edufocus into be/Lecture 2024-07-19 13:44:41 +09:00
kgc9007
c04142afd1 feat: Lecture 강의 정보 수정, 내 강의목록 조회 추가 2024-07-19 13:44:32 +09:00
Jungmin
bc41d929a2
Merge pull request #54 from TeamBNBN/BE/user
feat: q&a , answer
2024-07-19 13:40:35 +09:00
Jungmin
388ad8921e
Merge pull request #53 from TeamBNBN/be/Board
[Back-End] feat : 게시판 추가
2024-07-19 13:40:17 +09:00
박정민
459bf9725e feat: q&a , answer 2024-07-19 13:39:03 +09:00
yulmam
cebabf77c3 refactor : 서비스 리턴값 변경 2024-07-19 13:07:22 +09:00
yulmam
828df9c91c Merge branch 'backend' of github.com:TeamBNBN/edufocus into be/Board 2024-07-19 12:58:45 +09:00
yulmam
1549917d74 feat : board 게시판 2024-07-19 12:58:12 +09:00
Jungmin
7bf30dcbec
Merge pull request #49 from TeamBNBN/be/Lecture
feat: Lecture 조회 기능 추가
2024-07-19 10:00:12 +09:00
kgc9007
afa5f494aa feat: Lecture 조회 기능 추가
강의 전체조회, 상세조회, 내 강의 조회 기능 추가
2024-07-19 09:58:22 +09:00
Jungmin
6dbfc7f5af
Merge pull request #48 from TeamBNBN/BE/user
feat: user
2024-07-19 09:41:37 +09:00
박정민
ff9dad72f4 feat: user 2024-07-19 09:40:59 +09:00
김기창
7b7b48cd1b
Merge pull request #47 from TeamBNBN/BE/user
feat: login
2024-07-18 16:34:51 +09:00
박정민
f6e601c9f9 feat: login 2024-07-18 16:33:54 +09:00
yulmam
3857cf7d69 Merge branch 'backend' of github.com:TeamBNBN/edufocus into be/Board 2024-07-18 16:17:22 +09:00
yulmam
3669ed1870
Merge pull request #46 from TeamBNBN/be/Quiz
fix: conflict 처리
2024-07-18 16:17:09 +09:00
kgc9007
56f3eaaa1e refactor: lecture
lecture 엔티티의 컬럼명 수정
2024-07-18 16:16:16 +09:00
kgc9007
83c4172c62 fix: conflict 처리 2024-07-18 15:03:16 +09:00
kgc9007
b9cd3de043 feat: Quiz
퀴즈셋 단위로 퀴즈 등록 추가
2024-07-18 14:55:54 +09:00
yulmam
91a5a53a72 Merge branch 'backend' of github.com:TeamBNBN/edufocus into be/Board 2024-07-18 14:39:50 +09:00
yulmam
a02ee65a7e feat : 게시판 구현 2024-07-18 14:39:43 +09:00
yulmam
731cf0255e
Merge pull request #43 from TeamBNBN/BE/user
feat: login
2024-07-18 14:28:08 +09:00
박정민
f127eae148 feat: login 2024-07-18 14:27:11 +09:00