Commit Graph

2536 Commits

Author SHA1 Message Date
Kaibu
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
vabene1111
000445f3ff
Merge pull request #903 from smilerz/patch3
fix resetList function
2021-09-15 17:28:30 +02:00
vabene1111
cfaae5b200
Merge branch 'develop' into patch3 2021-09-15 17:28:25 +02:00
vabene1111
c2a40be941
Merge pull request #902 from smilerz/patch2
fixed or/and filters
2021-09-15 17:28:07 +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
vabene1111
dbfa27e4b9 automatic rule creation 2021-09-15 14:58:55 +02:00
vabene1111
19d1e2d456 moved toast to bottom right to not obstruct modals 2021-09-15 14:35:03 +02:00
vabene1111
803a25a75f Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-09-15 14:26:43 +02:00
vabene1111
4f3a364f13 translation 2021-09-15 14:26:40 +02:00
Oliver Cervera
90dc445c45 Translated using Weblate (Italian)
Currently translated at 100.0% (151 of 151 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2021-09-15 11:07:30 +00: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
d1807f3c14 show shared users in recipe book view 2021-09-14 21:12:18 +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
1c661c9baf recipe edit view hotkeys and small tweaks 2021-09-14 12:36:04 +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
Jesse
0055f02f14 Translated using Weblate (Dutch)
Currently translated at 84.5% (126 of 149 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
2021-09-13 20:11:59 +00: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
Oliver Cervera
37b2a95797 Translated using Weblate (Italian)
Currently translated at 92.2% (119 of 129 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2021-09-13 19:24:47 +00:00
vabene1111
c1161edc6d build 2021-09-13 21:24:41 +02:00