smilerz
62adc5a91f
make +/- search fields not clickable
2022-02-08 09:57:23 -06:00
smilerz
dc71260baa
Merge branch 'additional_fixes' into feature/custom_filters
2022-02-08 09:05:07 -06:00
smilerz
88b3ba1427
various fixes
2022-02-08 08:13:16 -06:00
vabene1111
4c5994ee7f
Merge branch 'develop' into feature/custom_filters
...
# Conflicts:
# cookbook/serializer.py
# cookbook/views/api.py
# vue/src/utils/openapi/api.ts
2022-02-07 18:56:19 +01:00
smilerz
d6af318c21
tests for single food reset inherit and additional inheritted fields
2022-02-07 09:16:48 -06:00
vabene1111
969df37e28
fixed sharing and added additional tests
2022-02-07 15:43:06 +01:00
vabene1111
f37790a24a
changed to vue 2 lifecycle hook
2022-02-07 14:48:52 +01:00
vabene1111
5f9820ed30
Merge pull request #1469 from benscobie/issue/1434
...
Keep screen awake when viewing recipe
2022-02-07 14:48:21 +01:00
Dersim Özdag
7dcc38b5b2
Translated using Weblate (German)
...
Currently translated at 100.0% (298 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-02-06 21:31:33 +00:00
Dirk
6068496240
Translated using Weblate (German)
...
Currently translated at 100.0% (298 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-02-06 21:31:33 +00:00
Dirk
65003175ce
Translated using Weblate (German)
...
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-02-05 21:06:28 +00:00
A. L
72d29cc88a
Translated using Weblate (German)
...
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-02-05 21:06:28 +00:00
Dersim Özdag
bc8131ac56
Translated using Weblate (German)
...
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-02-05 21:06:28 +00:00
Dirk
1c27f2f9b1
Translated using Weblate (German)
...
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-02-05 21:06:28 +00:00
Tomasz Klimczak
262a1f0064
Translated using Weblate (Polish)
...
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2022-02-04 19:31:33 +00:00
vabene1111
fd026154d8
changed step header default and fixed ingredient rendering error
2022-02-04 17:11:35 +01:00
vabene1111
7f427c2d1f
validate 0 servings in frontend
2022-02-04 16:51:16 +01:00
Chris Scoggins
f9244a93a5
fix MakeNow filter
2022-02-03 17:19:38 -06:00
Chris Scoggins
6ef25b604b
add food substitutions
2022-02-03 15:04:46 -06:00
Chris Scoggins
5e3f94fcf7
fix after rebase
2022-02-03 12:21:35 -06:00
Chris Scoggins
dcad389010
food edit modal - reset children inheritance
2022-02-03 12:15:04 -06:00
Chris Scoggins
a0508684d9
cleaned up console messages
2022-02-03 12:14:43 -06:00
Chris Scoggins
9ffae0da7b
rebuild openapi
2022-02-03 12:14:42 -06:00
Chris Scoggins
04c4182b24
WIP
2022-02-03 12:14:42 -06:00
Chris Scoggins
583aee204e
fix view recipes in Model View
2022-02-03 12:14:18 -06:00
Chris Scoggins
e05fd02c65
recipecoontextmenu
2022-02-03 12:14:17 -06:00
Chris Scoggins
c45bf3a994
WIP
2022-02-03 12:14:17 -06:00
Chris Scoggins
203ff1a6ec
WIP
2022-02-03 12:14:04 -06:00
Chris Scoggins
07d5ead128
load RecipeFilter cookbook entries
2022-02-03 12:14:04 -06:00
Chris Scoggins
c042ab08c7
fix after rebase
2022-02-03 12:13:36 -06:00
Chris Scoggins
598f53f3d4
removeMissingItem disabled
2022-02-03 12:13:35 -06:00
Chris Scoggins
ec2cbc9b1b
Fix after rebase
2022-02-03 12:13:16 -06:00
Chris Scoggins
fcb8e520b7
WIP
2022-02-03 12:11:32 -06:00
Chris Scoggins
5959914932
makenow filter
2022-02-03 12:11:32 -06:00
Chris Scoggins
ebb0b3a5ea
sort by menu
2022-02-03 12:10:00 -06:00
Chris Scoggins
a72fc46d40
improved interaction between saved filter and filter fields
2022-02-03 12:10:00 -06:00
Chris Scoggins
8d78d15e21
implement sort order via API
2022-02-03 12:09:32 -06:00
Chris Scoggins
890e9e7242
created CustomFilter model and api
2022-02-03 12:09:14 -06:00
Chris Scoggins
492febe626
add saveSearch()
2022-02-03 12:08:10 -06:00
Chris Scoggins
d0549bcb6d
complex book filters
2022-02-03 12:07:51 -06:00
Chris Scoggins
5e36bd0c27
complex food filters
2022-02-03 12:07:51 -06:00
Chris Scoggins
28d3d8a1e0
complex keyword filters
2022-02-03 12:07:50 -06:00
Chris Scoggins
bb226a221e
WIP
2022-02-03 12:07:14 -06:00
smilerz
0ac369423c
WIP
2022-02-03 12:07:13 -06:00
smilerz
a6a136c892
fix multiselect
2022-02-03 12:07:13 -06:00
smilerz
97224fa6a0
expert search settings
2022-02-03 12:06:57 -06:00
smilerz
5210bb6fbf
added expert search settings
2022-02-03 12:06:30 -06:00
smilerz
918577a9a0
refactored cookies
2022-02-03 12:06:30 -06:00
smilerz
0e89723eab
Squashed commit of the following:
...
commit ba1f10cd3a
Merge: 4e0cc34d4
ef4ce62f5
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Tue Jan 18 07:59:32 2022 +0100
Merge branch 'develop' into facet-fix
commit 4e0cc34d41
Author: smilerz <smilerz@gmail.com>
Date: Mon Jan 17 17:18:43 2022 -0600
better fix for counting facets
commit ef4ce62f5b
Author: Kaibu <notkaibu@gmail.com>
Date: Mon Jan 17 23:48:57 2022 +0100
custom class selection for lookupinput comp
commit b990462bdb
Merge: c60141940
5e34c6ddf
Author: Kaibu <notkaibu@gmail.com>
Date: Mon Jan 17 23:48:12 2022 +0100
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
commit 5e34c6ddf0
Merge: 532d32c19
d8d76ae9e
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 23:29:49 2022 +0100
Merge pull request #1353 from smilerz/supermarket-category
fix missing label on first supermarket category
commit d8d76ae9e0
Author: smilerz <smilerz@gmail.com>
Date: Mon Jan 17 16:12:54 2022 -0600
fix missing label supermarket category
commit c60141940d
Author: Kaibu <notkaibu@gmail.com>
Date: Mon Jan 17 23:02:42 2022 +0100
shopping list ux improvements
commit 532d32c194
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 22:41:38 2022 +0100
fixed shopping user save setting would not work
commit 54721a0a62
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 22:37:14 2022 +0100
also added space to bot
commit c27933548d
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 22:28:02 2022 +0100
fixed order of delete
commit d04e9518cb
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 22:13:36 2022 +0100
fixed telegram shopping bot
commit b9065f7052
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 22:03:57 2022 +0100
added space deletion feature
commit c8c29e1b5a
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 21:14:22 2022 +0100
fixed performance issue
commit 5724ef9511
Author: smilerz <smilerz@gmail.com>
Date: Mon Jan 17 14:02:58 2022 -0600
fix boolean directive
commit 2595a26fb4
Merge: e1c7305c0
437296415
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 20:26:02 2022 +0100
Merge pull request #1351 from MaxJa4/patch-1
Add hint about trailing slashes for subpath setups
commit e1c7305c07
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 20:22:37 2022 +0100
switcher basically working again
commit 418c38423f
Merge: 90b6f9ad0
cc5be844d
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 20:15:01 2022 +0100
Merge pull request #1352 from smilerz/fix-search
force list params to list
commit cc5be844d5
Author: smilerz <smilerz@gmail.com>
Date: Mon Jan 17 13:13:26 2022 -0600
force list params to list
commit 90b6f9ad06
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 19:54:16 2022 +0100
fixed sub recipe issue
commit 437296415e
Author: MaxJa4 <74194322+MaxJa4@users.noreply.github.com>
Date: Mon Jan 17 18:43:14 2022 +0100
Update .env.template
commit a8c885bd21
Author: MaxJa4 <74194322+MaxJa4@users.noreply.github.com>
Date: Mon Jan 17 18:41:41 2022 +0100
Remove newline at the end
commit a539d14aad
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 18:15:23 2022 +0100
wip switcher
commit 2b0541bd74
Author: MaxJa4 <74194322+MaxJa4@users.noreply.github.com>
Date: Mon Jan 17 18:05:39 2022 +0100
Add hint about trailing slashes for subpath setups
Add hint about trailing slashes for subpath setups due to recent issue on Discord.
commit 3f53a924e1
Merge: d23158839
0ed9100fb
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 18:01:47 2022 +0100
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
commit 0ed9100fb1
Merge: d2b796ddd
85ecac3a1
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 17:59:19 2022 +0100
Merge pull request #1350 from TandoorRecipes/patch-empty-recipe_list
Update recipe_search.py
commit d23158839b
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 17:58:09 2022 +0100
Revert "temporarily disable recipe switcher"
This reverts commit d2b796ddd2
.
commit d2b796ddd2
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 17:58:04 2022 +0100
temporarily disable recipe switcher
commit 8b1e80efeb
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 17:51:29 2022 +0100
wip
commit 85ecac3a17
Author: smilerz <smilerz@gmail.com>
Date: Mon Jan 17 10:10:38 2022 -0600
Update recipe_search.py
commit e0b8d6fcc3
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 17:00:08 2022 +0100
added exception catch to nextcloud importer
to handle empty folders in sync
commit edd47873f7
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 16:51:04 2022 +0100
fixed signup button and autofocus on user input fields
commit c14dd04261
Merge: a37672812
769365d62
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 16:50:36 2022 +0100
Merge pull request #1348 from smilerz/fuzzy_search
Fuzzy search
commit 769365d624
Merge: ddb9e70d3
30421d067
Author: smilerz <smilerz@gmail.com>
Date: Mon Jan 17 09:46:33 2022 -0600
Merge branch 'fuzzy_search' of github.com:smilerz/recipes into fuzzy_search
commit ddb9e70d31
Author: smilerz <smilerz@gmail.com>
Date: Mon Jan 17 09:46:26 2022 -0600
fix url_import
commit a376728120
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 16:29:29 2022 +0100
fixed keyword creation in exporter #1213
commit 306f90aa98
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 16:27:10 2022 +0100
recipe editor decimal fixes
commit a19ad706ce
Merge: 4af6de742
8f3044dbe
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 16:22:18 2022 +0100
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
commit 4af6de7425
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 16:22:11 2022 +0100
Revert "Merge pull request #1280 from MarcusWolschon/feature1275_readable_export_file_names"
This reverts commit c4f40b9639
, reversing
changes made to 93b868bc69
.
commit 8f3044dbee
Merge: 7c5ffdaef
51620a34d
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 16:04:40 2022 +0100
Merge pull request #1316 from tomtjes/docs-swag-example
add swag config example
commit 7c5ffdaef4
Merge: d3b71e40c
30421d067
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 15:51:54 2022 +0100
Merge pull request #1347 from smilerz/fuzzy_search
Fuzzy search
commit 30421d067e
Merge: dde350c8a
d3b71e40c
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 15:51:23 2022 +0100
Merge branch 'develop' into fuzzy_search
commit d3b71e40c7
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 15:43:35 2022 +0100
cleand up context menu code
commit 1a84a8fe80
Merge: 16cb99f91
934eeee5c
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 15:39:11 2022 +0100
Merge pull request #1289 from MarcusWolschon/features/1093_recipe_link_in_plan
commit 16cb99f915
Merge: a451f722a
f07690d7e
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 15:37:48 2022 +0100
Merge pull request #1317 from mheiland/patch-1
Example for third-party authentication
commit a451f722a1
Merge: f12196d1c
99b3ed846
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 15:35:43 2022 +0100
Merge pull request #1327 from tomtjes/docs-faq-amendments
FAQ amendments
commit dde350c8af
Author: smilerz <smilerz@gmail.com>
Date: Mon Jan 17 08:35:19 2022 -0600
prettier cleanup
commit f12196d1c6
Merge: d4242a244
b3e971fe0
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Mon Jan 17 15:20:45 2022 +0100
Merge pull request #1343 from MatthiasLohr/feature/db-url-path
Allow to specify an actual path using DATABASE_URL
commit d4242a244d
Merge: 0c603e366
8a7c4e11c
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 15:16:37 2022 +0100
Merge branch 'master' into develop
commit 8a7c4e11c9
Author: vabene1111 <vabene1234@googlemail.com>
Date: Mon Jan 17 15:16:13 2022 +0100
fixed invite link counting
commit 745bb58c7e
Author: vabene1111 <vabene1234@googlemail.com>
Date: Sun Jan 9 18:25:38 2022 +0100
fixed valid filter on invite link counter
commit b3e971fe09
Author: Matthias Lohr <mail@mlohr.com>
Date: Mon Jan 17 11:21:36 2022 +0100
allow to specify an actual path using DATABASE_URL
commit 0c603e3665
Author: Oliver Cervera <olivercervera@yahoo.it>
Date: Sun Jan 16 15:21:49 2022 +0000
Translated using Weblate (Italian)
Currently translated at 84.1% (239 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
commit fed9cfeeb7
Author: Oliver Cervera <olivercervera@yahoo.it>
Date: Sun Jan 16 15:44:28 2022 +0000
Translated using Weblate (Italian)
Currently translated at 96.6% (492 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
commit 5a65fd2231
Merge: c2a763fa4
24e42496a
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Sun Jan 16 17:29:35 2022 +0100
Merge pull request #1331 from TandoorRecipes/dependabot/npm_and_yarn/vue/follow-redirects-1.14.7
Bump follow-redirects from 1.14.6 to 1.14.7 in /vue
commit c2a763fa4c
Author: SMunos <smunos@synos.ovh>
Date: Fri Jan 14 23:19:21 2022 +0000
Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 528767a835
Author: Josselin du PLESSIS <josse@du-plessis.fr>
Date: Fri Jan 14 23:20:10 2022 +0000
Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 9b182f6076
Author: 糖多 <1365143958@qq.com>
Date: Sat Jan 15 06:09:40 2022 +0000
Translated using Weblate (Chinese (Simplified))
Currently translated at 32.0% (91 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
commit 968b710b49
Author: 糖多 <1365143958@qq.com>
Date: Sat Jan 15 06:19:48 2022 +0000
Translated using Weblate (Chinese (Simplified))
Currently translated at 28.6% (146 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
commit f11e07d347
Author: Josselin du PLESSIS <josse@du-plessis.fr>
Date: Fri Jan 14 23:23:05 2022 +0000
Translated using Weblate (French)
Currently translated at 100.0% (509 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
commit 24e42496a7
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun Jan 16 01:02:54 2022 +0000
Bump follow-redirects from 1.14.6 to 1.14.7 in /vue
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
commit 9da496cb6d
Merge: 8cebc98d3
9221533ae
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Sat Jan 15 21:46:04 2022 +0100
Merge pull request #1323 from MaxJa4/patch-1
Added Apache2 in the bug report template
commit 99b3ed8464
Author: tomtjes <nesiofnqwe@mailbox.org>
Date: Sat Jan 15 13:58:40 2022 -0500
add FAQ for PWA
commit 281535e756
Author: tomtjes <nesiofnqwe@mailbox.org>
Date: Sat Jan 15 13:57:20 2022 -0500
phrase FAQ as questions
commit 9221533ae7
Author: MaxJa4 <74194322+MaxJa4@users.noreply.github.com>
Date: Sat Jan 15 12:56:01 2022 +0100
Added Apache2 in the bug report template
Added Apache2 as selectable option in the bug report template
commit f07690d7e3
Author: mheiland <15824364+mheiland@users.noreply.github.com>
Date: Sat Jan 15 00:24:56 2022 +0100
Example for third-party authentication
Providing an example to integrate Keycloak as IAM for Tandoor. Hinting that both SOCIAL* variables are required.
commit 8cebc98d3b
Author: SMunos <smunos@synos.ovh>
Date: Fri Jan 14 23:18:38 2022 +0000
Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 965d2c05e7
Author: FrenchAnon <qdskyhwfeu@email.ucms.edu.pk>
Date: Fri Jan 14 23:17:50 2022 +0000
Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 17ad01ae8c
Author: Josselin du PLESSIS <josse@du-plessis.fr>
Date: Fri Jan 14 22:42:42 2022 +0000
Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 51620a34d9
Author: tomtjes <nesiofnqwe@mailbox.org>
Date: Fri Jan 14 15:10:22 2022 -0500
add swag config example
commit 91fcb1b822
Author: Tomasz Klimczak <klemensble@gmail.com>
Date: Thu Jan 6 12:50:29 2022 +0000
Translated using Weblate (Polish)
Currently translated at 80.9% (225 of 278 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
commit 01d5ab92c5
Author: Tiago Rascazzi <t.d77@hotmail.com>
Date: Thu Jan 6 16:30:49 2022 +0000
Translated using Weblate (French)
Currently translated at 72.6% (202 of 278 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 79c8d26e8c
Merge: 9486b08e2
0e1153ce3
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Fri Jan 14 17:18:30 2022 +0100
Merge pull request #1311 from smilerz/patch-2
fix bug creating food with create form
commit 9486b08e20
Merge: d36033a8b
ffa91863d
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Fri Jan 14 16:57:10 2022 +0100
Merge pull request #1309 from MaxJa4/develop
Disabled old issue templates and added new ones with new GitHub issues format
commit 934eeee5c4
Author: Marcus Wolschon <Marcus@Wolschon.biz>
Date: Fri Jan 14 13:56:46 2022 +0100
commit 2927333bf1
Author: Marcus Wolschon <Marcus@Wolschon.biz>
Date: Fri Jan 14 13:52:42 2022 +0100
commit 0e1153ce3a
Author: smilerz <smilerz@gmail.com>
Date: Thu Jan 13 17:40:26 2022 -0600
deleted extraneous emit
commit b3f05b0bfd
Author: smilerz <smilerz@gmail.com>
Date: Thu Jan 13 16:50:15 2022 -0600
fix bug creating food with create form
commit ffa91863dd
Author: Maximilian Jannack <maxijannack@t-online.de>
Date: Thu Jan 13 21:26:15 2022 +0100
Added config.yml for FAQ link
commit cf2d33daad
Author: Maximilian Jannack <maxijannack@t-online.de>
Date: Thu Jan 13 21:17:08 2022 +0100
Disabled old issue templates and added new ones with new GitHub issues format
commit 8f08ba7114
Author: Marcus Wolschon <Marcus@Wolschon.biz>
Date: Wed Jan 12 16:15:55 2022 +0100
commit 8a4f35e592
Author: Marcus Wolschon <Marcus@Wolschon.biz>
Date: Wed Jan 12 11:37:08 2022 +0100
2022-02-03 12:05:33 -06:00
smilerz
1fe027b313
WIP
2022-02-03 12:04:11 -06:00
smilerz
cdb7c7854d
initial TreeSearch component
2022-02-03 12:04:11 -06:00
smilerz
ab68a60480
WIP
2022-02-03 12:04:10 -06:00
vabene1111
d45e3b8e60
some tweaks for new exporter
2022-02-03 18:00:02 +01:00
vabene1111
a3fa01d8d3
Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress
2022-02-03 15:59:18 +01:00
vabene1111
ba3c0b933c
update vue cli
2022-02-03 15:59:02 +01:00
vabene1111
7f84186b5b
Merge pull request #1456 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/compiler-sfc-3.2.29
...
Bump @vue/compiler-sfc from 3.2.26 to 3.2.29 in /vue
2022-02-03 14:41:52 +01:00
vabene1111
bc72086912
Merge pull request #1455 from TandoorRecipes/dependabot/npm_and_yarn/vue/typescript-4.5.5
...
Bump typescript from 4.5.4 to 4.5.5 in /vue
2022-02-03 14:41:47 +01:00
vabene1111
a41e5b362a
Merge pull request #1454 from TandoorRecipes/dependabot/npm_and_yarn/vue/core-js-3.20.3
...
Bump core-js from 3.20.2 to 3.20.3 in /vue
2022-02-03 14:41:42 +01:00
Ben Scobie
74e88218d5
Keep screen awake when viewing recipe
2022-02-01 21:05:04 +00:00
Stephen Brown II
3961c684f9
Fix Make_Header/Make_Ingredient text and reference
2022-02-01 09:17:30 -06:00
vabene1111
b2a415b333
Merge pull request #1447 from smilerz/mealplan_shopping_useability
...
Mealplan shopping useability
2022-02-01 08:28:59 +01:00
dependabot[bot]
1e417fee97
Bump @vue/compiler-sfc from 3.2.26 to 3.2.29 in /vue
...
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc ) from 3.2.26 to 3.2.29.
- [Release notes](https://github.com/vuejs/core/releases )
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md )
- [Commits](https://github.com/vuejs/core/commits/v3.2.29/packages/compiler-sfc )
---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:10:38 +00:00
dependabot[bot]
47d7c846a3
Bump typescript from 4.5.4 to 4.5.5 in /vue
...
Bumps [typescript](https://github.com/Microsoft/TypeScript ) from 4.5.4 to 4.5.5.
- [Release notes](https://github.com/Microsoft/TypeScript/releases )
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.5.4...v4.5.5 )
---
updated-dependencies:
- dependency-name: typescript
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:10:13 +00:00
dependabot[bot]
3b236ea04e
Bump core-js from 3.20.2 to 3.20.3 in /vue
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.20.2 to 3.20.3.
- [Release notes](https://github.com/zloirock/core-js/releases )
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zloirock/core-js/compare/v3.20.2...v3.20.3 )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:09:45 +00:00
Chris Scoggins
13d144345e
adjust height of viewport in mobile shopping view
2022-01-31 16:30:54 -06:00
Chris Scoggins
b633be9c13
fix display issues
2022-01-31 16:24:40 -06:00
Chris Scoggins
f45e09a5a5
add units to search fields
2022-01-31 14:41:18 -06:00
Chris Scoggins
5b3a0a6e29
refactor IngredientComponent, move shopping logic to card
2022-01-31 14:05:01 -06:00
vabene1111
8216d0c025
Merge pull request #1439 from oliviapinson/develop
...
Simple font size change
2022-01-31 11:41:29 +01:00
Olivia Pinson
2d36db7822
Simple font size change
...
Adjusted font size so longer months won't affect arrow buttons. I think this helps the meal plan calendar look more aesthetic.
2022-01-29 22:44:19 -05:00
Chris Scoggins
e00794bbdf
review shopping list in MealPlan modal
2022-01-29 14:10:14 -06:00
Chris Scoggins
e2f8f29ec8
refactor list_from_recipe as class RecipeShoppingEditor
2022-01-29 10:28:01 -06:00
vabene1111
a0892470e1
Merge branch 'feature/export-progress' into develop
2022-01-28 15:41:49 +01:00
vabene1111
58f1ce0331
fixed rendering issue with single step recipes
2022-01-28 15:26:11 +01:00
vabene1111
20b4c4fb36
fixed using undeclared unused field
2022-01-28 15:21:07 +01:00
vabene1111
965e1664af
Merge pull request #1411 from TheHaf/feature/addPortionSizeModifiersToGui
...
Feature/add portion size modifiers to gui
2022-01-28 15:17:05 +01:00
vabene1111
8232c77ef6
Merge pull request #1432 from smilerz/mealplan_shopping_useability
...
fix servings reactivity
2022-01-28 15:16:01 +01:00
Chris Scoggins
85bbcb0010
fix servings reactivity
2022-01-28 07:38:36 -06:00
Mario Dvorsek
fbf9a81121
Translated using Weblate (Slovenian)
...
Currently translated at 97.2% (283 of 291 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/
2022-01-28 00:07:08 +00:00
vabene1111
b2fcdaa14e
wont load by default otherwise
2022-01-27 14:15:38 +01:00
vabene1111
d4d949b870
Merge pull request #1421 from TandoorRecipes/minor_fixes
...
Minor fixes
2022-01-27 08:02:06 +01:00
smilerz
759ae99b56
Update en.json
2022-01-26 18:58:45 -06:00
smilerz
331a949623
fixed saving shopping shared users
2022-01-26 17:27:52 -06:00
smilerz
cd733d3190
Update ShoppingListView.vue
2022-01-26 17:10:24 -06:00
Chris Scoggins
6e4bb64b4e
fix translation on ModelListMenu
2022-01-26 15:00:21 -06:00
Chris Scoggins
4a48019885
fix duplicate shopping entries when using old list
2022-01-26 14:47:33 -06:00
Chris Scoggins
47823132f0
add ignore_shopping && additional help
2022-01-26 12:57:29 -06:00
Leni
bb5c8bbbf1
Translated using Weblate (German)
...
Currently translated at 100.0% (291 of 291 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-26 14:07:05 +00:00
Rene
5a0a1ca6a9
Translated using Weblate (German)
...
Currently translated at 100.0% (291 of 291 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-26 14:07:05 +00:00
TheHaf
381a7e76be
Use custom input component in recipe view
2022-01-25 22:04:21 +01:00
TheHaf
6c619ab628
Add custom input component with spin button look&feel
2022-01-25 22:03:49 +01:00
vabene1111
e33cf08fca
Revert "use old system to define frontend settings"
...
This reverts commit f2e9f50d94
.
2022-01-25 18:26:51 +01:00
vabene1111
f2e9f50d94
use old system to define frontend settings
2022-01-25 18:14:25 +01:00
dependabot[bot]
2398c00dfe
Bump node-fetch from 2.6.6 to 2.6.7 in /vue
...
Bumps [node-fetch](https://github.com/node-fetch/node-fetch ) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases )
- [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md )
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7 )
---
updated-dependencies:
- dependency-name: node-fetch
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-23 20:53:52 +00:00
dependabot[bot]
202ef9509d
Bump nanoid from 3.1.30 to 3.2.0 in /vue
...
Bumps [nanoid](https://github.com/ai/nanoid ) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases )
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0 )
---
updated-dependencies:
- dependency-name: nanoid
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-22 10:32:18 +00:00
糖多
95b10bc01c
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 95.1% (275 of 289 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
2022-01-22 03:31:00 +00:00
Chris Scoggins
6e2374737e
Squashed commit of the following:
...
commit a30a27c755
Author: vabene1111 <vabene1234@googlemail.com>
Date: Fri Jan 21 17:49:27 2022 +0100
added keyword clicking to recipe view and fixed deleted keyword showing in search when passed via parameter
commit f274f31e80
Author: vabene1111 <vabene1234@googlemail.com>
Date: Fri Jan 21 16:56:47 2022 +0100
fixed unit search on importer page
commit 20adcc0e83
Author: vabene1111 <vabene1234@googlemail.com>
Date: Fri Jan 21 16:44:03 2022 +0100
fixed v2 autosync flickering
Merge branch 'develop' into add-recipe
2022-01-21 13:11:33 -06:00
Chris Scoggins
f0b05808b8
moved Undefined to be first category
2022-01-21 12:36:54 -06:00
Chris Scoggins
250c3ce5b2
rebase with develop
2022-01-21 12:11:01 -06:00
Chris Scoggins
7916635716
add recipes to shopping list
2022-01-21 12:01:46 -06:00
vabene1111
a30a27c755
added keyword clicking to recipe view and fixed deleted keyword showing in search when passed via parameter
2022-01-21 17:49:27 +01:00
vabene1111
20adcc0e83
fixed v2 autosync flickering
2022-01-21 16:44:03 +01:00
Kaibu
c5b70b94c7
left handed only on mobile
2022-01-21 00:48:57 +01:00
Kaibu
c90e5d72af
shopping list ux optimization, left handed mode
2022-01-21 00:13:36 +01:00
vabene1111
ab5bff62e3
Merge pull request #1381 from sebweb3r/spelling_mistakes
...
Fix typos
2022-01-20 17:44:49 +01:00
vabene1111
001edecdd3
fixed quick entry for shopping v2
2022-01-20 15:54:45 +01:00
Tomasz Klimczak
ddbbd53ace
Translated using Weblate (Polish)
...
Currently translated at 100.0% (285 of 285 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2022-01-20 14:24:20 +00:00
Philipp Wensauer
0360d443ea
Translated using Weblate (German)
...
Currently translated at 87.0% (248 of 285 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-20 14:24:19 +00:00
Sebastian Weber
c20e982fb1
Fix typos
2022-01-20 00:50:41 +01:00
Kaibu
0f7dc096cb
shopping list ux
2022-01-20 00:29:10 +01:00
vabene1111
fc9eb249a8
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2022-01-19 17:37:01 +01:00
vabene1111
4a9e027849
changed asset caching strategy
...
there were to many issues with stale content breaking the application thus policy was changed to network first. might make another fix to split between more static assets (bootstrap/libraries/...) and more actively changed ones like the frontend
2022-01-19 17:36:57 +01:00
smilerz
530b1a8986
fix sort by new
2022-01-19 08:39:40 -06:00
vabene1111
07195b74a3
Merge pull request #1368 from smilerz/fix-mutliselect
...
fix multiselect
2022-01-18 22:52:08 +01:00
smilerz
18c45771e7
fix multiselect
2022-01-18 15:44:11 -06:00
vabene1111
42aaed011c
added saving of supermarket in shopping v2
2022-01-18 22:42:10 +01:00
vabene1111
66d29d10bf
fixed shopping v2 export drop down alignment
2022-01-18 22:38:42 +01:00
vabene1111
dfa4f444ef
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2022-01-18 22:36:05 +01:00
vabene1111
f9c68e9fcc
layout tweaks
2022-01-18 22:35:53 +01:00
vabene1111
d65c881fde
Merge pull request #1366 from smilerz/super-cat-fix
...
fix supermarket categories
2022-01-18 22:14:42 +01:00
vabene1111
7bf9f18402
allow file uploading in recipe editor
2022-01-18 21:36:20 +01:00
vabene1111
3ea96d4102
basics
2022-01-18 21:09:08 +01:00
smilerz
b3417be2ec
fix supermarket categories
2022-01-18 13:26:07 -06:00
vabene1111
8d24ae9008
small tweaks to the recipe editor
2022-01-18 19:55:51 +01:00
vabene1111
a9d8080ec2
Merge pull request #1358 from smilerz/expert-settings
...
enable/disable treeselect
2022-01-18 16:17:36 +01:00
vabene1111
fe09278b0e
silenced translation warnings
2022-01-18 16:16:11 +01:00
smilerz
2a13a341dd
enable/disable treeselect
2022-01-18 08:17:54 -06:00
vabene1111
b382ab9024
step rendering improvements
2022-01-18 15:09:51 +01:00
vabene1111
24c476830d
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2022-01-18 14:51:44 +01:00
vabene1111
2d0a638c0a
fixed empty step headers
2022-01-18 14:51:34 +01:00
Tomasz Klimczak
70b8a50d1d
Translated using Weblate (Polish)
...
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2022-01-18 13:43:20 +00:00
糖多
05df133960
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 58.4% (166 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
2022-01-18 13:43:20 +00:00
Jesse
426f4d3e77
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
2022-01-18 13:43:20 +00:00
Philipp Wensauer
6b2ac3f873
Translated using Weblate (German)
...
Currently translated at 87.3% (248 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-18 13:43:20 +00:00
Philipp Wensauer
cc7b9bba32
Translated using Weblate (German)
...
Currently translated at 87.3% (248 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-18 13:43:20 +00:00
Christoph Koch
8e0c709427
Translated using Weblate (German)
...
Currently translated at 87.3% (248 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-18 13:43:20 +00:00
Florian
1ed965adcd
Translated using Weblate (German)
...
Currently translated at 87.3% (248 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-18 13:43:20 +00:00
vabene1111
a0fd1f4104
fixed step header rendering
2022-01-18 14:00:25 +01:00
vabene1111
ba1f10cd3a
Merge branch 'develop' into facet-fix
2022-01-18 07:59:32 +01:00
smilerz
4e0cc34d41
better fix for counting facets
2022-01-17 17:18:43 -06:00
Kaibu
ef4ce62f5b
custom class selection for lookupinput comp
2022-01-17 23:48:57 +01:00
Kaibu
b990462bdb
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
...
# Conflicts:
# vue/src/components/Modals/LookupInput.vue
2022-01-17 23:48:12 +01:00
smilerz
d8d76ae9e0
fix missing label supermarket category
2022-01-17 16:12:54 -06:00
Kaibu
c60141940d
shopping list ux improvements
2022-01-17 23:02:42 +01:00
smilerz
5724ef9511
fix boolean directive
2022-01-17 14:02:58 -06:00
vabene1111
e1c7305c07
switcher basically working again
2022-01-17 20:22:37 +01:00
vabene1111
a539d14aad
wip switcher
2022-01-17 18:15:23 +01:00
vabene1111
d23158839b
Revert "temporarily disable recipe switcher"
...
This reverts commit d2b796ddd2
.
2022-01-17 17:58:09 +01:00
vabene1111
d2b796ddd2
temporarily disable recipe switcher
2022-01-17 17:58:04 +01:00
vabene1111
8b1e80efeb
wip
2022-01-17 17:51:29 +01:00
vabene1111
306f90aa98
recipe editor decimal fixes
2022-01-17 16:27:10 +01:00
vabene1111
30421d067e
Merge branch 'develop' into fuzzy_search
2022-01-17 15:51:23 +01:00
vabene1111
d3b71e40c7
cleand up context menu code
2022-01-17 15:43:35 +01:00
vabene1111
1a84a8fe80
Merge pull request #1289 from MarcusWolschon/features/1093_recipe_link_in_plan
...
#1093 Recipe link in plan
2022-01-17 15:39:11 +01:00
smilerz
37971acb48
refactor recipe search
2022-01-17 08:26:34 -06:00
Oliver Cervera
0c603e3665
Translated using Weblate (Italian)
...
Currently translated at 84.1% (239 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2022-01-17 07:56:19 +00:00
vabene1111
5a65fd2231
Merge pull request #1331 from TandoorRecipes/dependabot/npm_and_yarn/vue/follow-redirects-1.14.7
...
Bump follow-redirects from 1.14.6 to 1.14.7 in /vue
2022-01-16 17:29:35 +01:00
SMunos
c2a763fa4c
Translated using Weblate (French)
...
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-16 07:07:02 +00:00
Josselin du PLESSIS
528767a835
Translated using Weblate (French)
...
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-16 07:07:02 +00:00
糖多
9b182f6076
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 32.0% (91 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
2022-01-16 07:07:02 +00:00
dependabot[bot]
24e42496a7
Bump follow-redirects from 1.14.6 to 1.14.7 in /vue
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-16 01:02:54 +00:00
SMunos
8cebc98d3b
Translated using Weblate (French)
...
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-14 23:18:42 +00:00
FrenchAnon
965d2c05e7
Translated using Weblate (French)
...
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-14 23:18:37 +00:00
Josselin du PLESSIS
17ad01ae8c
Translated using Weblate (French)
...
Currently translated at 100.0% (284 of 284 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-14 23:18:36 +00:00
Tomasz Klimczak
91fcb1b822
Translated using Weblate (Polish)
...
Currently translated at 80.9% (225 of 278 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2022-01-14 19:11:20 +00:00
Tiago Rascazzi
01d5ab92c5
Translated using Weblate (French)
...
Currently translated at 72.6% (202 of 278 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-14 19:11:20 +00:00
Marcus Wolschon
934eeee5c4
#1093 code cleanup
2022-01-14 13:56:46 +01:00
Marcus Wolschon
2927333bf1
#1093 code cleanup
2022-01-14 13:52:42 +01:00
smilerz
0e1153ce3a
deleted extraneous emit
2022-01-13 17:40:26 -06:00
smilerz
6d9a90c6ba
fix onhand_users
2022-01-13 16:49:10 -06:00
vabene1111
506d7a8bb2
Merge pull request #1306 from TandoorRecipes/performance_refactor
...
facets cache-only on initial load
2022-01-13 19:21:11 +01:00
smilerz
8b1233be62
facets cache-only on initial load
2022-01-13 12:02:28 -06:00
vabene1111
a2dc8d8988
Merge pull request #1300 from TandoorRecipes/performance_refactor
...
Performance refactor
2022-01-13 17:06:04 +01:00
smilerz
22953b0591
trees in recipe search loaded asynchronously
2022-01-12 16:21:36 -06:00
smilerz
20d61160ba
refactor get_facets as RecipeFacets class
2022-01-12 12:21:28 -06:00
Marcus Wolschon
8f08ba7114
#1093 conditional receipt link in plan
2022-01-12 16:15:55 +01:00
Marcus Wolschon
8a4f35e592
#1093 Recipe link in plan
...
#1093 add a recipe link into meal plan
2022-01-12 11:37:08 +01:00
Tiago Rascazzi
16b357e11e
Added printReady selector
2022-01-08 14:44:28 -05:00
Tiago Rascazzi
7c48c13dce
Added export from url args
2022-01-08 13:37:26 -05:00
Tiago Rascazzi
33d1022a73
Increase number of result for multiselect in export
2022-01-08 12:30:42 -05:00
Tiago Rascazzi
9c873127a5
Added loading page
2022-01-08 11:07:33 -05:00
vabene1111
e1e53d12f8
playing around with the reciupe switcher
2022-01-07 16:19:25 +01:00
vabene1111
0a6abf9688
Merge pull request #1211 from TiagoRascazzi/develop
...
Added Saffron and PDF export format
2022-01-07 10:31:13 +01:00
dependabot[bot]
ab2098151b
Bump mermaid from 8.13.5 to 8.13.8 in /vue
...
Bumps [mermaid](https://github.com/knsv/mermaid ) from 8.13.5 to 8.13.8.
- [Release notes](https://github.com/knsv/mermaid/releases )
- [Changelog](https://github.com/mermaid-js/mermaid/blob/develop/docs/CHANGELOG.md )
- [Commits](https://github.com/knsv/mermaid/compare/8.13.5...8.13.8 )
---
updated-dependencies:
- dependency-name: mermaid
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-06 19:48:16 +00:00
vabene1111
724217f142
Merge branch 'develop' into feature/shopping_list_v2
2022-01-06 16:27:39 +01:00
vabene1111
54b57a8bcb
Merge branch 'develop' into feature/related_recipe_switcher
2022-01-06 16:22:44 +01:00
smilerz
f65b5d0733
clear unit after adding shopping list item
2022-01-05 16:41:26 -06:00
smilerz
2c76fb7b69
make food onhand when complete shopping entry
2022-01-05 15:20:10 -06:00
smilerz
b919fb4ae8
quick add shoppinglist
2022-01-05 15:20:10 -06:00
smilerz
29aa52aa3d
fix saving old list
2022-01-05 15:20:10 -06:00
smilerz
214db80dac
add category context menu
2022-01-05 15:20:10 -06:00
Hrachya Kocharyan
25c1689ca0
Translated using Weblate (Armenian)
...
Currently translated at 39.4% (82 of 208 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/hy/
2022-01-05 07:00:36 +00:00
Tiago Rascazzi
578154510b
Merge shopping_list develop
2022-01-04 13:19:34 -05:00
vabene1111
8a99907a51
reverted some updates
2022-01-04 17:32:17 +01:00
vabene1111
636fa8f318
Merge pull request #1200 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue-simple-calendar-6.0.3
...
Bump vue-simple-calendar from 5.0.1 to 6.0.3 in /vue
2022-01-04 16:23:09 +01:00
vabene1111
7efbc9c42e
Merge pull request #1197 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/eslint-config-typescript-10.0.0
...
Bump @vue/eslint-config-typescript from 9.1.0 to 10.0.0 in /vue
2022-01-04 16:23:03 +01:00
dependabot[bot]
b05639110a
Bump vue-simple-calendar from 5.0.1 to 6.0.3 in /vue
...
Bumps [vue-simple-calendar](https://github.com/richardtallent/vue-simple-calendar ) from 5.0.1 to 6.0.3.
- [Release notes](https://github.com/richardtallent/vue-simple-calendar/releases )
- [Changelog](https://github.com/richardtallent/vue-simple-calendar/blob/main/CHANGELOG.md )
- [Commits](https://github.com/richardtallent/vue-simple-calendar/commits/v6.0.3 )
---
updated-dependencies:
- dependency-name: vue-simple-calendar
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-04 15:22:08 +00:00
dependabot[bot]
fc0f92eecc
Bump core-js from 3.19.3 to 3.20.2 in /vue
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.19.3 to 3.20.2.
- [Release notes](https://github.com/zloirock/core-js/releases )
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zloirock/core-js/compare/v3.19.3...v3.20.2 )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-04 07:02:59 +00:00
vabene1111
b19190e9e2
Merge pull request #1199 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue-i18n-8.26.8
...
Bump vue-i18n from 8.26.7 to 8.26.8 in /vue
2022-01-04 07:59:39 +01:00
Tiago Rascazzi
1c30e643c3
Print format avoid breaking Ingredient and step
2022-01-02 22:28:16 -05:00
dependabot[bot]
a5638ea8a1
Bump vue-i18n from 8.26.7 to 8.26.8 in /vue
...
Bumps [vue-i18n](https://github.com/kazupon/vue-i18n ) from 8.26.7 to 8.26.8.
- [Release notes](https://github.com/kazupon/vue-i18n/releases )
- [Changelog](https://github.com/kazupon/vue-i18n/blob/v8.x/CHANGELOG.md )
- [Commits](https://github.com/kazupon/vue-i18n/compare/v8.26.7...v8.26.8 )
---
updated-dependencies:
- dependency-name: vue-i18n
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-01 00:06:18 +00:00
dependabot[bot]
5b462d81b4
Bump @vue/eslint-config-typescript from 9.1.0 to 10.0.0 in /vue
...
Bumps [@vue/eslint-config-typescript](https://github.com/vuejs/eslint-config-typescript ) from 9.1.0 to 10.0.0.
- [Release notes](https://github.com/vuejs/eslint-config-typescript/releases )
- [Commits](https://github.com/vuejs/eslint-config-typescript/compare/v9.1.0...v10.0.0 )
---
updated-dependencies:
- dependency-name: "@vue/eslint-config-typescript"
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-01 00:05:56 +00:00
smilerz
795f3084d9
Merge branch 'feature/related_recipe_switcher' of https://github.com/TandoorRecipes/recipes into feature/related_recipe_switcher
2021-12-31 09:01:36 -06:00
smilerz
931eae4361
fix switcher to be TZ sensitive
2021-12-31 09:01:31 -06:00
smilerz
80fc50e09b
remove console message
2021-12-30 16:52:08 -06:00
smilerz
045a0b7d4f
persist servings changes
2021-12-30 15:33:47 -06:00
smilerz
957c659a62
Squashed commit of shoppinglist_v2
2021-12-30 15:33:34 -06:00
smilerz
b282c46c1a
Fix after rebase
2021-12-30 13:58:34 -06:00
smilerz
582e145a9f
Fix after rebase
2021-12-30 13:55:38 -06:00
smilerz
79b4bc387e
change ingore_inherit to inherit_fields
2021-12-30 12:54:39 -06:00
vabene1111
f21587605a
fixed sub recipe rendering
2021-12-30 18:03:08 +01:00
vabene1111
2e69a00fce
improved recipe edit input validation
2021-12-30 17:57:04 +01:00
smilerz
3fafd43e58
merge ignore shopping with onhand
2021-12-29 16:32:19 -06:00
smilerz
52d1069353
fix reactivity of detailed items
2021-12-29 09:36:18 -06:00
smilerz
a4f2c994a0
fix responsive view of add-to-shopping form
2021-12-28 16:32:26 -06:00
smilerz
58d025f1a5
change default status of shopping in recipe view
2021-12-28 12:03:36 -06:00
smilerz
c20e036d90
add path to generic cards for food/keywords
2021-12-28 12:03:36 -06:00
smilerz
2d0a7330f3
reset new list item after create
2021-12-28 12:03:36 -06:00
smilerz
5b287ad484
fix responsive display of detail shopping list
2021-12-28 12:03:35 -06:00
smilerz
e257a8d29b
fix responsive display of shopping list
2021-12-28 12:03:35 -06:00
smilerz
889fa7b8ea
update console messages
2021-12-28 12:03:35 -06:00
smilerz
a3008a6091
WIP
2021-12-28 12:03:35 -06:00
smilerz
24bef756e8
fix filter_to_supermarket setting
2021-12-28 12:03:35 -06:00
smilerz
b4510a2cc1
fix categories in supermarket edit modal
2021-12-28 12:03:35 -06:00
smilerz
63fe174070
fix add to shopping from MealPlan Modal
2021-12-28 12:03:35 -06:00
smilerz
0f4bd9972e
delete supermarkets and categories from shopping list view
2021-12-28 12:03:35 -06:00
smilerz
9794d544cc
Squashed commit of the following:
...
commit 7837467c30
Merge: aaaae5b1b
84759383f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Sat Dec 18 23:14:24 2021 +0100
Merge pull request #1146 from auanasgheps/patch-1
Add documentation about swag by linuxserver
commit 84759383fa
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date: Sat Dec 18 13:49:09 2021 +0100
Add documentation about swag by linuxserver
Documents behaviour in #959
commit aaaae5b1ba
Merge: 4a747f5cd
ea62c10d9
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Thu Dec 16 18:10:48 2021 +0100
Merge pull request #1143 from smilerz/fix_get_facet_api
fix bug in get_facet_api
commit ea62c10d9a
Author: smilerz <smilerz@gmail.com>
Date: Thu Dec 16 09:20:56 2021 -0600
remove console message
commit 3516505dd1
Author: smilerz <smilerz@gmail.com>
Date: Thu Dec 16 09:08:32 2021 -0600
fix bug in get_facet_api
2021-12-28 12:03:35 -06:00
smilerz
e66897c1ea
fix Shopping Modal to filter onhand from initial list
2021-12-28 12:03:35 -06:00
smilerz
2d94cb70ab
fix shopping list api
2021-12-28 12:03:35 -06:00
smilerz
f5e4adba8b
fix get_facets_API
2021-12-28 12:03:35 -06:00
smilerz
a20a877dc7
fix after rebase
2021-12-28 12:03:35 -06:00
smilerz
ed50a27669
fix rounding on new shopping list
2021-12-28 12:03:35 -06:00
smilerz
453b1eb5b9
rebase and fixes
2021-12-28 12:03:34 -06:00
smilerz
ab968f225b
test recent shopping list
2021-12-28 12:03:34 -06:00
smilerz
8f0c5e21ad
basic tests with new factories
2021-12-28 12:03:34 -06:00
smilerz
c7ad9c8d15
WIP
2021-12-28 12:03:34 -06:00
smilerz
729aa51901
fix package.json
2021-12-28 12:03:34 -06:00
smilerz
2763eed5b2
minor cleanup
2021-12-28 12:03:34 -06:00
smilerz
2af7b64d4f
visual indicator meal plan in shopping
2021-12-28 12:03:34 -06:00
smilerz
24b0643765
copy shopping as markdown
2021-12-28 12:03:34 -06:00
smilerz
df54b10610
download as CSV
2021-12-28 12:03:33 -06:00
smilerz
7ad088d953
fix after rebase
2021-12-28 12:03:33 -06:00
smilerz
fdd86b0c2d
download shopping list PDF
2021-12-28 12:03:33 -06:00
smilerz
8dcdf00dc7
refresh shopping list when item is delayed
2021-12-28 12:03:33 -06:00
smilerz
0693d31550
WIP
2021-12-28 12:03:33 -06:00
smilerz
cae3773d5a
Fix after rebase
2021-12-28 12:03:33 -06:00
smilerz
f2222fd7d5
pre-merge
2021-12-28 12:03:33 -06:00
smilerz
b8dfc00106
undo move
2021-12-28 12:03:33 -06:00
smilerz
1d224d8658
yarn build
2021-12-28 12:03:33 -06:00
smilerz
2b41fbc9f8
Fix after rebase
2021-12-28 12:03:33 -06:00
smilerz
6eec3d18fe
more fixes after rebase
2021-12-28 12:03:33 -06:00
smilerz
de7d2e27d9
update migrations
2021-12-28 12:03:32 -06:00
smilerz
dcfe4de61f
Fix after rebase
2021-12-28 12:03:32 -06:00
smilerz
f245aa8b4f
add to shopping from card context menu
2021-12-28 12:03:32 -06:00
smilerz
a217db5822
add new unit/food from shopping list
2021-12-28 12:03:32 -06:00
smilerz
6e9d609fe0
edit supermarket categories
2021-12-28 12:03:32 -06:00
smilerz
ecac3f3c2d
related recipes included when adding mealplan to shopping list
2021-12-28 12:03:32 -06:00
smilerz
7a0b395107
alpha shopping list
2021-12-28 12:03:32 -06:00
smilerz
1f41fa04a3
autosync
2021-12-28 12:03:32 -06:00
smilerz
7c598720d0
WIP
2021-12-28 12:03:32 -06:00
smilerz
5c9f5e0e1a
fade-enter-active
2021-12-28 12:03:32 -06:00
smilerz
f400c7cd7c
shopping line item
2021-12-28 12:03:32 -06:00
smilerz
2a138a852f
inheritance works with object moves
2021-12-28 12:03:32 -06:00
smilerz
fbe748db62
food inherit attributes
2021-12-28 12:03:32 -06:00
smilerz
4377505b14
Fix after rebase
2021-12-28 12:03:31 -06:00
smilerz
c5c76cadea
getUserPreference available for all UserPreferences
2021-12-28 12:03:31 -06:00
smilerz
6eea7ac99b
model changes and GenericAutoSchema
2021-12-28 12:03:31 -06:00
smilerz
10a33add75
Fix after rebase
2021-12-28 12:03:31 -06:00
smilerz
67e4c88be7
implement related recipes on home page
2021-12-22 15:23:16 -06:00
smilerz
2d01a2af47
implemented quick switch
2021-12-22 14:43:00 -06:00
smilerz
efec416604
fix responsive display of detail shopping list
2021-12-21 20:41:49 -06:00
smilerz
e5a4f6b5bf
fix responsive display of shopping list
2021-12-21 18:38:16 -06:00
smilerz
a55f975068
update console messages
2021-12-21 14:05:46 -06:00
smilerz
421ade7ad0
WIP
2021-12-21 13:53:40 -06:00
smilerz
c785b590a1
fix filter_to_supermarket setting
2021-12-21 13:53:16 -06:00
smilerz
42132568c4
fix categories in supermarket edit modal
2021-12-21 13:40:50 -06:00
smilerz
dfe414985b
fix add to shopping from MealPlan Modal
2021-12-21 11:35:35 -06:00
smilerz
ee52092e24
delete supermarkets and categories from shopping list view
2021-12-21 11:05:24 -06:00
smilerz
75b45ba8eb
Squashed commit of the following:
...
commit 7837467c30
Merge: aaaae5b1b
84759383f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Sat Dec 18 23:14:24 2021 +0100
Merge pull request #1146 from auanasgheps/patch-1
Add documentation about swag by linuxserver
commit 84759383fa
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date: Sat Dec 18 13:49:09 2021 +0100
Add documentation about swag by linuxserver
Documents behaviour in #959
commit aaaae5b1ba
Merge: 4a747f5cd
ea62c10d9
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Thu Dec 16 18:10:48 2021 +0100
Merge pull request #1143 from smilerz/fix_get_facet_api
fix bug in get_facet_api
commit ea62c10d9a
Author: smilerz <smilerz@gmail.com>
Date: Thu Dec 16 09:20:56 2021 -0600
remove console message
commit 3516505dd1
Author: smilerz <smilerz@gmail.com>
Date: Thu Dec 16 09:08:32 2021 -0600
fix bug in get_facet_api
2021-12-20 15:26:31 -06:00
smilerz
bf9e59d64c
fix Shopping Modal to filter onhand from initial list
2021-12-20 14:59:56 -06:00
smilerz
132c48a490
fix shopping list api
2021-12-20 12:27:25 -06:00
smilerz
1a99a2d6f1
remove console.log
2021-12-19 11:31:16 -06:00
smilerz
cf3ddfc610
fix inconsistent pagination
2021-12-19 11:08:30 -06:00
smilerz
ecbd3edb97
WIP
2021-12-19 10:21:46 -06:00
smilerz
ea62c10d9a
remove console message
2021-12-16 09:20:56 -06:00
smilerz
3516505dd1
fix bug in get_facet_api
2021-12-16 09:08:32 -06:00
smilerz
d4553c05c2
fix get_facets_API
2021-12-16 08:13:10 -06:00
smilerz
a313039b65
fix after rebase
2021-12-15 15:48:55 -06:00
smilerz
963dad39e8
fix rounding on new shopping list
2021-12-15 14:42:12 -06:00
smilerz
8b28a47297
rebase and fixes
2021-12-15 12:37:40 -06:00
smilerz
0866d21fa5
test recent shopping list
2021-12-15 12:37:40 -06:00
smilerz
b146e75daa
basic tests with new factories
2021-12-15 12:37:40 -06:00
smilerz
1e36e6cd5b
WIP
2021-12-15 12:37:40 -06:00
smilerz
4877d69947
fix package.json
2021-12-15 12:37:23 -06:00
smilerz
f2f187a844
minor cleanup
2021-12-15 12:37:04 -06:00
smilerz
c2e84c1fa4
visual indicator meal plan in shopping
2021-12-15 12:37:04 -06:00
smilerz
ca93920f04
copy shopping as markdown
2021-12-15 12:37:04 -06:00
smilerz
903a721a1d
download as CSV
2021-12-15 12:37:04 -06:00
smilerz
44e513ff2d
fix after rebase
2021-12-15 12:37:03 -06:00
smilerz
2d7d160d1b
download shopping list PDF
2021-12-15 12:37:03 -06:00