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

Merge to main #83

Open
wants to merge 134 commits into
base: main
Choose a base branch
from
Open

Merge to main #83

wants to merge 134 commits into from

Conversation

yjoonjang
Copy link
Contributor

No description provided.

dlwlals1289 and others added 30 commits February 11, 2023 23:27
@dlwlals1289
/mypage/edit method 변경
482f0d4
@naro-Kim
update : readme
95317b6
@naro-Kim
Merge branch 'dev' of https://github.com/Likelion-HongikUniv/likelion…
c5f2f0e 
…-hongik-client into feature/postPage/naro-Kim
@naro-Kim
fix : like error fix
502e9eb 
대댓글과 달리 댓글에서 좋아요 상태가 일치하지 않는 문제를 useEffect로 보수 공사해둠,.
@naro-Kim
css : mobile, tablet input css 수정
bb2f5a0
@dlwlals1289
before merge
8e84313
@dlwlals1289
fix : 중복 이메일 문제 해결
0203309
@dlwlals1289
fix : 중복 이메일 문제 해결
1007db4
@ch9eri
chore: 메인페이지 프로젝트 화살표 위치 수정
194f80b
@ch9eri
Merge pull request #51 from Likelion-HongikUniv/feature/mainPage/ch9eri
fa4f184 
chore: 메인페이지 프로젝트 화살표 위치 수정
@limce21
fix: 태블릿 삭제
dba95af
@ch9eri
chore: 유튜브 링크 수정
3cbf82d
@ch9eri
Merge pull request #52 from Likelion-HongikUniv/feature/mainPage/ch9eri
05f6c3b 
chore: 유튜브 링크 수정
@limce21
fix: 글쓰기 state 넘겨주기 & 사이드바 수정 이미지로 변경
e8fa893
@ch9eri
Merge pull request #53 from Likelion-HongikUniv/feature/communityPage…
7d96d87 
…/limce21

Feature/communityPage/limce21
@ch9eri
chore: 필요없는 코드 삭제
7ded8f6
@ch9eri
Merge pull request #54 from Likelion-HongikUniv/feature/mainPage/ch9eri
cf38ea5 
chore: 필요없는 코드 삭제
@choyeon2e
fix: state 대수정
3ff52dd
@choyeon2e
Merge pull request #55 from Likelion-HongikUniv/feature/myPage/choyeon2e
5c6a5cd 
fix: state 대수정
@limce21
fix: 검색 시 페이지 1로 변경
ab1e865
@limce21
fix: 유저 이미지 수정
b15397b
@choyeon2e
Conflict 해결
f411925
@naro-Kim
fix : state profileImageSrc, userState
339765c
@naro-Kim
Merge pull request #56 from Likelion-HongikUniv/feature/communityPage…
7b5c134 
…/limce21

Feature/communityPage/limce21
@ch9eri
fix: 페이지네이션 1로 초기화
663aa06
@naro-Kim
Merge pull request #57 from Likelion-HongikUniv/feature/myPage/choyeon2e
ecad5e1 
Conflict 해결
@ch9eri
Merge pull request #59 from Likelion-HongikUniv/feature/mainPage/ch9eri
1c56f12 
fix: 페이지네이션 1로 초기화
@choyeon2e
Merge branch 'dev' into feature/postPage/naro-Kim
0f7f137
@choyeon2e
Merge pull request #58 from Likelion-HongikUniv/feature/postPage/naro…
fe88dd2 
…-Kim

fix : state profileImageSrc, userState
@ch9eri
conflict solve
180d094
choyeon2e and others added 30 commits March 20, 2023 16:15
@choyeon2e
Merge branch 'dev' of https://github.com/Likelion-HongikUniv/likelion…
3fd465a 
…-hongik-client into feature/myPage/choyeon2e
@yjoonjang
fix: 썸네일 이미지 안뜨는 에러 해결
1387b67
@choyeon2e
Merge pull request #79 from Likelion-HongikUniv/fix/yjoonjang
a259a9f 
fix: 썸네일 이미지 안뜨는 에러 해결
@choyeon2e
fix errors
ec8283a
@choyeon2e
Merge branch 'dev' of https://github.com/Likelion-HongikUniv/likelion…
5bcc29c 
…-hongik-client into feature/myPage/choyeon2e
@yjoonjang
Merge pull request #80 from Likelion-HongikUniv/feature/myPage/choyeon2e
7e01c67 
Feature/my page/choyeon2e
@yjoonjang
fix: viewer ui code 글씨, 배경색 수정
fb4e8ed
@yjoonjang
Merge pull request #81 from Likelion-HongikUniv/hotfix/write
021443f 
fix: viewer ui code 글씨, 배경색 수정
@yjoonjang
fix: fix url of server
c633a2b
@yjoonjang
fix: ing 페이지 api url 수정
dafb30f
@yjoonjang
Merge pull request #82 from Likelion-HongikUniv/hotfix/api
6fbd709 
Hotfix/api
@limce21
Hotfix: 오류 문구 수정
e26d0dc
@THLcode
Merge pull request #84 from Likelion-HongikUniv/feature/communityPage…
676b288 
…/limce21

Hotfix: 오류 문구 수정
@choyeon2e
hotfix: 글 수정시 redirect-url 변경
c375eec
@choyeon2e
Merge pull request #85 from Likelion-HongikUniv/feature/myPage/choyeon2e
a6e1e13 
hotfix: 글 수정시 redirect-url 변경
@choyeon2e
hotfix: delete시 로그인alert 오류 수정
a4414ca
@choyeon2e
Merge branch 'dev' of https://github.com/Likelion-HongikUniv/likelion…
eaceaf3 
…-hongik-client into feature/myPage/choyeon2e
@choyeon2e
hotfix: delete오류
7b07fa0
@choyeon2e
Merge pull request #86 from Likelion-HongikUniv/feature/myPage/choyeon2e
df4c55a 
Feature/my page/choyeon2e
@naro-Kim
hotfix: title 사라짐 오류 조치, 로그인 UI 변경
0e8a37b
@choyeon2e
hotfix: delete시 생기는 오류 fix
9f985e5
@choyeon2e
Merge pull request #87 from Likelion-HongikUniv/feature/myPage/choyeon2e
3103f4f 
hotfix: delete시 생기는 오류 fix
@choyeon2e
hotfix: edit navigate->replace 변경
0572f41
@choyeon2e
Merge pull request #88 from Likelion-HongikUniv/feature/myPage/choyeon2e
22e5028 
hotfix: edit navigate->replace 변경
@choyeon2e
hotfix: 썸네일 수정 기능 추가 - 오늘 재수정할 예정
fff61fe
@choyeon2e
Merge pull request #89 from Likelion-HongikUniv/feature/myPage/choyeon2e
85f2926 
hotfix: 썸네일 수정 기능 추가 - 오늘 재수정할 예정
@choyeon2e
hotfiX: 썸네일 수정,삭제 기능 추가
30f5a2b
@choyeon2e
Merge pull request #90 from Likelion-HongikUniv/feature/myPage/choyeon2e
2245a05 
hotfix: 썸네일 수정,삭제 기능 추가
@choyeon2e
Hotfix: 글 수정 시 redirect url 수정
0f55b0b
@choyeon2e
Merge pull request #91 from Likelion-HongikUniv/feature/myPage/choyeon2e
6f5f4b0 
Hotfix: 글 수정 시 redirect url 수정
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.
7 participants
@yjoonjang @dlwlals1289 @naro-Kim @ch9eri @limce21 @choyeon2e @THLcode