diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 8c4e8d114627..7994b9d3fb1b 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -12,7 +12,7 @@ body:
Please confirm and check all the following prior to submission. If you do not do this, your
issue may be closed.
options:
- - label: This is not a feature request
+ - label: This is not a feature request.
required: true
- label: I added a very descriptive title to this issue.
required: true
@@ -22,7 +22,7 @@ body:
required: true
- label: I already read the docs and didn't find an answer.
required: true
- - label: This issue can be replicated on the demo site (https://demo.mealie.io/)
+ - label: This issue can be replicated on the demo site (https://demo.mealie.io/).
required: false
- type: textarea
id: description
@@ -41,13 +41,15 @@ body:
- type: textarea
id: logs
attributes:
- label: Please provide relevent logs
+ label: Please provide relevant logs
+ placeholder: For example from `docker-compose logs` or other system logs.
validations:
required: true
- type: textarea
id: version
attributes:
label: Mealie Version
+ placeholder: Docker image, as well as 'Build' tag from https://yourmealieurl/admin/site-settings, if UI is working
- type: dropdown
id: os
attributes:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a70d6373b08e..d3310a660f69 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
contact_links:
- name: Feature Requests
- url: https://github.com/hay-kot/mealie/discussions/new?category=feature-request
- about: Please add any Feature Requests as a Github Discussion using the for in this issue.
+ url: https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request
+ about: Please add any Feature Requests as a Github Discussion using the form in this issue.
diff --git a/.github/workflows/partial-builder.yml b/.github/workflows/partial-builder.yml
index 2b9223f0a1d0..583b84354a21 100644
--- a/.github/workflows/partial-builder.yml
+++ b/.github/workflows/partial-builder.yml
@@ -46,3 +46,6 @@ jobs:
tags: ghcr.io/${{ github.repository }}:${{ inputs.tag }}
build-args: |
COMMIT=${{ github.sha }}
+ # https://docs.docker.com/build/ci/github-actions/cache/#github-cache
+ cache-from: type=gha
+ cache-to: type=gha,mode=max
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 21c8424a2345..2e4bf7b49a7b 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,3 +1,3 @@
# Maintainers Guide
-See -> ./docs/docs/contributors/developers-guide/maintainers.md
+See -> [/docs/docs/contributors/developers-guide/maintainers.md](/docs/docs/contributors/developers-guide/maintainers.md)
diff --git a/docs/docs/documentation/community-guide/ios.md b/docs/docs/documentation/community-guide/ios.md
index 8acaa2e025ff..86d5c6bec8b2 100644
--- a/docs/docs/documentation/community-guide/ios.md
+++ b/docs/docs/documentation/community-guide/ios.md
@@ -23,9 +23,9 @@ First, click the [link](https://www.icloud.com/shortcuts/cc568d1615bc4f998789f85

-Next, you need to replace `url` and `port` with the information for your mealie instance.
+Next, you need to replace `url` and `port` with the information for your Mealie instance.
-If you have a TLD that you use, put that here with no port. If you just run local, Then, you need to put in your mealie instance IP and the port of `9926`.
+If you have a domain that you use (e.g. `https://mealie.example.com`), put that here. If you just run local, then you need to put in your Mealie instance IP and the port you use (e.g. the default is `9925`).

@@ -36,4 +36,4 @@ Finally, you need to replace the word `keyhere` with your API token. Keep the wo

-You should now be able to share a website to the shortcut and have mealie grab all the necessary information!
+You should now be able to share a website to the shortcut and have Mealie grab all the necessary information!
diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md
index b0cb440edf56..dce06309bc20 100644
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -4,19 +4,17 @@
### General
-| Variables | Default | Description |
-| ---------------- | :-------------------: | ----------------------------------------------------------------------------------- |
-| PUID | 911 | UserID permissions between host OS and container |
-| PGID | 911 | GroupID permissions between host OS and container |
-| DEFAULT_GROUP | Home | The default group for users |
-| DEFAULT_EMAIL | changeme@example.com | The default username for the superuser |
-| DEFAULT_PASSWORD | MyPassword | The default password for the superuser |
-| BASE_URL | http://localhost:8080 | Used for Notifications |
-| TOKEN_TIME | 48 | The time in hours that a login/auth token is valid |
-| API_PORT | 9000 | The port exposed by backend API. **Do not change this if you're running in Docker** |
-| API_DOCS | True | Turns on/off access to the API documentation locally. |
-| TZ | UTC | Must be set to get correct date/time on the server |
-| ALLOW_SIGNUP | true | Allow user sign-up without token |
+| Variables | Default | Description |
+| ------------- | :-------------------: | ----------------------------------------------------------------------------------- |
+| PUID | 911 | UserID permissions between host OS and container |
+| PGID | 911 | GroupID permissions between host OS and container |
+| DEFAULT_GROUP | Home | The default group for users |
+| BASE_URL | http://localhost:8080 | Used for Notifications |
+| TOKEN_TIME | 48 | The time in hours that a login/auth token is valid |
+| API_PORT | 9000 | The port exposed by backend API. **Do not change this if you're running in Docker** |
+| API_DOCS | True | Turns on/off access to the API documentation locally. |
+| TZ | UTC | Must be set to get correct date/time on the server |
+| ALLOW_SIGNUP | true | Allow user sign-up without token |
### Security
diff --git a/docs/docs/documentation/getting-started/roadmap.md b/docs/docs/documentation/getting-started/roadmap.md
index bb02a37fde74..fd4b6687650d 100644
--- a/docs/docs/documentation/getting-started/roadmap.md
+++ b/docs/docs/documentation/getting-started/roadmap.md
@@ -1,7 +1,7 @@
# Development Road Map
## Feature Requests
-[Please request new features on Github](https://github.com/hay-kot/mealie/issues/317)
+[Please request new features on Github](https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request)
## Progress
See the [Github Projects page](https://github.com/users/hay-kot/projects/2) to see what is currently being worked on
diff --git a/frontend/assets/css/main.css b/frontend/assets/css/main.css
index 160ed0d6dc58..c89c6620d669 100644
--- a/frontend/assets/css/main.css
+++ b/frontend/assets/css/main.css
@@ -2,6 +2,7 @@
.layout-leave-active {
transition: opacity 0.2s;
}
+
.layout-enter,
.layout-leave-active {
opacity: 0;
@@ -16,15 +17,15 @@
}
.theme--dark.v-application {
- background-color: var(--v-background-base, #121212) !important;
+ background-color: var(--v-background-base, #1e1e1e) !important;
}
.theme--dark.v-navigation-drawer {
- background-color: var(--v-background-base, #121212) !important;
+ background-color: var(--v-background-base, #1e1e1e) !important;
}
.theme--dark.v-card {
- background-color: #2b2b2b !important;
+ background-color: #1e1e1e !important;
}
.left-border {
diff --git a/frontend/components/Domain/Group/GroupMealPlanDayContextMenu.vue b/frontend/components/Domain/Group/GroupMealPlanDayContextMenu.vue
new file mode 100644
index 000000000000..9eb740a81a46
--- /dev/null
+++ b/frontend/components/Domain/Group/GroupMealPlanDayContextMenu.vue
@@ -0,0 +1,145 @@
+
+