Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FE] front main 통합 #228

Merged
merged 179 commits into from
May 18, 2024
Merged

[FE] front main 통합 #228

merged 179 commits into from
May 18, 2024

Conversation

ji-hunc
Copy link
Member

@ji-hunc ji-hunc commented May 18, 2024

Overview

front main 통합

ji-hunc and others added 30 commits April 29, 2024 17:23
@ji-hunc
feat: #109-채팅방 스크린 연동
0c57897
@ji-hunc
feat: #109-채팅을 위한 모델들 생성 및 service 작성
1b1265b
@ji-hunc
Merge branch 'develop-front' of https://github.com/kookmin-sw/capston…
bd778d2 
…e-2024-30 into feature/fe/#109-chatting
@ji-hunc
feat: #109-채팅 기반 함수 및 최소 테스트 성공
08758af
@ji-hunc
fix: #123-헬퍼 스크린 및 디테일 화면, 헬퍼 모델, 채팅 초기 모델 생성
b06c583
@ji-hunc
solve conflict
99f7a5f
@ji-hunc
feat: #109-개인 채팅 기능 완성
466c7f7
@ji-hunc
refactor: #109-필요없는 코드 삭제
8b6fcec
@ji-hunc
feat: #109-상대방 말풍선 디자인 변경
ccfb54e
@ji-hunc
feat: #109-채팅리스트 화면 폴링
0dc5006
@ji-hunc
feat: #135-헬퍼 게시글 모델 생성 및 글 작성 구현
672f7c6
@ji-hunc
feat: #135-helper 게시글 조회 기능 구현
bec2783
@ji-hunc
feat: #137-글 쓰기 테스트 중간 저장
4ecfdec
@ji-hunc
feat: detail 모델 추가
4a734f9
@ji-hunc
feat: #135-api 백 수정 반영
d995b77
@ji-hunc
feat: #137-파라미터 업데이트
9d58fbd
@ji-hunc
feat: #135-헬퍼 글쓰기, 로드, 디테일 확인 구현 완료
601bb65
@ji-hunc
feat: #135-UI 수정
f021c8b
@ji-hunc
Merge branch 'develop-front' of https://github.com/kookmin-sw/capston…
c355b26 
…e-2024-30 into feature/fe/#135-helperArticle
@kevinmj12
feature:#139/학식 api 연동 및 화면에 띄우기
ac40590
@kevinmj12
Merge branch 'feature/fe/#135-helperArticle' of https://github.com/ko…
dc7c874 
…okmin-sw/capstone-2024-30 into feature/fe/#135-helperArticle
@kevinmj12
design fix
af2e0b0
@kevinmj12
Merge pull request #148 from kookmin-sw/feature/fe/#135-helperArticle
aff21fc 
[FE] 헬퍼 기능 구현
@kevinmj12
feature:#139/메인 화면에 학식정보 추가
f6bc0fb
@kevinmj12
hotfix
bdbe194
@ji-hunc
Merge pull request #150 from kookmin-sw/feature/fe/#139-cafeteria-api
3de23ae 
Feature/fe/#139 cafeteria api
@kevinmj12
feature:#139/날짜별로 데이터 받도록 수정
20e5015
@kevinmj12
chatbot
10a4f47
@kevinmj12
Merge branch 'develop-front' of https://github.com/kookmin-sw/capston…
3947e07 
…e-2024-30 into feature/fe/#138-chatbot-api
@ji-hunc
Merge branch 'feature/fe/#139-cafeteria-api' of https://github.com/ko…
65e5780 
…okmin-sw/capstone-2024-30 into develop-front
ji-hunc and others added 29 commits May 18, 2024 00:25
@ji-hunc
feat: #221-faqkind 선언위치 변경:
e74a0ff
@ji-hunc
feat: #221-중국어 적용
b725c74
@ji-hunc
feat: #221-외국어 적용시 faq 태그 안 눌리는 문제 해결
cd5618e
@ji-hunc
fix: #221-faq 선택한 카테고리 한국어 문제 해결:
84b73c9
@ji-hunc
feat: #221-공지사항 중국어 필터 동적 번역 적용
a50a523
@ji-hunc
feat: #221-QNA 버그 수정
d37beaf
@ji-hunc
feat: #221-공지사항 카드 태그도 동적 번역 완료
f62efee
@ji-hunc
feat: #221-공지사항 전체 파라미터 all -> 전체 변경
4a8b9f7
@ji-hunc
feat: #221-영어 공지 필터 카멜케이스 문제 해결
906766a
@ji-hunc
feat: #221-영어공지사항 카테고리 짧게 수정 및 디테일 페이지에서도 영어로 표시
0607d56
@ji-hunc
feat: #221-QnA 디테일 페이지에서 카테고리도 번역
899985b
@ji-hunc
feat: #221-공지 영어 필터 카멜케이스로 똑바로 변경
f503a7e
@ji-hunc
feat: #221-faq 기본 태그 한국어로 뜨는 것 수정
5d79813
@ji-hunc
feat: 챗봇 서버 리퀘스트 보내는 언어 포맷 변경
75178e7
@ji-hunc
feat: #221-faq 어색한 표현 수정
e6e37f9
@ji-hunc
feat: #221-faq 카멜케이스 전부 변경
c067f2b
@kevinmj12
Merge pull request #224 from kookmin-sw/feature/fe/#221-translateStat…
594dbb3 
…icWord

Feature/fe/#221 translate static word
@ji-hunc
style: #226-발음 카드 패딩 추가
19752c6
@ji-hunc
style: #226-발음평가 내부 문장 카드 패딩 수정
94432d4
@ji-hunc
solve conflict
b52de9a
@ji-hunc
feat: #221-학과 선택 중국어 수정
15253ea
@ji-hunc
feat: #221-공지사항 all -> All 변경
4081f94
@ji-hunc
:feat:
2dfefbd
@ji-hunc
Merge pull request #222 from kookmin-sw/feature/fe/#221-translate
92b6bd7 
Feature/fe/#221 translate
@ji-hunc
Merge branch 'style/fe/#226-style' of https://github.com/kookmin-sw/c…
fff2efc 
…apstone-2024-30 into develop-front
@ji-hunc
fix: 안드로이드에서 language null 일 때 접근한 에러 수정
f121afd
@ji-hunc
feat: faq 영어 번역
2c51a85
@ji-hunc
chore: gitignore 수정 및 android build 버전 수정
2850fd6
@ji-hunc
Merge branch 'main' of https://github.com/kookmin-sw/capstone-2024-30 …
a6b06ae 
…into develop-front
@ji-hunc ji-hunc merged commit 1726993 into main May 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ji-hunc @kevinmj12