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.

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

Merge dev into main #536

Merged
merged 15 commits into from
Jan 22, 2024
Merged

Merge dev into main #536

merged 15 commits into from
Jan 22, 2024

Commits on Jun 27, 2023

  1. Configuration menu
    Copy the full SHA
    f384837 View commit details
    Browse the repository at this point in the history
  2. 환경, 배포 관련 문서 추가 (#525)

    * 환경, 배포 관련 문서 추가
    
    * 최상위에서 접근경로 추가
    neverlish committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    40e7bc9 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. 정리

    hanyiseo2 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    cde451d View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Configuration menu
    Copy the full SHA
    f73d181 View commit details
    Browse the repository at this point in the history
  2. 2-5-1 브랜드 추가

    Taehoya committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    165ca87 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Revert "2-5-1 브랜드 추가"

    This reverts commit 165ca87.
    Taehoya committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    91155d3 View commit details
    Browse the repository at this point in the history
  2. Revert "Revert "2-5-1 브랜드 추가""

    This reverts commit 91155d3.
    Taehoya committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    e969d17 View commit details
    Browse the repository at this point in the history
  3. Dev admin fix (#527)

    * GET perfume_add englishName
    
    * Fixing GET admin/perfumes by adding englishName
    hanyiseo2 committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    3ffe960 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. admin-imgUrl 작업중 (#528)

    * admin-imgUrl
    
    * POST admin/ingredient - create ingredient
    hanyiseo2 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    5390f4e View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Dev admin img url (#529)

    * admin-imgUrl
    
    * POST admin/ingredient - create ingredient
    
    * perfume-addImage
    hanyiseo2 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    084df17 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. cth/fix (#530)

    * Revert "Dev admin img url (#529)"
    
    This reverts commit 084df17.
    
    * Revert "admin-imgUrl 작업중 (#528)"
    
    This reverts commit 5390f4e.
    
    * Revert "Dev admin fix (#527)"
    
    This reverts commit 3ffe960.
    Taehoya committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    3133ac2 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Configuration menu
    Copy the full SHA
    9025579 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Merge pull request #532 from Scents-Note/feature/issue-531

    upgrade android min version
    heesung6701 committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    86f80d1 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Refactor dev branch CI/CD process (#534)

    * Update prebuild.sh
    
    * Update reload.sh
    
    * Create deploy file to test with Github Hosted Runner
    
    * Update deploy-development.yml using github-hosted runner and SSH
    
    * Rollback branch name to push
    
    * Remove workflow file for testing
    ChoHadam committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    966a101 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Refactor deploy-development.yml and reload.sh for CI/CD performance (#…

    …535)
    
    * Rollback deploy file to test with Github Hosted Runner
    
    * Update branch name to push
    
    * Add step to check default github workspace path
    
    * Add path option for actions/checkout
    
    * Delete unnecessary code
    
    * Use bash instead of sh
    
    * Get the latest changes from the branch
    
    * Manage branch name with environment variable
    
    * Use '&&' to ensure each step runs successfully
    
    * Write branch name directly
    
    * Fetch all branches from remote repository
    
    * Update reload.sh to delete duplicate code and clarify roles
    
    * Remove git reset and leave only git pull
    
    * Reflect the changes so far in deployment-development.yml
    
    * Delete the file for testing using Github Hosted Runner
    
    * Delete code for checking github workspace path
    
    * Reflect the changes so far in deployment-production-1.yml
    
    * Reflect the changes so far in deployment-production-2.yml
    
    * Reflect the changes so far in deployment-production.yml
    ChoHadam committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    adf7633 View commit details
    Browse the repository at this point in the history