Commit Graph

1631 Commits

Author SHA1 Message Date
Oliver Cervera
fd9e2ceaf4 Translated using Weblate (Italian)
Currently translated at 94.3% (468 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
2021-09-18 23:06:07 +00:00
vabene1111
f3593e8151 implemented rule processing in ingredient parser 2021-09-16 18:31:21 +02:00
Oliver Cervera
4dbe7703da Translated using Weblate (Italian)
Currently translated at 91.9% (456 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
2021-09-16 15:52:16 +00:00
vabene1111
a7dc23194e converted ingredient parser to class and added automation beta hint 2021-09-16 17:52:11 +02:00
vabene1111
ecd300d2db
Merge pull request #907 from smilerz/performance
Performance
2021-09-16 12:37:58 +02:00
smilerz
7a01e8b1d3 fix tests 2021-09-15 17:19:04 -05:00
smilerz
aa6b8be647 removed node sort on trees and added better indexes 2021-09-15 16:28:07 -05:00
Kaibu
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
vabene1111
cfaae5b200
Merge branch 'develop' into patch3 2021-09-15 17:28:25 +02:00
vabene1111
1fa9c806a6
Merge branch 'develop' into patch2 2021-09-15 17:28:01 +02:00
vabene1111
60aa384f3c
Merge pull request #901 from smilerz/patch
fix inputLookup
2021-09-15 17:27:42 +02:00
vabene1111
c296678eb2 implemented automation on deprecated method 2021-09-15 17:20:44 +02:00
smilerz
6a29c79e5c fix resetList function 2021-09-15 08:50:46 -05:00
smilerz
0680cefbe1 fixed or/and filters 2021-09-15 08:29:49 -05:00
smilerz
5c0fa7cd19 fix inputLookup 2021-09-15 08:13:22 -05:00
Oliver Cervera
137ad47df8 Translated using Weblate (Italian)
Currently translated at 90.7% (450 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
2021-09-15 11:07:30 +00:00
vabene1111
d6f7aade46 basics for automation 2021-09-15 13:07:25 +02:00
vabene1111
71ac73ff2a migration various leftover things after PR's 2021-09-15 10:39:33 +02:00
vabene1111
94e357f4f6 cookbookapp importer 2021-09-15 10:26:31 +02:00
vabene1111
aeb5682176 Merge branch 'pr/897' into develop 2021-09-15 09:16:09 +02:00
smilerz
4296e8e44f remove console messages 2021-09-14 16:19:38 -05:00
Kaibu
d9300a9a90 meal planner refactor progress 2021-09-14 23:16:33 +02:00
smilerz
c9a910daca rebase with develop 2021-09-14 16:14:30 -05:00
smilerz
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
smilerz
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05:00
vabene1111
b7fe3e38e6 fixed recipe book api test to reflect api change 2021-09-14 22:59:23 +02:00
vabene1111
70f96d3fe6 plan to eat importer 2021-09-14 22:47:26 +02:00
vabene1111
cbb2c0460c fixed fractional servings breaking importer 2021-09-14 21:54:08 +02:00
vabene1111
aca526a9cd added sharing back to recipe books 2021-09-14 21:07:15 +02:00
vabene1111
26f9d25bd2 fixed some integration issues 2021-09-14 20:31:41 +02:00
vabene1111
3b429c5d84 change iexact to exact for get_or_create tree mixing 2021-09-14 19:26:09 +02:00
vabene1111
5c6f09975b fixed importer rembering old ignored recipes 2021-09-14 15:17:00 +02:00
vabene1111
0e50e4e8a0 meal master tweak and frontend build 2021-09-14 14:48:50 +02:00
vabene1111
b151356bce recipe editor UI improvements 2021-09-14 11:47:00 +02:00
vabene1111
658ef23b42 compile messages 2021-09-13 22:40:53 +02:00
vabene1111
cfdce3de2a make and compile messages 2021-09-13 22:40:47 +02:00
Kaibu
02635b017c more minor drawer fixes 2021-09-13 22:38:24 +02:00
Kaibu
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
Kaibu
659847a949 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
# Conflicts:
#	cookbook/templates/base.html
2021-09-13 22:15:24 +02:00
Kaibu
9ace332ba5 drawer added 2021-09-13 22:14:15 +02:00
vabene1111
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
vabene1111
6f44ad760c quick solution for external recipe nav 2021-09-13 21:51:24 +02:00
smilerz
5e1ae1d877 add shopping_category and supermarkets 2021-09-13 14:41:50 -05:00
Kaibu
0c3dcf143f drawer rework 2021-09-13 21:41:15 +02:00
smilerz
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
vabene1111
c1161edc6d build 2021-09-13 21:24:41 +02:00
vabene1111
6350d0e9c5 Merge branch 'feature/recipe-edit-vue' into develop
# Conflicts:
#	vue/vue.config.js
#	vue/webpack-stats.json
2021-09-13 21:14:45 +02:00
vabene1111
234e27c4c1 recipe editor 2021-09-13 21:13:43 +02:00
Kaibu
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
Kaibu
9efc60232a removed old asset 2021-09-13 19:30:53 +02:00