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/#133] 알림 화면 연결 #142

Merged
merged 16 commits into from
Feb 12, 2024
Merged

[FEAT/#133] 알림 화면 연결 #142

merged 16 commits into from
Feb 12, 2024

Commits on Feb 9, 2024

  1. [fix/#132] 소셜로그인 웹뷰 disable CookieManager

    @blueme0
    blueme0 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    dca96b8 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. [feat/#133] 알림 리스트 UI 구현

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    a5284e4 View commit details
    Browse the repository at this point in the history

  2. [feat/#133] 마이페이지 - 푸시 알림 on/off 적용

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    7a4d63c View commit details
    Browse the repository at this point in the history

  3. [feat/#133] 알림 type 별로 화면 연결

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    3176f44 View commit details
    Browse the repository at this point in the history

  4. [feat/#133] 알림 리스트 서버 연결

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    be6876d View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/feature/#138-card-back-add-detai… 

    …l' into feature/#132-disable-cookie
    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    874402b View commit details
    Browse the repository at this point in the history

  6. [feat/#132] 카드 후면 연결 중

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    eae9b5c View commit details
    Browse the repository at this point in the history

  7. [fix/#132] common dialog 취소 버튼 텍스트 색상 수정

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    d08ead1 View commit details
    Browse the repository at this point in the history

  8. [fix/#132] 위치 권한 액티비티 -> common dialog 적용

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    d5fdf95 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/feature/#138-card-back-add-detai… 

    …l' into feature/#132-disable-cookie
    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    a1126a5 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/main' into feature/#132-disable-… 

    …cookie
    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    60acb2d View commit details
    Browse the repository at this point in the history

  11. [fix/#132] 자기소개서 카드 interest 삭제 반영되도록

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    c2c3c42 View commit details
    Browse the repository at this point in the history

  12. [fix/#132] 소셜로그인 실패 메시지 토스트로 수정

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    ddbf356 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into feature/#133-notification-list 

    # Conflicts:
#	app/src/main/java/com/teumteum/teumteum/presentation/splash/SplashActivity.kt
#	app/src/main/res/values/strings.xml
    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    d7ebb59 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'feature/#132-disable-cookie' into feature/#133-notifica… 

    …tion-list
    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    dd1f80d View commit details
    Browse the repository at this point in the history

  15. [fix/#133] 충돌 해결

    @blueme0
    blueme0 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    0405953 View commit details
    Browse the repository at this point in the history