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

Feature/jaino/#94 #111

Merged
merged 22 commits into from
Feb 3, 2024
Merged

Feature/jaino/#94 #111

merged 22 commits into from
Feb 3, 2024

Commits on Jan 22, 2024

  1. [FIX] #94 : κ΄€λ¦¬νŽ˜μ΄μ§€ μ ‘κ·Ό 문제, State Init μƒνƒœλ₯Ό λ„μž…ν•˜μ—¬ ν•΄κ²°

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    c3e6079 View commit details
    Browse the repository at this point in the history

  2. [FIX] #94 : 잘λͺ»λœ μ „ν™˜ μ†Œκ±°

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    345a43f View commit details
    Browse the repository at this point in the history

  3. [STYLE] #94 : μ½”λ“œ 인덴트 μ†Œκ±°

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    65adcf6 View commit details
    Browse the repository at this point in the history

  4. [STYLE] #94 : trailing comma μΆ”κ°€

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    3defa78 View commit details
    Browse the repository at this point in the history

  5. [UI] #94 : μ„€λ¬Έ 초기 ν™”λ©΄ UI κ΅¬ν˜„

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    56a15c2 View commit details
    Browse the repository at this point in the history

  6. [FEATURE] #94 : μ„€λ¬Έ 정보화면 -> μ„€λ¬Έ 응닡화면 μ „ν™˜ κ΅¬ν˜„

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    228ea9a View commit details
    Browse the repository at this point in the history

  7. [CHORE] #94 : SurveyAnswerForm 컴포저블 ν•¨μˆ˜ 뢄리

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    6d9d914 View commit details
    Browse the repository at this point in the history

  8. [FEATURE] #94 : 이전 ν•­λͺ© λŒμ•„κ°€μ„œ, μˆ˜μ •ν•˜λŠ” 둜직 κ΅¬ν˜„

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    e16419c View commit details
    Browse the repository at this point in the history

  9. [CHORE] #94 : SpaceBetween -> 각 νŒ¨λ”©κ°’ + weight둜 μˆ˜μ •

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    206ca46 View commit details
    Browse the repository at this point in the history

  10. [CHORE] #94 : μ„€λ¬Έ μΉ΄λ“œ λ‚΄μš© ν•œμ€„ μ„€μ •

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    c6ac3be View commit details
    Browse the repository at this point in the history

  11. [CHORE] #94 : 인자 넀이밍 μˆ˜μ • 및 톡일

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    6be5beb View commit details
    Browse the repository at this point in the history

  12. [CHORE] #94 : String Resource μΆ”κ°€

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    bafe577 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' of https://github.com/pknu-wap/WAPP into featu… 

    …re/jaino/#94

# Conflicts:
#	feature/management/src/main/java/com/wap/wapp/feature/management/ManagementGuestScreen.kt
#	feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt
    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    c9c89fd View commit details
    Browse the repository at this point in the history

  14. [CHORE] #94 : 병합 좩돌 ν•΄κ²°

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a0bdbce View commit details
    Browse the repository at this point in the history

  15. [MERGE] #94 : build 였λ₯˜, network Util에 ν˜„μž¬ μ‹œκ° μœ ν‹Έ μΆ”κ°€

    @jeongjaino
    jeongjaino committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    36123f2 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. [CHORE] #94 : λ‹¨μΌν‘œν˜„μ‹ μˆ˜μ •

    @jeongjaino
    jeongjaino committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    f28c851 View commit details
    Browse the repository at this point in the history

  2. [CHORE] #94 : λ‹¨μΌν‘œν˜„μ‹ μˆ˜μ •

    @jeongjaino
    jeongjaino committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    2a8e2dc View commit details
    Browse the repository at this point in the history

  3. [FIX] #94 : λ§ˆμ§€λ§‰ 질문 μƒνƒœ μ €μž₯λ˜μ§€ μ•ŠλŠ” 버그 μˆ˜μ •

    @jeongjaino
    jeongjaino committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    50ec6e8 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Merge branch 'develop' of https://github.com/pknu-wap/WAPP into featu… 

    …re/jaino/#94

# Conflicts:
#	core/network/src/main/java/com/wap/wapp/core/network/source/attendancestatus/AttendanceStatusDataSourceImpl.kt
#	core/network/src/main/java/com/wap/wapp/core/network/source/event/EventDataSourceImpl.kt
#	core/network/src/main/java/com/wap/wapp/core/network/utils/LocalDateTime.kt
    @jeongjaino
    jeongjaino committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    1d821d7 View commit details
    Browse the repository at this point in the history

  2. [FIX] #94 : λ§ˆμ§€λ§‰ 질문이 μ•„λ‹Œ, λ‹¨μˆœνžˆ μž‘μ„±λ˜μ§€ μ•Šμ€ μƒνƒœμ—μ„œ λ’€λ‘œκ°€κΈ° ν•˜λŠ” 경우 / 질문 등둝이 λ“±λ‘λ˜λ„λ‘ 둜직 λ³€κ²½

    @jeongjaino
    jeongjaino committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    63acc60 View commit details
    Browse the repository at this point in the history

  3. [STYLE] #94 : κ°œν–‰ μ†Œκ±°

    @jeongjaino
    jeongjaino committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    818a618 View commit details
    Browse the repository at this point in the history

  4. [FEATURE] #94 : μ„€λ¬Έ λ“±λ‘μ—μ„œ λ°”ν…€λ°” μ†Œκ±°λ˜λ„λ‘ μˆ˜μ •

    @jeongjaino
    jeongjaino committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    ad6e575 View commit details
    Browse the repository at this point in the history