Kaibu
|
d7bd731c73
|
minor ui fix in recipe view
|
2022-04-22 17:43:23 +02:00 |
|
Kaibu
|
9e86abb004
|
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
|
2022-04-22 17:33:33 +02:00 |
|
Kaibu
|
dc8ce0f6a4
|
recipe image max-width based on ingredient table
|
2022-04-22 17:33:27 +02:00 |
|
vabene1111
|
2ddb0c719a
|
Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
# vue/src/apps/RecipeEditView/RecipeEditView.vue
# vue/src/utils/openapi/api.ts
|
2022-04-22 16:41:13 +02:00 |
|
Tomasz Klimczak
|
05383a2bc3
|
Translated using Weblate (Polish)
Currently translated at 100.0% (384 of 384 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
|
2022-04-21 19:14:53 +00:00 |
|
Tomasz Klimczak
|
82fd6f1860
|
Translated using Weblate (Polish)
Currently translated at 100.0% (383 of 383 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
|
2022-04-19 04:18:02 +00:00 |
|
Kaibu
|
45a86a22e3
|
recipe switcher and navbar fixes
also added left_hand to global preferences
|
2022-04-18 14:13:23 +02:00 |
|
Roland Park
|
a84ab0c049
|
Add clickable keywords to recipe card
|
2022-04-17 19:56:36 -04:00 |
|
vabene1111
|
d9dd0a594e
|
show recipe and allow delete in ingredient editor
|
2022-04-17 23:25:22 +02:00 |
|
vabene1111
|
f0d59a8c9c
|
added ability to open ingredient editor from food/unit list
|
2022-04-17 22:43:33 +02:00 |
|
vabene1111
|
2ce06a8154
|
fixed too small fractions dissappearing
|
2022-04-17 15:35:32 +02:00 |
|
vabene1111
|
297a8d4c8b
|
ingredient editor basics done
|
2022-04-14 22:45:31 +02:00 |
|
vabene1111
|
976bce5fdd
|
add merge capability to ingredient editor
|
2022-04-14 22:10:48 +02:00 |
|
vabene1111
|
8c89438b97
|
allow delete in ingredient editor
|
2022-04-14 14:40:15 +02:00 |
|
vabene1111
|
7ca7bd6111
|
improve generic form delete
|
2022-04-14 14:31:34 +02:00 |
|
vabene1111
|
3159868ba4
|
moved generic multiselect create function into component
|
2022-04-14 14:08:16 +02:00 |
|
vabene1111
|
7befa4a084
|
added basic ingredient editor
|
2022-04-14 13:01:27 +02:00 |
|
cesar ferreira
|
46267a135b
|
Translated using Weblate (Portuguese)
Currently translated at 7.8% (30 of 381 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt/
|
2022-04-12 18:32:03 +00:00 |
|
Tomasz Klimczak
|
f7ab0400a3
|
Translated using Weblate (Polish)
Currently translated at 100.0% (381 of 381 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
|
2022-04-12 18:32:02 +00:00 |
|
Marcus Alsterfjord
|
74863117c5
|
Translated using Weblate (Swedish)
Currently translated at 100.0% (381 of 381 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sv/
|
2022-04-12 18:32:01 +00:00 |
|
Tomasz Klimczak
|
60e8b95593
|
Translated using Weblate (Polish)
Currently translated at 88.1% (336 of 381 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
|
2022-04-10 09:51:32 +00:00 |
|
Marcus Alsterfjord
|
cd5f752d26
|
Translated using Weblate (Swedish)
Currently translated at 85.8% (327 of 381 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sv/
|
2022-04-08 22:32:07 +00:00 |
|
Artem Aksenov
|
3e8ef33402
|
Translated using Weblate (Russian)
Currently translated at 54.3% (207 of 381 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/ru/
|
2022-04-07 19:32:00 +00:00 |
|
Jesse
|
944492168e
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (378 of 378 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
|
2022-04-05 10:32:03 +00:00 |
|
Kaibu
|
82c2cc0f40
|
ui improvements
|
2022-04-04 22:53:26 +02:00 |
|
vabene1111
|
48e9f3f8a9
|
added cookmate importer
|
2022-04-04 22:49:50 +02:00 |
|
vabene1111
|
85aad42529
|
added mela recipes importer
|
2022-04-04 21:09:47 +02:00 |
|
vabene1111
|
5bd9a15e4b
|
small fixes
|
2022-04-04 20:11:22 +02:00 |
|
vabene1111
|
3cedab45ee
|
fixed copy recipe nutrition link
|
2022-04-04 19:45:37 +02:00 |
|
vabene1111
|
528ada7d32
|
Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
# vue/package.json
|
2022-04-04 19:16:20 +02:00 |
|
vabene1111
|
b7e6e7b1b0
|
fixed s3 check
|
2022-04-04 19:15:11 +02:00 |
|
vabene1111
|
60bb3fd4aa
|
Merge pull request #1633 from smilerz/recipe_as_food
allow marking recipe as food
|
2022-04-04 19:06:10 +02:00 |
|
Lucas Declercq
|
bba81f6594
|
Translated using Weblate (French)
Currently translated at 87.3% (330 of 378 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
|
2022-03-31 06:01:57 +00:00 |
|
Marcus Alsterfjord
|
3a4f08f2f7
|
Translated using Weblate (Swedish)
Currently translated at 57.6% (218 of 378 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sv/
|
2022-03-31 06:01:56 +00:00 |
|
Marcus Alsterfjord
|
f8ad465113
|
Translated using Weblate (Swedish)
Currently translated at 55.0% (208 of 378 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sv/
|
2022-03-29 20:36:24 +00:00 |
|
vabene1111
|
7bed9963ff
|
fixed vue cli pwa version and admin comment search
|
2022-03-28 22:56:45 +02:00 |
|
vabene1111
|
a0610ac05f
|
Merge pull request #1676 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/cli-plugin-eslint-5.0.4
Bump @vue/cli-plugin-eslint from 4.5.15 to 5.0.4 in /vue
|
2022-03-28 22:15:58 +02:00 |
|
dependabot[bot]
|
afd063a2b9
|
Bump @vue/cli-plugin-eslint from 4.5.15 to 5.0.4 in /vue
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.5.15 to 5.0.4.
- [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.4/packages/@vue/cli-plugin-eslint)
---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-eslint"
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-03-28 20:01:08 +00:00 |
|
vabene1111
|
6b92dcbb2a
|
Merge pull request #1606 from TandoorRecipes/dependabot/npm_and_yarn/vue/workbox-routing-6.5.0
Bump workbox-routing from 6.4.2 to 6.5.0 in /vue
|
2022-03-28 21:59:22 +02:00 |
|
vabene1111
|
68501d646d
|
Merge pull request #1675 from TandoorRecipes/dependabot/npm_and_yarn/vue/axios-0.26.1
Bump axios from 0.24.0 to 0.26.1 in /vue
|
2022-03-28 21:58:52 +02:00 |
|
dependabot[bot]
|
459cf79ef3
|
Bump axios from 0.24.0 to 0.26.1 in /vue
Bumps [axios](https://github.com/axios/axios) from 0.24.0 to 0.26.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.24.0...v0.26.1)
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-03-28 19:58:40 +00:00 |
|
vabene1111
|
d4e9526c75
|
Merge pull request #1670 from TandoorRecipes/dependabot/npm_and_yarn/vue/minimist-1.2.6
Bump minimist from 1.2.5 to 1.2.6 in /vue
|
2022-03-28 21:56:52 +02:00 |
|
vabene1111
|
9722f22837
|
Merge pull request #1604 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/cli-plugin-pwa-5.0.1
Bump @vue/cli-plugin-pwa from 4.5.15 to 5.0.1 in /vue
|
2022-03-28 21:56:09 +02:00 |
|
vabene1111
|
b9b8864631
|
Merge pull request #1603 from TandoorRecipes/dependabot/npm_and_yarn/vue/popperjs/core-2.11.2
Bump @popperjs/core from 2.11.0 to 2.11.2 in /vue
|
2022-03-28 21:55:37 +02:00 |
|
dependabot[bot]
|
dd044eba36
|
Bump minimist from 1.2.5 to 1.2.6 in /vue
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)
---
updated-dependencies:
- dependency-name: minimist
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-03-28 19:54:50 +00:00 |
|
Stefan Werner
|
f68fd0fa94
|
Translated using Weblate (Finnish)
Currently translated at 56.3% (213 of 378 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fi/
|
2022-03-18 16:31:49 +00:00 |
|
vabene1111
|
0c841ec686
|
another improvement to shopping list item
|
2022-03-16 09:21:09 +01:00 |
|
ivo
|
f875942e79
|
Translated using Weblate (Portuguese)
Currently translated at 1.0% (4 of 378 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt/
|
2022-03-15 19:31:47 +00:00 |
|
vabene1111
|
e901c6708c
|
Merge branch 'develop' into feature/importer_to_vue
|
2022-03-15 13:02:10 +01:00 |
|
vabene1111
|
4dd3ba29b6
|
improved shopping v2 layout a little bit
|
2022-03-15 12:35:13 +01:00 |
|
vabene1111
|
5459e293d1
|
Merge pull request #1645 from smilerz/fix_sql_debug
fix sql debug button in search
|
2022-03-15 11:33:23 +01:00 |
|
ivo
|
4a5af48f33
|
Added translation using Weblate (Portuguese)
|
2022-03-14 18:51:14 +00:00 |
|
smilerz
|
b9289e2685
|
fix sql debug button in search
|
2022-03-11 07:27:42 -06:00 |
|
vabene1111
|
7426bb4e76
|
auto import multiple urls
|
2022-03-10 17:35:11 +01:00 |
|
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 |
|