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

[FIX] 홈 UI 수정 #70

Merged
merged 25 commits into from
Jul 20, 2023
Merged

[FIX] 홈 UI 수정 #70

merged 25 commits into from
Jul 20, 2023

Commits on Jul 19, 2023

  1. [FEAT] 액션 플랜 adapter 수정

    @amourxyoung
    amourxyoung committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    f63948a View commit details
    Browse the repository at this point in the history

  2. [FEAT] 액션플랜 item padding 수정

    @amourxyoung
    amourxyoung committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    37864c9 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. [FEAT] 팀 대시보드 text margin 수정

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    f988917 View commit details
    Browse the repository at this point in the history

  2. [FEAT] 회고 작성 뷰 navagation 추가

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    020c539 View commit details
    Browse the repository at this point in the history

  3. [FEAT] 홈 뷰 퍼즐판 보러가기 분기처리

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    f4e1b33 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feat/Team-Puzzling#56-fix-ui

    @amourxyoung
    amourxyoung authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2a66708 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6 from Cat-JiYoung/feat/Team-Puzzling#56-fix-ui 

    Feat/Team-Puzzling#56 fix UI
    @amourxyoung
    amourxyoung authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    b8bc621 View commit details
    Browse the repository at this point in the history

  6. [MERGE] 테스트용 주석처리

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    767d9f8 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into test

    @amourxyoung
    amourxyoung authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    34760ae View commit details
    Browse the repository at this point in the history

  8. Merge pull request #7 from Cat-JiYoung/test 

    Test
    @amourxyoung
    amourxyoung authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    62fec48 View commit details
    Browse the repository at this point in the history

  9. [FIX] 홈뷰 개인 / 팀 대시보드 margin 수정

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    a4fdd41 View commit details
    Browse the repository at this point in the history

  10. [FIX] 회고 저장 다이얼로그 margin 수정

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    c4f7a28 View commit details
    Browse the repository at this point in the history

  11. [FIX] 회고 작성 버튼 분기처리 구현

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2261696 View commit details
    Browse the repository at this point in the history

  12. [FIX] 회고 작성 post 로직 수정

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    40c3c91 View commit details
    Browse the repository at this point in the history

  13. [FIX] 회고 작성 dto 수정

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2145f0e View commit details
    Browse the repository at this point in the history

  14. [FIX] 팀원 랭킹 뷰 수정

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    77e8805 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #8 from Cat-JiYoung/feat/Team-Puzzling#56-fix-ui 

    Feat/Team-Puzzling#56 fix UI
    @amourxyoung
    amourxyoung authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    255ce71 View commit details
    Browse the repository at this point in the history

  16. [FIX] 팀원 랭킹 및 변수 수정

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    a6e363c View commit details
    Browse the repository at this point in the history

  17. Merge pull request #9 from Cat-JiYoung/feat/Team-Puzzling#56-fix-ui 

    [FIX] 팀원 랭킹 및 변수 수정
    @amourxyoung
    amourxyoung authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    7f63d67 View commit details
    Browse the repository at this point in the history

  18. Merge remote-tracking branch 'origin/develop' into develop 

    # Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/puzzling/puzzlingaos/di/RetrofitModule.kt
#	app/src/main/java/com/puzzling/puzzlingaos/presentation/home/HomeViewModel.kt
    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    972347e View commit details
    Browse the repository at this point in the history

  19. [FIX] pull 충돌 해결

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    b47f7dc View commit details
    Browse the repository at this point in the history

  20. [FEAT] 팀 닉네임 intent 값 전달

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    4f32d58 View commit details
    Browse the repository at this point in the history

  21. [FEAT] 홈뷰 퍼즐조각 클릭 이벤트 처리

    @amourxyoung
    amourxyoung committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    4ee1f85 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #10 from Cat-JiYoung/feat/Team-Puzzling#56-fix-ui 

    Feat/Team-Puzzling#56 fix UI
    @amourxyoung
    amourxyoung authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    d9e77b2 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'develop' into develop

    @amourxyoung
    amourxyoung authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    4aec35b View commit details
    Browse the repository at this point in the history