Skip to content

Develop 브랜치 변경 내용 Main에도 반영 #101

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
Merged
kjiyun merged 33 commits into from
Feb 13, 2025
Merged

Develop 브랜치 변경 내용 Main에도 반영 #101

kjiyun merged 33 commits into from
Feb 13, 2025

Conversation

@kjiyun
Copy link
Contributor

@kjiyun kjiyun commented Feb 13, 2025

No description provided.

marshmallowing and others added 30 commits January 23, 2025 16:48
@marshmallowing
Merge branch 'main' of https://github.com/marshmallowing/Backend-Meme…
7caf7ec 
…Sphere
@marshmallowing
Merge branch 'develop' of https://github.com/marshmallowing/Backend-M…
0af93ff 
…emeSphere
#8 Fix: 서버 타임존 KST로 설정
48e89fd
#78 Fix: 서버 타임존 KST로 설정
f9755db
#78 Fix: 서버 타임존 KST로 설정
a12c61f
@kjiyun
#80 Feat: 실시간 알림 isOn 기능 추가
b7fb562
@kjiyun
Merge pull request #85 from TeamMemeSphere/main
cadc142 
Merge pull request #84 from TeamMemeSphere/develop
@kjiyun
#80 Fix: merge conflict
88cb942
@SeoyeonPark1223
#86 Fix: 컬렉션 조회 Resonse Body에 coinId 추가
3ca2d63
@SeoyeonPark1223
#86 Fix: converter에 coinId 추가
f84a0e0
@kjiyun
#80 Feat: add user in notification enroll
21c5a1b
@kjiyun
Merge pull request #81 from kjiyun/alarm
b25db5d 
#80 Feat: 실시간 알림 isOn 기능 추가
@SeoyeonPark1223
Merge pull request #87 from SeoyeonPark1223/feature-86
3e9b0e3
@noeyeyh
#88 Feat: 구글 로그인 redirect uri를 Origin 헤더에서 가져오기
8749341
@noeyeyh
#88 Fix: 로컬호스트 경우 나누어 처리
55cb183
@noeyeyh
#88 Chore: 코드 정리
a9444f8
@noeyeyh
#88 Chore: 코드 정리
e8e08ec
@noeyeyh
Merge pull request #89 from noeyeyh/fix/google
f6adb79 
#88 Fix: 구글 로그인 redirect uri 설정
@kjiyun
#90 Fix: 실시간 채팅 withSockJS 적용
fce4b0d
@kjiyun
Merge pull request #91 from kjiyun/chat
616e6ec 
#90 Fix: 실시간 채팅 withSockJS 적용
@nimuyman
Merge branch 'develop' into fix/78-timezone
4fa4885
@nimuyman
Merge pull request #79 from nimuy99/fix/78-timezone
648f8cb 
#78 Fix: 서버 타임존 KST로 설정
@marshmallowing
Merge branch 'develop' of https://github.com/marshmallowing/Backend-M…
3c73b29 
…emeSphere
@marshmallowing
#92 Fix: customUserDetails로 유저 정보 가져옴
9b3d5cb
@marshmallowing
Merge pull request #93 from marshmallowing/fix/profile
8b13ea4 
#92 Fix: 프로필 이미지 가져오는 방식 수정
@kjiyun
#94 Fix: 웹소켓 CORS 설정 변경
081af5f
@kjiyun
Merge pull request #95 from kjiyun/chat
053f081 
#94 Fix: 웹소켓 CORS 설정 변경
@kjiyun
#1 Fix: docker-compose 파일 수정
8c43740
@kjiyun
Merge pull request #96 from kjiyun/chat
9921d26 
#1 Fix: docker-compose 파일 수정
@kjiyun
#94 Fix: withSockJS 삭제
aef589f
@kjiyun kjiyun merged commit 146641a into main Feb 13, 2025
2 checks passed
kjiyun added a commit that referenced this pull request Feb 13, 2025
@kjiyun
Merge pull request #102 from TeamMemeSphere/main
3400545 
Merge pull request #101 from TeamMemeSphere/develop
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.

6 participants

@kjiyun @marshmallowing @SeoyeonPark1223 @noeyeyh @nimuyman