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] #272 - release1.0/3 -> develop 머지하기 #273

Merged
merged 49 commits into from
Dec 29, 2021
Merged

[CHORE] #272 - release1.0/3 -> develop 머지하기 #273

merged 49 commits into from
Dec 29, 2021

Commits on Dec 26, 2021

  1. [CHORE] #244 - 빌드 3으로 업데이트

    @dlwns33
    dlwns33 committed Dec 26, 2021
    Configuration menu
    Copy the full SHA
    da97304 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #245 from dlwns33/release/#244 

    [CHORE] #244 - 빌드 3으로 업데이트
    @dlwns33
    dlwns33 authored Dec 26, 2021
    Configuration menu
    Copy the full SHA
    578315d View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2021

  1. [FIX] #247 - 메인뷰 명함리스트조회 로직 변경 및 명함생성 url 포함시키기

    @hyun99999
    hyun99999 committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    fac43c7 View commit details
    Browse the repository at this point in the history

  2. [FIX] #249 - 재설치 시 메인 명함리스트 비워지는 이슈

    @hyun99999
    hyun99999 committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    eba55ef View commit details
    Browse the repository at this point in the history

  3. [FIX] #249 - 재설치 시 메인 명함리스트 비워지는 이슈

    @hyun99999
    hyun99999 committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    ff4b1ba View commit details
    Browse the repository at this point in the history

  4. [FIX] #249 - 재설치 시 메인 명함리스트 비워지는 이슈

    @hyun99999
    hyun99999 committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    173971c View commit details
    Browse the repository at this point in the history

  5. [FIX] #246 - 자동로그인에 대한 로직 수정과 위치 변경

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    5cff6f7 View commit details
    Browse the repository at this point in the history

  6. [FIX] #246 - 로그아웃, 모든 명함 삭제 부분 처리 로직 변경

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    97d6fa7 View commit details
    Browse the repository at this point in the history

  7. [FIX] #246 - 일부 서버 Service Const Header로 변경

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    51d19d8 View commit details
    Browse the repository at this point in the history

  8. [FIX] #246 - 자동 로그인 최종 구현완료

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    af444d6 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #248 from TeamNADA/release1.0/#247 

    [FIX] #247 - 메인뷰 명함리스트조회 로직 변경 및 명함생성 url 포함시키기
    @hyun99999
    hyun99999 authored Dec 28, 2021
    Configuration menu
    Copy the full SHA
    0169f69 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #250 from TeamNADA/release1.0/#249 

    [FIX] #249 - 재설치 시 메인 명함리스트 비워지는 이슈
    @hyun99999
    hyun99999 authored Dec 28, 2021
    Configuration menu
    Copy the full SHA
    ce41b46 View commit details
    Browse the repository at this point in the history

  11. [FIX] #246 - 화면전환이 되는 경우, 토큰없이 메인으로 넘어갈 때 메인 명함리스트가 비워지는 이슈 해결

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    60911e4 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'release1.0/3' into release/#246

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    01aa228 View commit details
    Browse the repository at this point in the history

  13. [FIX] #246 - 불필요한 UserDefaults 제거

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    dae49c1 View commit details
    Browse the repository at this point in the history

  14. [FIX] #246 - Apple ID ID 저장값 오류 수정

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    9326a50 View commit details
    Browse the repository at this point in the history

  15. [FIX] #253 - 카카오톡 로그인 post 서버 통신 시, oauthToken을 사용하도록 변경

    @mini-min
    mini-min committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    b4c1257 View commit details
    Browse the repository at this point in the history

  16. [FIX] #255 - 명함생성 후 두번째 명함으로 이동 및 리스트편집 후 첫번째 명함으로 이동

    @hyun99999
    hyun99999 committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    22d7bdd View commit details
    Browse the repository at this point in the history

  17. Merge pull request #256 from TeamNADA/release1.0/255 

    [FIX] #255 - 명함생성 후 두번째 명함으로 이동 및 리스트편집 후 첫번째 명함으로 이동
    @dlwns33
    dlwns33 authored Dec 28, 2021
    Configuration menu
    Copy the full SHA
    d6e4160 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2021

  1. [FIX] #253 - 카카오 로그인 post통신 시, 이메일대신 토큰 사용하도록 변경

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    067c53a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #254 from mini-min/release/#253 

    [FIX] #253 - 카카오톡 로그인 post 서버 통신 시, oauthToken을 사용하도록 변경
    @mini-min
    mini-min authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    ad52a55 View commit details
    Browse the repository at this point in the history

  3. [FEAT] #260 - 같은 이름으로 그룹 생성시 알림창 표출(아직 수정해야함)

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    938435b View commit details
    Browse the repository at this point in the history

  4. [FEAT] #260 - 그룹 추가시 알림창 추가

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    db436a6 View commit details
    Browse the repository at this point in the history

  5. [FEAT] #257 - 명함 그룹뷰 인파이나이트스크롤 구현 

    - prepareForReuse 로 셀 초기화
- 명함 추가, 명함큐알 추가, 명함삭제, 큐알스캔 뒤로가기, 그룹 편집 뒤로가기 시에 그룹뷰 갱신 노티 추가
- viewWillAppear 에서 구현할라했지만 컬렉션뷰 맨 위로 올리는 과정이 추가되기 위해서 노티 사용
- 무한스크롤 구현
- 현재 맨 위로 올리기 위해서 1초의 딜레이를 주고 있는데 좀 더 고민해보겠습니당
    @hyun99999
    hyun99999 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    7965b86 View commit details
    Browse the repository at this point in the history

  6. [FEAT] #218 - 아이디로 명함 추가 실패시 키보드가 내려가지 않게 하기

    @dlwns33
    dlwns33 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    fb56a39 View commit details
    Browse the repository at this point in the history

  7. [FEAT] #218 - 그룹 간격 살리기

    @dlwns33
    dlwns33 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    fd4c2e9 View commit details
    Browse the repository at this point in the history

  8. [FEAT] #218 - 명함 그룹 수정 후 Alert

    @dlwns33
    dlwns33 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    4f95f2e View commit details
    Browse the repository at this point in the history

  9. [FEAT] #218 - 명함 상세 아이디 히든 처리

    @dlwns33
    dlwns33 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    43fea5f View commit details
    Browse the repository at this point in the history

  10. Merge pull request #261 from TeamNADA/release1.0/#257 

    [FEAT] #257 - 명함 그룹뷰 인파이나이트스크롤 구현
    @hyun99999
    hyun99999 authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    ded11cd View commit details
    Browse the repository at this point in the history

  11. [FIX] @262 - 명함 모음 리로드 로직 수정

    @hyun99999
    hyun99999 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    814b9d9 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #263 from TeamNADA/release1.0/#266 

    [FIX] #262 - 명함 모음 리로드 로직 수정
    @hyun99999
    hyun99999 authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    0c7093d View commit details
    Browse the repository at this point in the history

  13. [FIX] #260 - 그룹 추가 알림창과 리로드 이슈 해결

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    67aaf8c View commit details
    Browse the repository at this point in the history

  14. [CHORE] #218 - 디스플레이 이름 변경

    @dlwns33
    dlwns33 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    bdaa8be View commit details
    Browse the repository at this point in the history

  15. Merge branch 'release1.0/3' into release/#218

    @dlwns33
    dlwns33 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    5f0cc83 View commit details
    Browse the repository at this point in the history

  16. [FIX] #260 - 그룹 편집 시 리로드 이슈 해결

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    0d25b6e View commit details
    Browse the repository at this point in the history

  17. [FEAT] #218 - commonBottomSheet 함수 overFullScreen으로 변경

    @dlwns33
    dlwns33 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    f51b8f1 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #264 from dlwns33/release/#218 

    [FEAT] #218 - 명함 그룹 뷰 1차 버그 해결
    @dlwns33
    dlwns33 authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    517e390 View commit details
    Browse the repository at this point in the history

  19. [FIX] #260 - 그룹 삭제 시 명함 미분류로 이동 로직 구현

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    483e4bb View commit details
    Browse the repository at this point in the history

  20. Merge branch 'release1.0/3' into release/#260

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    44f645d View commit details
    Browse the repository at this point in the history

  21. [FIX] #260 - 다크모드 바텀시트 백그라운드 투명도 조절

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    5e94159 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #266 from mini-min/release/#260 

    [FIX] #260 - 그룹 편집 리로드 버그 해결
    @mini-min
    mini-min authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    884e060 View commit details
    Browse the repository at this point in the history

  23. [FEAT] #267 - 그룹 편집 엠티 뷰 구현, 연결

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    eb77585 View commit details
    Browse the repository at this point in the history

  24. [FEAT] #267 - 카드 리스트 엠티 뷰 구현, 연결

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    9214201 View commit details
    Browse the repository at this point in the history

  25. [FEAT] #269 - QR 스캔 재시작 구현

    @hyun99999
    hyun99999 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    ecca41c View commit details
    Browse the repository at this point in the history

  26. Merge pull request #270 from TeamNADA/release1.0/#269 

    [FEAT] #269 - QR 스캔 재시작 구현
    @hyun99999
    hyun99999 authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    6cfdf65 View commit details
    Browse the repository at this point in the history

  27. [REFACTOR] #267 - 불필요한 true 조건 삭제

    @mini-min
    mini-min committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    99d7e46 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #268 from mini-min/release/#267 

    [FEAT] #267 - 리스트, 그룹 편집 엠티뷰 추가
    @mini-min
    mini-min authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    b14eadf View commit details
    Browse the repository at this point in the history

  29. [FEAT] #265 - 동일한 그룹명 alert

    @dlwns33
    dlwns33 committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    48a94c9 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #271 from dlwns33/release/#265 

    [FEAT] #265 - 동일한 그룹명 alert
    @dlwns33
    dlwns33 authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    1301f3f View commit details
    Browse the repository at this point in the history