github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-22 06:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'mealie-next' into fix/not-found-when-recipe-image-is-changed

Browse source
This commit is contained in:
Mario Džoić 2025-07-21 16:21:50 +02:00 • committed by GitHub
commit 5b263a92c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pre-commit-config.yaml
View file

@ -12,7 +12,7 @@ repos:
exclude: ^tests/data/ exclude: ^tests/data/
- repo: https://github.com/astral-sh/ruff-pre-commit - repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version. # Ruff version.
rev: v0.12.3 rev: v0.12.4
hooks: hooks:
- id: ruff - id: ruff
- id: ruff-format - id: ruff-format

2
docs/docs/documentation/getting-started/installation/installation-checklist.md
View file

@ -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: 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! 1. Take a backup just in case!
2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.1` 2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.2`
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. 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 4. Restart the container

2
docs/docs/documentation/getting-started/installation/postgres.md
View file

@ -7,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In
```yaml ```yaml
services: services:
mealie: mealie:
image: ghcr.io/mealie-recipes/mealie:v3.0.1 # (3) image: ghcr.io/mealie-recipes/mealie:v3.0.2 # (3)
container_name: mealie container_name: mealie
restart: always restart: always
ports: ports:

2
docs/docs/documentation/getting-started/installation/sqlite.md
View file

@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th
```yaml ```yaml
services: services:
mealie: mealie:
image: ghcr.io/mealie-recipes/mealie:v3.0.1 # (3) image: ghcr.io/mealie-recipes/mealie:v3.0.2 # (3)
container_name: mealie container_name: mealie
restart: always restart: always
ports: ports:

2
frontend/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "mealie", "name": "mealie",
"version": "3.0.1", "version": "3.0.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "nuxt dev", "dev": "nuxt dev",

24
mealie/repos/seed/resources/foods/locales/da-DK.json
View file

@ -105,7 +105,7 @@
}, },
"chile pepper": { "chile pepper": {
"aliases": [ "aliases": [
"capsicum" "peberfrugt"
], ],
"description": "", "description": "",
"name": "chilipeber", "name": "chilipeber",
@ -138,38 +138,38 @@
"pumpkin": { "pumpkin": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "pumpkin", "name": "græskar",
"plural_name": "pumpkins" "plural_name": "græskar"
}, },
"cauliflower": { "cauliflower": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "cauliflower", "name": "blomkål",
"plural_name": "cauliflowers" "plural_name": "blomkålshoveder"
}, },
"cabbage": { "cabbage": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "cabbage", "name": "cabbage",
"plural_name": "cabbages" "plural_name": "kålhoveder"
}, },
"asparagu": { "asparagu": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "asparagu", "name": "asparges",
"plural_name": "asparagus" "plural_name": "asparges"
}, },
"kale": { "kale": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "kale", "name": "grønkål",
"plural_name": "kales" "plural_name": "grønkål"
}, },
"arugula": { "arugula": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "arugula", "name": "rucola",
"plural_name": "arugulas" "plural_name": "rucola"
}, },
"leek": { "leek": {
"aliases": [], "aliases": [],

42
mealie/repos/seed/resources/foods/locales/de-DE.json
View file

@ -6215,7 +6215,7 @@
"dried chili": { "dried chili": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "dried chili", "name": "Getrocknete Chili",
"plural_name": "dried chilies" "plural_name": "dried chilies"
}, },
"black cardamom": { "black cardamom": {
@ -6245,8 +6245,8 @@
"hot paprika": { "hot paprika": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "hot paprika", "name": "Scharfe Paprika",
"plural_name": "hot paprikas" "plural_name": "Scharfe Paprikas"
}, },
"lemon thyme": { "lemon thyme": {
"aliases": [], "aliases": [],
@ -6371,14 +6371,14 @@
"vietnamese mint": { "vietnamese mint": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "vietnamese mint", "name": "Vietnamesische Minze",
"plural_name": "vietnamese mints" "plural_name": "vietnamese mints"
}, },
"dried orange peel": { "dried orange peel": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "dried orange peel", "name": "Getrocknete Orangenscheiben",
"plural_name": "dried orange peels" "plural_name": "Getrocknete Orangenscheiben"
}, },
"espelette pepper": { "espelette pepper": {
"aliases": [], "aliases": [],
@ -6868,7 +6868,7 @@
"mango syrup": { "mango syrup": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "mango syrup", "name": "Mango Sirup",
"plural_name": "mango syrups" "plural_name": "mango syrups"
}, },
"malt syrup": { "malt syrup": {
@ -7000,7 +7000,7 @@
"chocolate sugar": { "chocolate sugar": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "chocolate sugar", "name": "Schokoladenzucker",
"plural_name": "chocolate sugars" "plural_name": "chocolate sugars"
}, },
"flavored syrup": { "flavored syrup": {
@ -7118,7 +7118,7 @@
"liquid smoke": { "liquid smoke": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "liquid smoke", "name": "flüssiger Rauch",
"plural_name": "liquid smokes" "plural_name": "liquid smokes"
}, },
"poultry seasoning": { "poultry seasoning": {
@ -7665,7 +7665,7 @@
"baking powder": { "baking powder": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "baking powder", "name": "Backpulver",
"plural_name": "baking powders" "plural_name": "baking powders"
}, },
"baking soda": { "baking soda": {
@ -7739,7 +7739,7 @@
"gelatin": { "gelatin": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "gelatin", "name": "Gelatine",
"plural_name": "gelatins" "plural_name": "gelatins"
}, },
"pastry flour": { "pastry flour": {
@ -15647,19 +15647,19 @@
"pepsi": { "pepsi": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "pepsi", "name": "Pepsi",
"plural_name": "pepsis" "plural_name": "Pepsis"
}, },
"cherry soda": { "cherry soda": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "cherry soda", "name": "Kirschlimonade",
"plural_name": "cherry sodas" "plural_name": "Kirschlimonaden"
}, },
"peppermint tea": { "peppermint tea": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "peppermint tea", "name": "Pfefferminztee",
"plural_name": "peppermint teas" "plural_name": "peppermint teas"
}, },
"sports drink": { "sports drink": {
@ -15729,8 +15729,8 @@
"protein powder": { "protein powder": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "protein powder", "name": "Proteinpulver",
"plural_name": "protein powders" "plural_name": "Proteinpulver"
}, },
"lemon extract": { "lemon extract": {
"aliases": [], "aliases": [],
@ -16155,7 +16155,7 @@
"vitamin d": { "vitamin d": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "vitamin d", "name": "Vitamin D",
"plural_name": "vitamin ds" "plural_name": "vitamin ds"
}, },
"calcium lactate": { "calcium lactate": {
@ -16233,7 +16233,7 @@
"thc": { "thc": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "thc", "name": "THC",
"plural_name": "thcs" "plural_name": "thcs"
}, },
"berry powder": { "berry powder": {
@ -16299,7 +16299,7 @@
"maltodextrin": { "maltodextrin": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "maltodextrin", "name": "Maltodextrin",
"plural_name": "maltodextrins" "plural_name": "maltodextrins"
} }
} }

58
mealie/repos/seed/resources/foods/locales/ru-RU.json
View file

@ -303,14 +303,14 @@
"cayenne pepper": { "cayenne pepper": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "cayenne pepper", "name": "кайенский перец",
"plural_name": "cayenne peppers" "plural_name": "кайенский перец"
}, },
"green tomato": { "green tomato": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "green tomato", "name": "зелёный томат",
"plural_name": "green tomatoes" "plural_name": "зелёные томаты"
}, },
"watercress": { "watercress": {
"aliases": [], "aliases": [],
@ -321,76 +321,76 @@
"iceberg": { "iceberg": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "iceberg", "name": "салат айсберг",
"plural_name": "icebergs" "plural_name": "салат айсберг"
}, },
"mashed potato": { "mashed potato": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "mashed potato", "name": "картофельное пюре",
"plural_name": "mashed potatoes" "plural_name": "картофельное пюре"
}, },
"horseradish": { "horseradish": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "horseradish", "name": "хрен",
"plural_name": "horseradishes" "plural_name": "хрен"
}, },
"chard": { "chard": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "chard", "name": "мангольд",
"plural_name": "chards" "plural_name": "мангольд"
}, },
"pimiento": { "pimiento": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "pimiento", "name": "пимиенто",
"plural_name": "pimientoes" "plural_name": "пимиенто"
}, },
"spaghetti squash": { "spaghetti squash": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "spaghetti squash", "name": "тыква-спагетти",
"plural_name": "spaghetti squashes" "plural_name": "тыква-спагетти"
}, },
"butter lettuce": { "butter lettuce": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "butter lettuce", "name": "баттерхед",
"plural_name": "butter lettuces" "plural_name": "баттерхед"
}, },
"hash brown": { "hash brown": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "hash brown", "name": "хашбраун",
"plural_name": "hash browns" "plural_name": "хашбраун"
}, },
"napa cabbage": { "napa cabbage": {
"aliases": [ "aliases": [
"chinese leaves" "китайские листья"
], ],
"description": "", "description": "",
"name": "napa cabbage", "name": "пекинская капуста",
"plural_name": "napa cabbages" "plural_name": "пекинская капуста"
}, },
"celeriac": { "celeriac": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "celeriac", "name": "корень сельдерея",
"plural_name": "celeriacs" "plural_name": "корень сельдерея"
}, },
"water chestnut": { "water chestnut": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "water chestnut", "name": "болотница сладкая",
"plural_name": "water chestnuts" "plural_name": "болотница сладкая"
}, },
"turnip": { "turnip": {
"aliases": [], "aliases": [],
"description": "", "description": "",
"name": "turnip", "name": "репа",
"plural_name": "turnips" "plural_name": "репа"
}, },
"thai chile pepper": { "thai chile pepper": {
"aliases": [], "aliases": [],

2
pyproject.toml
View file

@ -3,7 +3,7 @@ authors = ["Hayden <hay-kot@pm.me>"]
description = "A Recipe Manager" description = "A Recipe Manager"
license = "AGPL" license = "AGPL"
name = "mealie" name = "mealie"
version = "3.0.1" version = "3.0.2"
include = [ include = [
# Explicit include to override .gitignore when packaging the frontend # Explicit include to override .gitignore when packaging the frontend
{ path = "mealie/frontend/**/*", format = ["sdist", "wheel"] } { path = "mealie/frontend/**/*", format = ["sdist", "wheel"] }