vabene1111
5627161c5e
Merge branch 'develop' into feature/importer_to_vue
2022-03-10 15:27:11 +01:00
Felipe Castro
5ab11eb1bc
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 0.5% (2 of 378 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt_BR/
2022-03-08 01:31:43 +00:00
smilerz
486d197854
allow marking recipe as food
2022-03-06 23:12:59 -06:00
Felipe Castro
ed33114947
Added translation using Weblate (Portuguese (Brazil))
2022-03-07 00:56:04 +00:00
vabene1111
22ca482458
super very basics of manual mapping page working
2022-03-05 16:02:42 +01:00
vabene1111
2565ab30a4
lots of improvements and bookmarklet import working again
2022-03-05 15:16:58 +01:00
vabene1111
1caabef56a
step functions
2022-03-04 16:54:59 +01:00
vabene1111
6d8fe3c162
wip
2022-03-04 15:54:11 +01:00
vabene1111
bdccdf0893
Merge branch 'develop' into feature/importer_to_vue
...
# Conflicts:
# cookbook/helper/recipe_url_import.py
2022-03-04 14:33:59 +01:00
smilerz
2993c7e688
trigger shopping modal
2022-03-01 17:17:35 -06:00
vabene1111
8ea882e5b3
Merge branch 'develop' into improvement/multiselect_localization
2022-03-01 15:55:27 +01:00
vabene1111
65432895ba
Merge branch 'develop' into improvement/minor_translation_fixes
2022-03-01 15:54:44 +01:00
vabene1111
b730acc06a
Merge pull request #1596 from MaxJa4/improvement/select_amount
...
Auto selects amount of ingredient when adding new ingredient.
2022-03-01 15:52:10 +01:00
dependabot[bot]
5f25df7d19
Bump workbox-routing from 6.4.2 to 6.5.0 in /vue
...
Bumps [workbox-routing](https://github.com/googlechrome/workbox ) from 6.4.2 to 6.5.0.
- [Release notes](https://github.com/googlechrome/workbox/releases )
- [Commits](https://github.com/googlechrome/workbox/compare/v6.4.2...v6.5.0 )
---
updated-dependencies:
- dependency-name: workbox-routing
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-01 00:12:01 +00:00
dependabot[bot]
e55f78c767
Bump @vue/cli-plugin-pwa from 4.5.15 to 5.0.1 in /vue
...
Bumps [@vue/cli-plugin-pwa](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-pwa ) from 4.5.15 to 5.0.1.
- [Release notes](https://github.com/vuejs/vue-cli/releases )
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.1/packages/@vue/cli-plugin-pwa )
---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-pwa"
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-01 00:10:36 +00:00
dependabot[bot]
6d257d2455
Bump @popperjs/core from 2.11.0 to 2.11.2 in /vue
...
Bumps [@popperjs/core](https://github.com/popperjs/popper-core ) from 2.11.0 to 2.11.2.
- [Release notes](https://github.com/popperjs/popper-core/releases )
- [Commits](https://github.com/popperjs/popper-core/compare/v2.11.0...v2.11.2 )
---
updated-dependencies:
- dependency-name: "@popperjs/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-01 00:09:44 +00:00
MaxJa4
cebd47a639
Fixed json format after merge
2022-02-28 21:21:06 +01:00
MaxJa4
1e3a6fadf0
More localization of recipe search and view
2022-02-28 21:19:00 +01:00
MaxJa4
47723673d0
Multiselect controls are now fully localized in RecipeEditView
2022-02-28 20:28:41 +01:00
MaxJa4
429d381f63
Auto selects amount of ingredient when adding new ingredient.
2022-02-28 19:43:37 +01:00
MaxJa4
b393d026f7
Added a few more strings to be localized and fixed one ui alignment
2022-02-27 22:40:03 +01:00
MaxJa4
09804de809
Optimized advanced search settings UX
2022-02-27 21:53:22 +01:00
vabene1111
089e634d69
fixed mobile emoji select
2022-02-27 11:39:24 +01:00
vabene1111
429607e1fe
fixed shoppoing v2 list container size
2022-02-27 11:07:06 +01:00
vabene1111
802242f54e
Merge pull request #1586 from smilerz/genericmodal_translations
...
fix translations in helper libraries models.js and utils.js
2022-02-27 09:50:37 +01:00
dependabot[bot]
c7f5975c22
Bump url-parse from 1.5.7 to 1.5.10 in /vue
...
Bumps [url-parse](https://github.com/unshiftio/url-parse ) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases )
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10 )
---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-02-26 09:30:47 +00:00
dependabot[bot]
739c2ecc53
Bump prismjs from 1.25.0 to 1.27.0 in /vue
...
Bumps [prismjs](https://github.com/PrismJS/prism ) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/PrismJS/prism/releases )
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md )
- [Commits](https://github.com/PrismJS/prism/compare/v1.25.0...v1.27.0 )
---
updated-dependencies:
- dependency-name: prismjs
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-02-26 02:26:31 +00:00
smilerz
56c553c35d
load language_code to new shopping list
2022-02-25 13:52:56 -06:00
smilerz
dae49ec5f3
fix translations in helper libraries models.js and utils.js
2022-02-25 13:16:34 -06:00
vabene1111
fc6268b7ff
Merge pull request #1564 from smilerz/retain_original_ingredient_text
...
retain original text when parsing ingredients
2022-02-25 16:17:44 +01:00
Maximilian Jannack
715e301a4d
Revert "Revert "Added some translations in meal plan, recipe search and recipe switcher.""
...
This reverts commit 391c45b8be
2022-02-25 10:43:34 +01:00
MaxJa4
391c45b8be
Revert "Added some translations in meal plan, recipe search and recipe switcher."
...
This reverts commit b2fa1db4f9
2022-02-24 20:53:52 +01:00
MaxJa4
b2fa1db4f9
Added some translations in meal plan, recipe search and recipe switcher.
2022-02-24 19:19:25 +01:00
vabene1111
bedbc255b3
Merge pull request #1574 from smilerz/export_from_filter
...
fix serializer using food name instead of supermarket name
2022-02-24 07:50:18 +01:00
smilerz
c8dcca8630
fix recipe search in export form (converted to change safe genericAPI)
2022-02-23 17:24:06 -06:00
Kaibu
05305c46ca
shopping list mobile detail fix
2022-02-23 23:23:37 +01:00
Kaibu
6d5195f0d3
improved cookbook detail loading
2022-02-23 22:44:37 +01:00
smilerz
f9a4521ca1
redirect export using djangoResolveUrl
2022-02-22 16:00:55 -06:00
smilerz
a7d66fa850
export recipes from saved filter
2022-02-22 15:18:39 -06:00
vabene1111
52c16ab7dd
all types bascially working (lacking bookmark)
2022-02-22 17:00:30 +01:00
vabene1111
0d98c77301
some small ui stuff
2022-02-21 18:29:23 +01:00
smilerz
e52054e732
retain original text when parsing ingredients
2022-02-21 09:47:27 -06:00
vabene1111
e04d672750
import with image working
2022-02-21 15:59:30 +01:00
vabene1111
c8fc67fa2b
changed source import to match field structure of recipe model
...
first imports working
2022-02-19 17:54:00 +01:00
vabene1111
89348f69f1
basics of new import page
2022-02-19 16:55:17 +01:00
vabene1111
c1605454dd
only show create/import on search when not loading
2022-02-19 09:37:57 +01:00
vabene1111
55b035eaaa
first boilerplate for new import view
2022-02-19 09:34:42 +01:00
vabene1111
b19ff3dca4
added import/create buttons to empty search
2022-02-19 09:16:54 +01:00
vabene1111
7fa5c2d987
changed defaults for multiple kw/book/food filters
2022-02-19 08:51:11 +01:00
dependabot[bot]
c1297285f3
Bump url-parse from 1.5.3 to 1.5.7 in /vue
...
Bumps [url-parse](https://github.com/unshiftio/url-parse ) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases )
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7 )
---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-02-19 07:39:44 +00:00
vabene1111
e081d823ed
fix book share permission
2022-02-18 17:52:32 +01:00
vabene1111
d6fa02cc9e
Merge branch 'develop' into feature/custom_filters
2022-02-18 17:25:15 +01:00
smilerz
2b5aec5d0a
resolved loading custom filter when not in expert mode
2022-02-18 09:08:36 -06: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
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
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
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
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
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
smilerz
42a6f8457a
remove console messages
2022-02-16 10:58:05 -06: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
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
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
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
1e9f7af017
updated translations and django version
2022-02-11 09:29:28 +01:00
vabene1111
6ae1365505
Merge pull request #1512 from smilerz/additional_fixes
...
various fixes
2022-02-11 09:01:56 +01:00
vabene1111
32a8cc9a69
proof of concept for recipe search explain
2022-02-09 18:44:29 +01:00
smilerz
c2961eede4
stub out receip search tests
2022-02-08 20:23:49 -06:00
Marion Kämpfer
13ed297fb9
Translated using Weblate (French)
...
Currently translated at 95.9% (286 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-02-09 01:31:35 +00:00
smilerz
0e258a49fb
reload book recipes when adding filter
2022-02-08 12:30:11 -06:00
smilerz
b3a830c319
fix missing pill when loading CustomFilter
2022-02-08 11:41:57 -06:00
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 ba1f10cd3a4e0cc34d4ef4ce62f54e0cc34d41ef4ce62f5bb990462bdbc601419405e34c6ddfhttps://github.com/vabene1111/recipes into develop
commit 5e34c6ddf0532d32c19d8d76ae9e#1353 from smilerz/supermarket-category
fix missing label on first supermarket category
commit d8d76ae9e0c60141940d532d32c19454721a0a62c27933548dd04e9518cbb9065f7052c8c29e1b5a5724ef95112595a26fb4e1c7305c0437296415#1351 from MaxJa4/patch-1
Add hint about trailing slashes for subpath setups
commit e1c7305c07418c38423f90b6f9ad0cc5be844d#1352 from smilerz/fix-search
force list params to list
commit cc5be844d590b6f9ad06437296415ea8c885bd21a539d14aad2b0541bd743f53a924e1d231588390ed9100fbhttps://github.com/vabene1111/recipes into develop
commit 0ed9100fb1d2b796ddd85ecac3a1#1350 from TandoorRecipes/patch-empty-recipe_list
Update recipe_search.py
commit d23158839bd2b796ddd2d2b796ddd28b1e80efeb85ecac3a17e0b8d6fcc3edd47873f7c14dd04261a37672812769365d62#1348 from smilerz/fuzzy_search
Fuzzy search
commit 769365d624ddb9e70d330421d067ddb9e70d31a376728120#1213
commit 306f90aa98a19ad706ce4af6de7428f3044dbehttps://github.com/vabene1111/recipes into develop
commit 4af6de7425#1280 from MarcusWolschon/feature1275_readable_export_file_names"
This reverts commit c4f40b963993b868bc698f3044dbee7c5ffdaef51620a34d#1316 from tomtjes/docs-swag-example
add swag config example
commit 7c5ffdaef4d3b71e40c30421d067#1347 from smilerz/fuzzy_search
Fuzzy search
commit 30421d067edde350c8ad3b71e40cd3b71e40c71a84a8fe8016cb99f91934eeee5c#1289 from MarcusWolschon/features/1093_recipe_link_in_plan
commit 16cb99f915a451f722af07690d7e#1317 from mheiland/patch-1
Example for third-party authentication
commit a451f722a1f12196d1c99b3ed846#1327 from tomtjes/docs-faq-amendments
FAQ amendments
commit dde350c8aff12196d1c6d4242a244b3e971fe0#1343 from MatthiasLohr/feature/db-url-path
Allow to specify an actual path using DATABASE_URL
commit d4242a244d0c603e3668a7c4e11c8a7c4e11c9745bb58c7eb3e971fe090c603e3665http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
commit fed9cfeeb7http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
commit 5a65fd2231c2a763fa424e42496a#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 c2a763fa4chttp://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 528767a835http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 9b182f6076http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
commit 968b710b49http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
commit f11e07d347http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
commit 24e42496a7https://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 9da496cb6d8cebc98d39221533ae#1323 from MaxJa4/patch-1
Added Apache2 in the bug report template
commit 99b3ed8464281535e7569221533ae7f07690d7e38cebc98d3bhttp://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 965d2c05e7http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 17ad01ae8chttp://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 51620a34d991fcb1b822http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
commit 01d5ab92c5http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
commit 79c8d26e8c9486b08e20e1153ce3#1311 from smilerz/patch-2
fix bug creating food with create form
commit 9486b08e20d36033a8bffa91863d#1309 from MaxJa4/develop
Disabled old issue templates and added new ones with new GitHub issues format
commit 934eeee5c42927333bf10e1153ce3ab3f05b0bfdffa91863ddcf2d33daad8f08ba71148a4f35e592
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 a30a27c755f274f31e8020adcc0e83
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
