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] release1.0/6 -> develop 머지하기 #306

Merged
merged 21 commits into from
Jan 7, 2022
Merged

[CHORE] release1.0/6 -> develop 머지하기 #306

merged 21 commits into from
Jan 7, 2022

Commits on Jan 1, 2022

  1. [FIX] #286 - 무한스크롤 오프셋 개선 및 로딩창 수정 

    - 로딩창 배경 컬러 추가
    @hyun99999
    hyun99999 committed Jan 1, 2022
    Configuration menu
    Copy the full SHA
    cee96f1 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2022

  1. [FIX] #286 - 무한스크롤 오프셋 개선 및 로딩창 수정 

    - 로딩창 배경 컬러 적용
    @hyun99999
    hyun99999 committed Jan 2, 2022
    Configuration menu
    Copy the full SHA
    0a335c6 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2022

  1. [FIX] #286 - 무한스크롤 오프셋 개선 및 로딩창 수정 

    - 명함 모음 무한스크롤 cardsCollectionView 에만 적용
    @hyun99999
    hyun99999 committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    9c0a06a View commit details
    Browse the repository at this point in the history

  2. [CHORE] #291 - 로그인 버튼 레이아웃 조정

    @mini-min
    mini-min committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    ada4d99 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #295 from mini-min/release/#291 

    [CHORE] #291 - 로그인 버튼 레이아웃 조정
    @mini-min
    mini-min authored Jan 7, 2022
    Configuration menu
    Copy the full SHA
    ee0b889 View commit details
    Browse the repository at this point in the history

  4. [CHORE] #294 - 앱 언어 한국어로 변경하기

    @dlwns33
    dlwns33 committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    0a815d5 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #297 from dlwns33/release/#294 

    [CHORE] #294 - 앱 언어 한국어로 변경하기
    @dlwns33
    dlwns33 authored Jan 7, 2022
    Configuration menu
    Copy the full SHA
    4c1a691 View commit details
    Browse the repository at this point in the history

  6. [FEAT] #298 - 그룹명 collection view cell 객체 생성해서 데이터를 넣고 frame 의 size 를… 

    … 가져오기
    @dlwns33
    dlwns33 committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    4955d01 View commit details
    Browse the repository at this point in the history

  7. [FEAT] #296 - 온보딩 스플래시 뷰컨에 연결

    @mini-min
    mini-min committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    b35af0d View commit details
    Browse the repository at this point in the history

  8. [CHORE] #296 - 생년월일 바텀시트 "2022년" 추가

    @mini-min
    mini-min committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    e20f466 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #299 from mini-min/release/#296 

    [FEAT] 온보딩 스플래시 뷰에 연결
    @mini-min
    mini-min authored Jan 7, 2022
    Configuration menu
    Copy the full SHA
    1505a83 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #300 from dlwns33/release/#298 

    [FIX] #298 -그룹명 dynamic Cell 코드 수정
    @dlwns33
    dlwns33 authored Jan 7, 2022
    Configuration menu
    Copy the full SHA
    c55e70c View commit details
    Browse the repository at this point in the history

  11. Merge branch 'release1.0/6' of https://github.com/TeamNADA/NADA-iOS-F… 

    …orRelease into release1.0/4
    @hyun99999
    hyun99999 committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    dbb929e View commit details
    Browse the repository at this point in the history

  12. [FIX] #301 - 그룹 편집 뷰 그룹명 길이 제한

    @mini-min
    mini-min committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    5870bb5 View commit details
    Browse the repository at this point in the history

  13. [FIX] #286 - 무한스크롤 오프셋 개선 및 로딩창 수정 

    - 메인 로딩창 추가
- 명함생성시에 노티를 통해서 main 으로 isAfterCreation 을 true 로 해서 명함생성 후에는 스크롤 1로 이동
- 명함모음에서도 로딩창 추가
- 메인에 viewWillAppear 를 사용해서 스와이프로 명함 리스트에서 넘어와도 리로드
    @hyun99999
    hyun99999 committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    2644dbc View commit details
    Browse the repository at this point in the history

  14. Merge pull request #302 from mini-min/release/#301 

    [FIX] #301 - 그룹 편집 뷰 그룹명 길이 제한
    @mini-min
    mini-min authored Jan 7, 2022
    Configuration menu
    Copy the full SHA
    3035bd4 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #303 from TeamNADA/release1.0/#286 

    [FIX] #286 - 무한스크롤 오프셋 개선 및 로딩창 수정
    @hyun99999
    hyun99999 authored Jan 7, 2022
    Configuration menu
    Copy the full SHA
    5cc2c46 View commit details
    Browse the repository at this point in the history

  16. [FIX] #304 - 로그인 카카오 버튼 수정

    @mini-min
    mini-min committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    1a6f3f0 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'TeamNADA/release1.0/6' into release/#304

    @mini-min
    mini-min committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    e8e5139 View commit details
    Browse the repository at this point in the history

  18. [CHORE] #304 - 로그인 카카오 버튼 수정

    @mini-min
    mini-min committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    75ad199 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #305 from mini-min/release/#304 

    [CHORE] #304 - 카카오 로그인 버튼 수정
    @mini-min
    mini-min authored Jan 7, 2022
    Configuration menu
    Copy the full SHA
    0e6a24e View commit details
    Browse the repository at this point in the history