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 |
|
smilerz
|
19708dbc64
|
paste list of ingredients
|
2022-02-14 17:28:16 -06:00 |
|
smilerz
|
444e0c1918
|
include new filters in ResetSearch()
|
2022-02-14 15:35:56 -06:00 |
|
smilerz
|
8fa00b50b1
|
added update_at filter
|
2022-02-14 15:13:34 -06:00 |
|
MaxJa4
|
b9f16c3f66
|
Inverted truth check for GUNICORN_MEDIA
|
2022-02-14 16:45:37 +01:00 |
|
MaxJa4
|
c90de725b0
|
Only show warning if not using gunicorn
|
2022-02-14 16:16:45 +01:00 |
|
MaxJa4
|
c0b43987dd
|
Added extistence check for nginx config file.
|
2022-02-14 16:13:16 +01:00 |
|
smilerz
|
c2fa86e388
|
fixed typo
|
2022-02-13 14:35:38 -06:00 |
|
smilerz
|
3b8be24630
|
merge RecipeSearch with upstream
|
2022-02-13 14:15:01 -06:00 |
|
smilerz
|
e72f6e4ac4
|
Merge remote-tracking branch 'upstream/feature/custom_filters' into feature/custom_filters
|
2022-02-13 14:14:28 -06:00 |
|
smilerz
|
ef81700c05
|
add created filter, viewed filter and viewed sort
|
2022-02-13 14:07:43 -06:00 |
|
smilerz
|
bf54680178
|
more recipe search tests
|
2022-02-13 13:53:07 -06:00 |
|
vabene1111
|
3db55cd82b
|
added sub path nginx example
|
2022-02-11 14:16:22 +01:00 |
|
vabene1111
|
f4bfcdab2e
|
improved on explain and some tweaks
|
2022-02-11 14:15:46 +01:00 |
|
vabene1111
|
f320651cf8
|
Merge branch 'develop' into feature/custom_filters
|
2022-02-11 09:31:59 +01:00 |
|
vabene1111
|
3e9de4c392
|
compiled translations
|
2022-02-11 09:31:37 +01:00 |
|
vabene1111
|
1e9f7af017
|
updated translations and django version
|
2022-02-11 09:29:28 +01:00 |
|
vabene1111
|
cd99b9dc34
|
Merge pull request #849 from cschmatzler/develop
Allow specifying port through TANDOOR_PORT environment variable
|
2022-02-11 09:17:46 +01:00 |
|
vabene1111
|
b182a9962c
|
Merge branch 'develop' into develop
|
2022-02-11 09:17:31 +01:00 |
|
vabene1111
|
9b5cc3deaa
|
Merge pull request #1496 from poggenpower/develop
K8s deployment: Small fix for dupplicate entries.
|
2022-02-11 09:05:36 +01:00 |
|
vabene1111
|
7e7c7a3841
|
Merge pull request #1499 from xMAC94x/update_base_image
Update the baseimage of dockerfile as alpine 3.12 has some security v…
|
2022-02-11 09:04:29 +01:00 |
|
vabene1111
|
6ae1365505
|
Merge pull request #1512 from smilerz/additional_fixes
various fixes
|
2022-02-11 09:01:56 +01:00 |
|