Commit Graph

3712 Commits

Author SHA1 Message Date
smilerz
f082a2f2cc filters are automatically shared when part of shared book 2022-02-18 11:33:04 -06:00
smilerz
cc1aed948a calculate child/sibling subsitutes correctly 2022-02-18 11:25:31 -06:00
vabene1111
e081d823ed fix book share permission 2022-02-18 17:52:32 +01:00
vabene1111
3cbc96b8b7 Merge pull request #1471 from TandoorRecipes/feature/custom_filters
Feature/custom filters
2022-02-18 17:30:29 +01:00
vabene1111
d6fa02cc9e Merge branch 'develop' into feature/custom_filters 2022-02-18 17:25:15 +01:00
vabene1111
d28cf681a3 Merge pull request #1555 from MaxJa4/improvement/startup_error_page
Added 502 error page for system startup
2022-02-18 17:03:37 +01:00
Maxi
21df09d0ba Added 502 error page for system startup 2022-02-18 16:35:27 +01:00
smilerz
2b5aec5d0a resolved loading custom filter when not in expert mode 2022-02-18 09:08:36 -06:00
vabene1111
9021bcd222 Merge pull request #1554 from MaxJa4/patch-1
[Docs] Add syntax highlighting for nginx subpath example
2022-02-18 13:46:08 +01:00
MaxJa4
e691eaf72f Update docker.md 2022-02-18 13:25:20 +01:00
MaxJa4
9e7a908136 Add syntax highlighting for nginx subpath example 2022-02-18 13:23:51 +01:00
smilerz
6b5a099ba0 removed case insensitive get_or_create for units 2022-02-17 12:49:41 -06:00
smilerz
1c18c8faac fix expert mode 2022-02-17 10:59:53 -06:00
smilerz
f1fa5e32bf fix case insensitive get_or_create 2022-02-17 10:50:38 -06:00
smilerz
d49818ae6a change default trigram threshold 2022-02-17 10:27:15 -06:00
smilerz
1b7f97dc64 case insensitive get_or_create 2022-02-17 10:23:31 -06:00
vabene1111
26a5c665de fixed instructions rendering next to ingredients on small devices 2022-02-17 15:30:08 +01:00
vabene1111
6a73ac0a33 fixed editor leave warning 2022-02-17 15:20:42 +01:00
vabene1111
7e5019eed3 fixed share write permission for meal plan 2022-02-17 14:57:28 +01:00
vabene1111
f23b566689 changed feature request template 2022-02-17 14:53:40 +01:00
vabene1111
e9431b5ff2 changed warning stylin 2022-02-17 14:53:27 +01:00
vabene1111
a54d08c9e2 Merge branch 'develop' into feature/custom_filters 2022-02-17 14:23:47 +01:00
vabene1111
d342e12363 show warning for multiple identical filter 2022-02-17 14:23:35 +01:00
vabene1111
a7aa458a85 Merge pull request #1548 from FHantke/develop
fix file path checks
2022-02-17 13:31:04 +01:00
florian hantke
d135c755c8 fix file path checks 2022-02-17 13:26:35 +01:00
vabene1111
3292c596ff Merge branch 'develop' into feature/custom_filters
# Conflicts:
#	vue/src/components/MealPlanEditModal.vue
#	vue/src/locales/en.json
2022-02-17 10:57:35 +01:00
vabene1111
caeaab22ce Merge pull request #1543 from smilerz/feature/copy-to-new-recipe
copy to new recipe
2022-02-17 10:56:03 +01:00
vabene1111
4fa5b28328 Merge branch 'develop' into feature/copy-to-new-recipe 2022-02-17 10:55:59 +01:00
vabene1111
f916e38da8 Merge pull request #1539 from smilerz/auto_add_shopping_fix
fix duplicate shopping recipes when auto-add enabled
2022-02-17 10:55:06 +01:00
vabene1111
f77b45725b Merge pull request #1538 from smilerz/feature/paste_ingredients
paste list of ingredients
2022-02-17 10:54:25 +01:00
vabene1111
8aedb80140 Merge pull request #1535 from MaxJa4/improvement/check_nginx_config
Added existence check for Nginx config file and mandatory parameters
2022-02-17 10:52:58 +01:00
smilerz
a76c4365ea mealplan showing on search when filtered instead of vice versa 2022-02-16 16:49:36 -06:00
smilerz
21c6f819a0 start counting at zero 2022-02-16 14:19:58 -06:00
smilerz
5f3d5afc37 typo 2022-02-16 14:18:23 -06:00
smilerz
57dec86b06 handle empty ingredient list when pasting 2022-02-16 14:17:41 -06:00
smilerz
d68a89a32c catch empty lines in paste_ingredients 2022-02-16 14:07:56 -06:00
smilerz
8b94bf1333 retain order of pasted ingredients 2022-02-16 13:22:53 -06:00
MaxJa4
539578c965 Add check for SECRET_KEY and POSTGRES_PASSWORD 2022-02-16 18:57:25 +01:00
MaxJa4
124a8687f1 Merge branch 'TandoorRecipes:develop' into improvement/check_nginx_config 2022-02-16 18:16:01 +01:00
smilerz
42a6f8457a remove console messages 2022-02-16 10:58:05 -06:00
smilerz
4c9ddee55c restrict get_or_create to name & space 2022-02-16 10:50:01 -06:00
vabene1111
de1efcb81e Merge pull request #1540 from TandoorRecipes/dependabot/npm_and_yarn/vue/follow-redirects-1.14.8
Bump follow-redirects from 1.14.7 to 1.14.8 in /vue
2022-02-16 17:04:46 +01:00
smilerz
501f56ffd5 copy to new recipe 2022-02-16 09:16:51 -06:00
smilerz
ad6d99800e include note from ingredient API 2022-02-16 08:35:04 -06:00
smilerz
bd973ec3a9 always sort count attributes to end 2022-02-15 16:19:41 -06:00
smilerz
b5c6c7cf2b sort cooked date fix 2022-02-15 12:00:59 -06:00
smilerz
f9ae48e23c fix Vue cookedon sort 2022-02-15 09:14:27 -06:00
smilerz
4e8bbefc17 minor cleanup 2022-02-15 06:42:57 -06:00
dependabot[bot]
90b4ecb599 Bump follow-redirects from 1.14.7 to 1.14.8 in /vue
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-15 02:38:12 +00:00
smilerz
57658e76f5 fix duplicate shopping recipes when auto-add enabled 2022-02-14 17:47:17 -06:00