diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22b2b28b7..695ac4710 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: name: Build Package uses: ./.github/workflows/build-package.yml with: - tag: release + tag: ${{ github.event.release.tag_name }} publish: permissions: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2dd7dc5cc..a3a939778 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: exclude: ^tests/data/ - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.12.2 + rev: v0.12.3 hooks: - id: ruff - id: ruff-format diff --git a/docs/docs/documentation/getting-started/installation/installation-checklist.md b/docs/docs/documentation/getting-started/installation/installation-checklist.md index bf5ef93de..2a6a4534b 100644 --- a/docs/docs/documentation/getting-started/installation/installation-checklist.md +++ b/docs/docs/documentation/getting-started/installation/installation-checklist.md @@ -31,7 +31,7 @@ To deploy mealie on your local network, it is highly recommended to use Docker t We've gone through a few versions of Mealie v1 deployment targets. We have settled on a single container deployment, and we've begun publishing the nightly container on github containers. If you're looking to move from the old nightly (split containers _or_ the omni image) to the new nightly, there are a few things you need to do: 1. Take a backup just in case! -2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v2.8.0` +2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.1` 3. Take the external port from the frontend container and set that as the port mapped to port `9000` on the new container. The frontend is now served on port 9000 from the new container, so it will need to be mapped for you to have access. 4. Restart the container diff --git a/docs/docs/documentation/getting-started/installation/postgres.md b/docs/docs/documentation/getting-started/installation/postgres.md index 4e08fa192..c666f798b 100644 --- a/docs/docs/documentation/getting-started/installation/postgres.md +++ b/docs/docs/documentation/getting-started/installation/postgres.md @@ -7,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In ```yaml services: mealie: - image: ghcr.io/mealie-recipes/mealie:v2.8.0 # (3) + image: ghcr.io/mealie-recipes/mealie:v3.0.1 # (3) container_name: mealie restart: always ports: diff --git a/docs/docs/documentation/getting-started/installation/sqlite.md b/docs/docs/documentation/getting-started/installation/sqlite.md index f33080e0e..cfad6d57b 100644 --- a/docs/docs/documentation/getting-started/installation/sqlite.md +++ b/docs/docs/documentation/getting-started/installation/sqlite.md @@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th ```yaml services: mealie: - image: ghcr.io/mealie-recipes/mealie:v2.8.0 # (3) + image: ghcr.io/mealie-recipes/mealie:v3.0.1 # (3) container_name: mealie restart: always ports: diff --git a/frontend/components/Domain/Recipe/RecipeContextMenu.vue b/frontend/components/Domain/Recipe/RecipeContextMenu.vue index 1a034d065..6d86c3658 100644 --- a/frontend/components/Domain/Recipe/RecipeContextMenu.vue +++ b/frontend/components/Domain/Recipe/RecipeContextMenu.vue @@ -125,25 +125,20 @@
- - - diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue index 732564942..08455fdf8 100644 --- a/frontend/pages/group/data/foods.vue +++ b/frontend/pages/group/data/foods.vue @@ -126,7 +126,7 @@ @@ -34,7 +34,7 @@ diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue index 262902ad7..764803be0 100644 --- a/frontend/pages/group/data/tags.vue +++ b/frontend/pages/group/data/tags.vue @@ -44,6 +44,7 @@ :title="$t('general.confirm')" :icon="$globals.icons.alertCircle" color="error" + can-confirm @confirm="deleteTag" > diff --git a/frontend/pages/group/data/tools.vue b/frontend/pages/group/data/tools.vue index 15987eaed..24a1e96c9 100644 --- a/frontend/pages/group/data/tools.vue +++ b/frontend/pages/group/data/tools.vue @@ -52,6 +52,7 @@ :title="$t('general.confirm')" :icon="$globals.icons.alertCircle" color="error" + can-confirm @confirm="deleteTool" > diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue index 6833dd9a9..e8989d84d 100644 --- a/frontend/pages/group/data/units.vue +++ b/frontend/pages/group/data/units.vue @@ -19,30 +19,16 @@ v-model="fromUnit" return-object :items="store" - item-title="id" + item-title="name" :label="$t('data-pages.units.source-unit')" - > - - - + /> - - - + />