Merge remote-tracking branch 'upstream/mealie-next' into feat/expand-…

…relationships-to-households

.github/pull_request_template.md

@@ -20,20 +20,6 @@
 
  -->
 
-## What type of PR is this?
-
-_(REQUIRED)_
-
-<!--
-  Delete any of the following that do not apply:
- -->
-
-- feature
-- bug
-- documentation
-- cleanup
-- dev (Internal development)
-
 ## What this PR does / why we need it:
 
 _(REQUIRED)_

.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.8.1
+    rev: v0.8.6
     hooks:
       - id: ruff
       - id: ruff-format

docs/docs/documentation/getting-started/faq.md

@@ -84,6 +84,16 @@ docker exec -it mealie bash
 python /app/mealie/scripts/reset_locked_users.py
 ```
 
+## How can I reset admin privileges for my account?
+
+If you've lost admin privileges and no other admin can restore them, you can use the Command Line Interface (CLI) to grant admin access.
+
+```shell
+docker exec -it mealie bash
+
+python /app/mealie/scripts/make_admin.py
+```
+
 ## How can I change my password?
 
 You can change your password by going to the user profile page and clicking the "Change Password" button. Alternatively you can use the following script to change your password via the CLI if you are locked out of your account.

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.3.0`
+2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v2.4.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.
 4. Restart the container
 

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.3.0 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v2.4.2 # (3)
     container_name: mealie
     restart: always
     ports:
@@ -45,6 +45,7 @@ services:
     environment:
       POSTGRES_PASSWORD: mealie
       POSTGRES_USER: mealie
+      PGUSER: mealie
     healthcheck:
       test: ["CMD", "pg_isready"]
       interval: 30s

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.3.0 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v2.4.2 # (3)
     container_name: mealie
     restart: always
     ports:

docs/docs/news/surveys/2024-october/overview.md

@@ -0,0 +1,126 @@
+# October 2024 Survey
+
+It's been a while since a Mealie survey was done, and the community was much smaller back then. So much has changed in 2024, and we wanted to gauge the community's thoughts.
+Our v2.0 release gave us a platform to ask people to take a few minutes to share their thoughts.
+
+A massive thanks to everyone who took the time to fill out this survey. We had 525 respondents! We're overwhelmed with the support.
+
+Also, thanks to ChristianB-F from our Discord community for putting the following images together, and to everyone who has taken the time to raise either an issue or pull request on our GitHub repository!
+
+For each question, we've created a GitHub discussion and we invite you to share any interesting insights or thoughts you have from the survey results!
+If you see a specific idea that resonates with you, please check if there's already a feature request, and if not, please raise one and add your perspective.
+
+The questions (bar question 1) that are free text are on separate pages you'll need to click into, as there's just too much content to include on this page.
+
+For the written response sections, we have removed some of the more indifferent responses (e.g., "N/A") to save you reading time. If you'd like to see all the raw responses, they're in [this GitHub commit](https://github.com/mealie-recipes/mealie/pull/4666/commits/1287bc1635d9c2560b10db3a92a0d6644bc81571).
+
+## Structured Questions
+
+### Mealie Version (pre-v2)
+
+This question was free text input and it was mandatory.
+
+The responses to this were so varied and not overly informative/indicative of anything, so we've decided not to publish them - both to save space and your time.
+
+### Database Type
+
+This question was a single select and it was optional.
+
+Key insight: SQLite is the predominant database, but Postgres maintains an admirable share and must remain front of mind for any changes we make.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4640)
+
+![Question 2](Question2.png)
+
+### Time Using Mealie
+
+How long have you been using Mealie? This question was a single select and it was mandatory.
+
+Key insight: Most users have been using Mealie less than a year, with another 25% in the 1-2 year range. These users will have seen a lot of change in the product over that time.
+Thanks to the long term users!
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4641)
+
+![Question 3](Question3.png)
+
+### Engagement with Mealie, the Project, and the Community
+
+This question was multiple choice and it was optional.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4642)
+
+![Question 4](Question4.png)
+
+### Number of Active Users
+
+This question was a single select and it was mandatory.
+
+Key insight: ~85% of instances have 2 users or fewer. This is assumed to be a couple of adults living together.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4643)
+
+![Question 5](Question5.png)
+
+### Number of Active Groups
+
+This question was a single select and it was mandatory.
+
+Key insight: Similar to the above question, one group being the most common backs the theory of one "family" using the Mealie instance.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4644)
+
+![Question 6](Question6.png)
+
+### Using Mealie on Mobile
+
+Do you access Mealie on a mobile? Using your browser or with it installed as an app (a Progressive Web App/PWA)? This question was a multiple select and it was mandatory.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4645)
+
+![Question 7](Question7.png)
+
+### Feature Usage
+
+Please select all the features you actively/regularly use, or consider important. This question was a multiple select and it was optional.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4646)
+
+![Question 8](Question8.png)
+
+## Suggestions/Feedback
+
+Some of you will spot feature suggestions that you know to already exist in Mealie. We'd love it if you could help us improve the documentation so more people can know about them! All pull requests are much appreciated. The [features](https://docs.mealie.io/documentation/getting-started/features/) page, or the [FAQ](https://docs.mealie.io/documentation/getting-started/faq/) could be appropriate places to add documentation.
+
+### Shopping List Suggestions
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4647)
+
+[Question 9](q9.md)
+
+### Meal Planner Suggestions
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4648)
+
+[Question 10](q10.md)
+
+### Recipe Timeline Suggestions
+
+Key insight: Looks like a lot of people would be fine with this not existing, or at least being hidden.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4649)
+
+[Question 11](q11.md)
+
+### Recipe Suggestions
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4650)
+
+[Question 12](q12.md)
+
+### Other Suggestions
+
+There are so many kind words in this section in particular. Thanks so much, it means a lot to the whole team and all our contributors to see the impact Mealie has on people's lives!
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4651)
+
+[Question 13](q13.md)