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] 냉장고 CRUD 기능 구현 #40

Merged
merged 10 commits into from
Jan 29, 2024
Merged

[FEAT] 냉장고 CRUD 기능 구현 #40

merged 10 commits into from
Jan 29, 2024

Commits on Jan 21, 2024

  1. Feat: 재료 추가 기능 구햔

    @longrunBiin
    longrunBiin committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    6debccf View commit details
    Browse the repository at this point in the history

  2. Feat: Ingredient memo 필드 추가

    @longrunBiin
    longrunBiin committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    4010772 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Feat: 냉장고 재료 1개 검색 기능 구현

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

Commits on Jan 25, 2024

  1. Feat: 냉장고 재료 삭제 기능 구현

    @longrunBiin
    longrunBiin committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    d9f5f0e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/IRECIPE/IRecipe-Server i… 

    …nto feature/4

# Conflicts:
#	.gradle/8.5/executionHistory/executionHistory.bin
#	.gradle/8.5/executionHistory/executionHistory.lock
#	.gradle/8.5/fileHashes/fileHashes.bin
#	.gradle/8.5/fileHashes/fileHashes.lock
#	.gradle/8.5/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/file-system.probe
#	.idea/misc.xml
#	.idea/modules/IRECIPE_Server.main.iml
#	build.gradle
#	build/classes/java/main/umc/IRECIPE_Server/apiPayLoad/code/status/ErrorStatus.class
#	build/classes/java/main/umc/IRECIPE_Server/domain/mapping/Ingredient$IngredientBuilder.class
#	build/classes/java/main/umc/IRECIPE_Server/domain/mapping/Ingredient.class
#	build/classes/java/main/umc/IRECIPE_Server/domain/mapping/IngredientCategory$IngredientCategoryBuilder.class
#	build/classes/java/main/umc/IRECIPE_Server/domain/mapping/IngredientCategory.class
#	build/classes/java/main/umc/IRECIPE_Server/domain/mapping/Member$MemberBuilder.class
#	build/classes/java/main/umc/IRECIPE_Server/domain/mapping/Member.class
#	build/tmp/compileJava/previous-compilation-data.bin
    @longrunBiin
    longrunBiin committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    5ec8d76 View commit details
    Browse the repository at this point in the history

  3. Feat: 냉장고 재료 수정 기능 구현

    @longrunBiin
    longrunBiin committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    82b31ed View commit details
    Browse the repository at this point in the history

  4. Feat: 냉장고 전체 재료 조회 및 페이징 기능 구현

    @longrunBiin
    longrunBiin committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    818bea1 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. FIX: merge 오류 해결

    @longrunBiin
    longrunBiin committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    de61ca1 View commit details
    Browse the repository at this point in the history

  2. FIX: pull develop

    @longrunBiin
    longrunBiin committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    fcba4b5 View commit details
    Browse the repository at this point in the history

  3. FIX: 냉장고 CRUD 기능 테스트 완료

    @longrunBiin
    longrunBiin committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    215cb5e View commit details
    Browse the repository at this point in the history