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

[Chore] #675 - release-1.0.4 -> develop 머지 및 버전 업데이트 #680

Merged
merged 79 commits into from
Nov 3, 2022
Merged

[Chore] #675 - release-1.0.4 -> develop 머지 및 버전 업데이트 #680

merged 79 commits into from
Nov 3, 2022

Conversation

hyun99999
Copy link
Member

🔥Pull requests

⛳️ 작업한 브랜치

👷 작업한 내용

  • 릴리즈를 위해서 develop 으로 머지하겠습니당

📟 관련 이슈

hyun99999 and others added 30 commits October 7, 2022 16:59
@hyun99999
[Chore] #654 - 이미지 에셋 추가
3ffae3b
@hyun99999
[Comment] #622 - 인증완료 flake 주석 추가
08b5454
@hyun99999
[Delete] #662 - 사용하지 않는 StrogaeMoreListDataModel 제거
97ae7c4
@hyun99999
[Add] #662 - UpgradeFlake app data model 추가
e55f1b6 
- 업그레이드 팝업창 구성을 반환
@hyun99999
[Feat] #662 - SparkFlake에 업그레이드 전후 UpgradeFlake 반환
69b1296 
- 남은 일수에 대해서 업그레이드 팝업창 구성을 반환
@hyun99999
[Add] #662 - UpgradeFlakeDialogue VC 와 Storyboard 생성
dda9752
@hyun99999
[Add] #662 - upgrade flake 담당 셀 생성
b57b737
@hyun99999
[Add] #662 - Cell 에 타입프로퍼티 추가
f9a73da
@hyun99999
[Add] #662 - 불꽃 결정 로드맵 화면전환 더보기 기능에 추가
fad2d30
@hyun99999
[Feat] #662 - 습관방에서 UpgradeFlakeDialogueVC 으로 화면전환
857e799
@hyun99999
[Fix] #662 - UpgradeFlake 데이터 모델 오타 수정
5eeac21
@hyun99999
[Fix] #662 - 이미지 에셋 이름 수정
64eb5f7
@hyun99999
[Feat] #662 - UpgradeFlakeDialogueVC 레이아웃 및 셀 적용
a94062f
@hyun99999
Merge branch 'develop' of https://github.com/TeamSparker/Spark-iOS in…
bb92cee 
…to release-1.0.4/#662
@hyun99999
Merge pull request #665 from TeamSparker/develop
1f2f8c0 
[Chore] #664 - release-1.0.4 브랜치로 develop 브랜치 merge
@hyun99999
[Fix] #662 - UpgradeFlakeCVC 의 이미지 뷰 contentMode 변경
816d363
@hyun99999
Merge branch 'feature/#654' of https://github.com/hyun99999/Spark-iOS …
ad96c57 
…into release-1.0.4/#662
@hyun99999
Merge branch 'feature/#654' of https://github.com/hyun99999/Spark-iOS …
112f475 
…into release-1.0.4/#662
@hyun99999
Merge branch 'feature/#654' of https://github.com/hyun99999/Spark-iOS …
382eda9 
…into release-1.0.4/#662
@hyun99999
Merge pull request #667 from TeamSparker/develop
f8d30d8 
[Chore] #664 - release-1.0.4 브랜치로 develop 브랜치 merge
@hyun99999
Merge branch 'TeamSparker:release-1.0.4' into release-1.0.4/#662
74b6c23
@hyun99999
Merge branch 'release-1.0.4' of https://github.com/TeamSparker/Spark-iOS
3c22f22 
 into release-1.0.4/#668
@hyun99999
[Design] subtitle 의 중앙을 기준으로 레이아웃 수정
7ec4b72
@hyun99999
[Feat] #668 - 스크롤에 따른 텍스트 변경
da16bca
@yangsubinn
[Chore] pod update
a00b365
@yangsubinn
[Fix] 생명 타임라인 확인 후 습관방 빨콩 hidden
dc1f0fe
@yangsubinn
[Feat] #666 - 습관방 타임라인 tracking 추가
3ac868a
@yangsubinn
[Merge] pull release-1.0.4
76dc805 
Merge branch 'release-1.0.4' of https://github.com/TeamSparker/Spark-iOS into feature/#666
@yangsubinn
Merge pull request #669 from yangsubinn/feature/#666
2d6f8e8 
[Feat] #666 - 생명 타임라인 트래킹 추가
@hyun99999
Merge branch 'release-1.0.4' of https://github.com/TeamSparker/Spark-iOS
8e204c7 
 into release-1.0.4/#668
@hyun99999
[Chore] #673 - 빌드 번호 1로 초기화
136ad6f
@hyun99999
[Chore] #673 - 수동배포를 위한 lane 수정
89d8c29
@hyun99999
[Chore] #673 - TestFlight 테스트 내역 작성을 위해 lane 수정
eacf0d5
@hyun99999
[Chore] #673 - fastlane fastfile 수정
cf6d126 
- slack webhook url 변경
@hyun99999
[Chore] #676 - release lane 수정
5a43f3a 
- build app 수정
@hyun99999
[Chore] #676 - release lane 수정
b5bb34c 
- IDFA 없음
- precheck 할 때 앱 구매 없음
@hyun99999
[Chore] #676 - release lane 수정
487d81c 
- slack url 변경
@hyun99999
[Chore] #676 - 버전 업데이트
d254705 
- 1.1.0
@hyun99999
[Chore] #676 - release lane 수정
2337208 
- xcodeproj 지정
@hyun99999
[Design] #678 - UpgradeFlakeCVC Y축 중심을 기준으로 축소하도록 수정
4820cbe
@hyun99999
Merge pull request #674 from hyun99999/release-1.0.4/#673
94b9c18 
[Chore] #673 - 이미지 에셋 변경 및 fastlane fastfile 수정
@hyun99999
Merge pull request #677 from hyun99999/release-1.0.4/#676
9be5af5 
[Chore] #676 - Fastlane release lane 수정
@hyun99999
Merge pull request #679 from hyun99999/release-1.0.4/#678
062c31e
@hyun99999 hyun99999 added Chore 그 이외의 잡일/ 버전 코드 수정, 패키지 구조 변경, 파일 이동, 파일이름 변경 👼타락pOwEr천사현규 크로아서버 환영요 🐓 Release release 를 목적 labels Nov 1, 2022
@hyun99999 hyun99999 self-assigned this Nov 1, 2022
yangsubinn
yangsubinn approved these changes Nov 2, 2022
View reviewed changes
Copy link
Member

@yangsubinn yangsubinn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙇‍♀️

@hyun99999
Merge pull request #683 from hyun99999/release-1.0.4/#682
f0b8e2b 
[Design] #682 - 불꽃 결정 로드맵 이름 변경
@hyun99999
[Chore] #684 - release lane 수정
d508879 
- build number 증가시키는 명령어 추가
@hyun99999
[Chore] #684 - app extension 버전 업데이트
f80a2ac
L-j-h-c
L-j-h-c approved these changes Nov 2, 2022
View reviewed changes
Copy link
Member

@L-j-h-c L-j-h-c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 👍

@hyun99999
Merge pull request #685 from hyun99999/release-1.0.4/#684
d573aa5 
[Chore] #684 - app extension 의 버전 업데이트 및 fastlaen 수정
@hyun99999 hyun99999 merged commit 77ce71d into develop Nov 3, 2022
@hyun99999 hyun99999 deleted the release-1.0.4 branch November 7, 2022 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yangsubinn yangsubinn yangsubinn approved these changes

@L-j-h-c L-j-h-c L-j-h-c approved these changes

Assignees

@hyun99999 hyun99999

Labels
Chore 그 이외의 잡일/ 버전 코드 수정, 패키지 구조 변경, 파일 이동, 파일이름 변경 👼타락pOwEr천사현규 크로아서버 환영요 🐓 Release release 를 목적
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hyun99999 @L-j-h-c @yangsubinn