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

Merge pull request #22 from farm-mate/fix/#19-writediary-xml #23

Open
wants to merge 56 commits into
base: fix/#19-writediary-xml
Choose a base branch
from
Open

Merge pull request #22 from farm-mate/fix/#19-writediary-xml #23

wants to merge 56 commits into from

Commits on Jul 24, 2023

  1. Merge pull request #22 from farm-mate/fix/#19-writediary-xml 

    [fix][write-diary]xml
    @sujinjinsu
    sujinjinsu authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    1d8f9aa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #24 from farm-mate/fix/#19-writediary-xml 

    Merge pull request #23 from farm-mate/fix/#19-writediary-xml
    @sujinjinsu
    sujinjinsu authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    e8fec09 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Merge pull request #25 from farm-mate/fix/#19-writediary-xml 

    linking server
    @sujinjinsu
    sujinjinsu authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    5c8605b View commit details
    Browse the repository at this point in the history

  2. feat/#26 plant post request code

    Jeongbin1 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    6eddee3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #27 from farm-mate/feat/#26-plant-postrequest 

    feat/#26 plant post request code
    @Jeongbin1
    Jeongbin1 authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    37fbfa1 View commit details
    Browse the repository at this point in the history

  4. write diary - linking server, feat.post

    @sujinjinsu
    sujinjinsu committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    5aac906 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #28 from farm-mate/feat/#27-writediary-linking-server 

    write diary - linking server, feat.post
    @sujinjinsu
    sujinjinsu authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    e8db642 View commit details
    Browse the repository at this point in the history

  6. [fix]- min/max temp

    @sujinjinsu
    sujinjinsu committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    60bdd74 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #29 from farm-mate/fix/#28-home-min,maxweather 

    [fix]- min/max temp
    @sujinjinsu
    sujinjinsu authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    d547b94 View commit details
    Browse the repository at this point in the history

  8. fix/#30 plant post request restore

    Jeongbin1 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    9d29466 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #31 from farm-mate/fix/#30-plant-post-restore 

    fix/#30 plant post request restore
    @Jeongbin1
    Jeongbin1 authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    c396df2 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. fix/#30 plant post request

    Jeongbin1 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    3a47c42 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #33 from farm-mate/fix/32-plant-post-request 

    fix/#30 plant post request
    @Jeongbin1
    Jeongbin1 authored Aug 30, 2023
    Configuration menu
    Copy the full SHA
    0b76212 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. feat/#34-deviceId-post-request

    Jeongbin1 committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    102877a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35 from farm-mate/feat/#34-deviceId-post-request 

    feat/#34-deviceId-post-request
    @Jeongbin1
    Jeongbin1 authored Sep 2, 2023
    Configuration menu
    Copy the full SHA
    e8fec14 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. feat/#35 (recent)

    Jeongbin1 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    886a4f2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #37 from farm-mate/feat/#36 

    feat/#36 (recent)
    @Jeongbin1
    Jeongbin1 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    15a5362 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. #38-diary-calendar:feat/#38 diary_calendar

    Jeongbin1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    7153a30 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #39 from farm-mate/feat/#38-diary-calendar 

    feat/#38 diary_calendar
    @Jeongbin1
    Jeongbin1 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5cde13f View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. feat/#40 diagnosis add camera 

    just add
    Jeongbin1 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    1bedf70 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #41 from farm-mate/feat/#40-diagnosis-addcamera 

    feat/#40 diagnosis add camera
    @Jeongbin1
    Jeongbin1 authored Mar 2, 2024
    Configuration menu
    Copy the full SHA
    e5e10e8 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. feat/#42 home weather

    Jeongbin1 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    3df0a12 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #43 from farm-mate/feat/#42-home-weather 

    feat/#42 home weather
    @Jeongbin1
    Jeongbin1 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    74eb9e0 View commit details
    Browse the repository at this point in the history

  3. #42-home-weather(2)

    Jeongbin1 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    90b1782 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #44 from farm-mate/feat/#42-home-weather 

    #42-home-weather(2)
    @Jeongbin1
    Jeongbin1 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    ce670b2 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. [feat] plant, diary 갤러리 기능 추가 

    파일명만 화면에, 파일은 서버로
    Jeongbin1 committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    38b2f70 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #46 from farm-mate/feat/#45-plant-diary-addgallery 

    [feat] plant, diary 갤러리 기능 추가
    @Jeongbin1
    Jeongbin1 authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    e7e0650 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. feat/#47-plant-diary-addbutton

    Jeongbin1 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    55d9564 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #48 from farm-mate/feat/#47-plant-diary-addbutton 

    feat/#47-plant-diary-addbutton
    @Jeongbin1
    Jeongbin1 authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    b07d49a View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. feat/#49 diagnosis listitem

    Jeongbin1 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    e9b1118 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #50 from farm-mate/feat/#49-diagnosis-listitem 

    feat/#49 diagnosis listitem
    @Jeongbin1
    Jeongbin1 authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    de6eb72 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. feat/#41 plant get post 요청 + 이미지

    Jeongbin1 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    81796fd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #52 from farm-mate/feat/#51-api-topbar 

    feat/#51 plant get post 요청 + 이미지
    @Jeongbin1
    Jeongbin1 authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    14d3334 View commit details
    Browse the repository at this point in the history

  3. feat/#53 plant info get 요청

    Jeongbin1 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    a8b61d4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #54 from farm-mate/feat/#53-api-plantinfo-get 

    feat/#53 plant info get 요청
    @Jeongbin1
    Jeongbin1 authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    50cf2c2 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. 수정

    Jeongbin1 committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    eb63d96 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #56 from farm-mate/feat/#55-home-collectionview 

    수정
    @Jeongbin1
    Jeongbin1 authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    3d8b86d View commit details
    Browse the repository at this point in the history

  3. feat/식물 수정 화면

    Jeongbin1 committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    3956d76 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. feat/api-수정삭제(북마크식물일지)

    Jeongbin1 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    d50a7ec View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. fix - 진단api, 수정기능 이미지

    Jeongbin1 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    9e5069a View commit details
    Browse the repository at this point in the history

  2. feat - 진단 응답 받아와서 데이터 할당

    Jeongbin1 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    7984f97 View commit details
    Browse the repository at this point in the history

  3. fix - 다이어리 해당 식물 것만 나오도록 수정

    Jeongbin1 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    cd76de8 View commit details
    Browse the repository at this point in the history

  4. fix - 다이어리 점 수정

    Jeongbin1 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ea5892f View commit details
    Browse the repository at this point in the history

  5. fix - 비료 추적 되도록 수정

    Jeongbin1 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    8182c1c View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. feat - openapi 병 목록 조회, 검색

    Jeongbin1 committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    04f6612 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. feat - 병검색 상세페이지 화면

    Jeongbin1 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    0f65769 View commit details
    Browse the repository at this point in the history

  2. feat - 병 상세검색 연결

    Jeongbin1 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    fa3425c View commit details
    Browse the repository at this point in the history

  3. fix - 검색 탭 이미지뷰 수정

    Jeongbin1 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    3300b61 View commit details
    Browse the repository at this point in the history

  4. fix - diaryedit 이미지

    Jeongbin1 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    edecce2 View commit details
    Browse the repository at this point in the history

  5. fix - 하단바, 스피너 

    키보드 입력시 하단바 뜨지않도록, 식물 추가 스피너 수정
    Jeongbin1 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    ea5c09b View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. feat - 진단 결과 post 

    알림창, api 요청
    Jeongbin1 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    ac2466f View commit details
    Browse the repository at this point in the history

  2. feat - 식물 개별 > 일지, 진단 

    넘어갈 때 해당 페이지 보이도록
    Jeongbin1 committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    3a3c3e9 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. feat - 진단 개별 get

    Jeongbin1 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    e731998 View commit details
    Browse the repository at this point in the history

  2. 진단 수정

    Jeongbin1 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    aea8f83 View commit details
    Browse the repository at this point in the history

  3. 아이콘 수정

    Jeongbin1 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    80bc13b View commit details
    Browse the repository at this point in the history

  4. 수정 - 날짜 밀림

    Jeongbin1 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    aabf7f5 View commit details
    Browse the repository at this point in the history