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.

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

[merge] v1.0.0 버전 배포 #176

Merged
merged 1,106 commits into from
Aug 30, 2023
Merged

[merge] v1.0.0 버전 배포 #176

merged 1,106 commits into from
Aug 30, 2023

Conversation

leeeha
Copy link
Member

@leeeha leeeha commented Aug 30, 2023

📝 Work Description

  • 더 이상 수정사항 없으면 메인 브랜치로 머지하겠습니다!

leeeha and others added 30 commits August 19, 2023 18:39
…o feature/feat-create-feed-comment

� Conflicts:
�	app/src/main/java/com/android/go/sopt/winey/util/binding/BindingAdapter.kt
[mod] 세계관 스토리 / 뒤로가기 불가능 하도록 변경
[fix] 회원탈퇴 / 인텐트 플래그 수정
# Conflicts:
#	app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt
#	app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt
#	app/src/main/java/com/android/go/sopt/winey/util/binding/BindingAdapter.kt
#	app/src/main/res/values/strings.xml
leeeha and others added 19 commits August 29, 2023 20:55
[fix] 위니피드, 마이피드 / 일부 아이템만 갱신하도록 변경
- 피드 삭제에 성공하면 delete UiState를 다시 Empty로 초기화 해줘야 한다.
- Success 상태를 유지하면 옵저버에 의해 성공 스낵바가 계속 뜬다.
[mod] 기초 세팅 / 패키지 이름 변경
[mod] 위니 업로드 / 0~499원 로딩 뷰 수정
@leeeha leeeha requested review from sxunea and Sangwook123 August 30, 2023 08:48
@leeeha leeeha self-assigned this Aug 30, 2023
@leeeha leeeha merged commit d72f388 into main Aug 30, 2023
@leeeha leeeha added the merge 🔀 브랜치 간의 병합 label Oct 9, 2023
@leeeha leeeha changed the title Release v1.0.0 [merge] release v1.0.0 Oct 9, 2023
@leeeha leeeha changed the title [merge] release v1.0.0 [merge] v1.0.0 버전 배포 Oct 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge 🔀 브랜치 간의 병합 하은 🐰
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants