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

[FEAT] 팀원 현황 뷰 구현 #35

Merged
merged 27 commits into from
Jul 18, 2023
Merged

[FEAT] 팀원 현황 뷰 구현 #35

merged 27 commits into from
Jul 18, 2023

Commits on Jul 14, 2023

  1. [ADD] fragment 확인용 test activity 생성

    @emjayMJkim
    emjayMJkim committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    07cf836 View commit details
    Browse the repository at this point in the history

  2. [ADD] 팀원 현황 뷰 날짜 background 생성

    @emjayMJkim
    emjayMJkim committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    e45fa4f View commit details
    Browse the repository at this point in the history

  3. [ADD] 팀원 현황 뷰 날짜 item 생성

    @emjayMJkim
    emjayMJkim committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    0c93097 View commit details
    Browse the repository at this point in the history

  4. [FEAT] 팀원 현황 뷰 recyclerview 추가

    @emjayMJkim
    emjayMJkim committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    a14c9a7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/emjayMJkim/Puzzling_Android 

     into feature/Team-Puzzling#16-team-teamCurrentSituation
    @emjayMJkim
    emjayMJkim committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    4404b6f View commit details
    Browse the repository at this point in the history

  6. [ADD] 팀원 현황 뷰 recyclerview item 생성

    @emjayMJkim
    emjayMJkim committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    7b8fce4 View commit details
    Browse the repository at this point in the history

  7. [ADD] 팀원 현황 뷰 data class 생성

    @emjayMJkim
    emjayMJkim committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    7ca4e01 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. [FIX] Merge conflict 해결

    @emjayMJkim
    emjayMJkim committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    71ea800 View commit details
    Browse the repository at this point in the history

  2. [MOD] 회고 진행 title item 수정

    @emjayMJkim
    emjayMJkim committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    e14c1d7 View commit details
    Browse the repository at this point in the history

  3. [ADD] MVVM용 파일 생성

    @emjayMJkim
    emjayMJkim committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    825a7d3 View commit details
    Browse the repository at this point in the history

  4. [FEAT] 회고 진행 현황 리스트 생성

    @emjayMJkim
    emjayMJkim committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    e55acb4 View commit details
    Browse the repository at this point in the history

  5. [UI] 팀원 현황 뷰 layout 위치 조정

    @emjayMJkim
    emjayMJkim committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    380ac26 View commit details
    Browse the repository at this point in the history

  6. [FEAT] 팀원 현황 뷰 상단 date 추가

    @emjayMJkim
    emjayMJkim committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    709f2e2 View commit details
    Browse the repository at this point in the history

  7. [FEAT] 일주일 날짜 상단 띄우기 구현

    @emjayMJkim
    emjayMJkim committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    97d9176 View commit details
    Browse the repository at this point in the history

  8. [ADD] 팀원 회고 리스트 data class 생성

    @emjayMJkim
    emjayMJkim committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    eccbc18 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. [FEAT] 서버 API에 맞게 회고 진행 현황 리스트 생성

    @emjayMJkim
    emjayMJkim committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    d59c68c View commit details
    Browse the repository at this point in the history

  2. [UI] 회고 진행 리스트 recyclerview 위치 조정

    @emjayMJkim
    emjayMJkim committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    614a623 View commit details
    Browse the repository at this point in the history

  3. [FIX] Merge conflict 해결

    @emjayMJkim
    emjayMJkim committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    c0419aa View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. [ADD] ViewPager 생성

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    b8e4fa9 View commit details
    Browse the repository at this point in the history

  2. [FIX] Merge conflict 해결

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    5bad872 View commit details
    Browse the repository at this point in the history

  3. [FIX] Merge conflict 해결

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    abc926d View commit details
    Browse the repository at this point in the history

  4. [FEAT] 팀원 회고 현황 viewPager 구현

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    4f4ae41 View commit details
    Browse the repository at this point in the history

  5. [MOD] 필요 없는 코드 정리

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    6f15a9c View commit details
    Browse the repository at this point in the history

  6. [FIX] Merge conflict 해결

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    1970d13 View commit details
    Browse the repository at this point in the history

  7. [ADD] 회고 주기 아닌 경우의 fragment 연결

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    efb9da8 View commit details
    Browse the repository at this point in the history

  8. [ADD] 회고 진행한 사람 없는 경우 추가

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    7bde159 View commit details
    Browse the repository at this point in the history

  9. [ADD] testActivity로 뷰 확인

    @emjayMJkim
    emjayMJkim committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    317fc05 View commit details
    Browse the repository at this point in the history