Commit Graph

1065 Commits

Author SHA1 Message Date
dbfa27e4b9 automatic rule creation 2021-09-15 14:58:55 +02:00
19d1e2d456 moved toast to bottom right to not obstruct modals 2021-09-15 14:35:03 +02:00
803a25a75f Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-09-15 14:26:43 +02:00
4f3a364f13 translation 2021-09-15 14:26:40 +02:00
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
d6f7aade46 basics for automation 2021-09-15 13:07:25 +02:00
aeb5682176 Merge branch 'pr/897' into develop 2021-09-15 09:16:09 +02:00
4296e8e44f remove console messages 2021-09-14 16:19:38 -05:00
d9300a9a90 meal planner refactor progress 2021-09-14 23:16:33 +02:00
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05:00
d1807f3c14 show shared users in recipe book view 2021-09-14 21:12:18 +02:00
aca526a9cd added sharing back to recipe books 2021-09-14 21:07:15 +02:00
1c661c9baf recipe edit view hotkeys and small tweaks 2021-09-14 12:36:04 +02:00
b151356bce recipe editor UI improvements 2021-09-14 11:47:00 +02:00
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
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
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
5e1ae1d877 add shopping_category and supermarkets 2021-09-13 14:41:50 -05:00
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
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
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
234e27c4c1 recipe editor 2021-09-13 21:13:43 +02:00
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
8b09777b2c Merge branch 'feature/books_refactor' into develop
# Conflicts:
#	vue/webpack-stats.json
2021-09-13 19:30:13 +02:00
fd8797e2b7 cookbook view refactored, minor ui fixes 2021-09-13 19:28:16 +02:00
b752541302 added markdown editor for instructions 2021-09-13 17:25:39 +02:00
f009e105ec recipe search fixed 2021-09-13 15:21:15 +02:00
b9ff4387ad first rendering version 2021-09-13 14:26:54 +02:00
b86c9d295a basic errors fixed 2021-09-13 14:06:19 +02:00
4fbf080e2f basics 2021-09-13 12:39:29 +02:00
0501dd9a0a layout progress 2021-09-12 22:47:31 +02:00
79c1f2eb86 Merge branch 'develop' into generic_card_fix 2021-09-11 13:09:02 +02:00
1be24e80de Merge pull request #878 from smilerz/filter_by_rating
Filter by rating
2021-09-11 13:08:14 +02:00
882075199c Translated using Weblate (Italian)
Currently translated at 85.8% (109 of 127 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2021-09-11 09:06:06 +00:00
c8bff1660b transposed v-model 2021-09-10 14:51:37 -05:00
f6eb1b69cb card loading fixes 2021-09-10 11:37:27 -05:00
6888233b6a fixed mispelled parameter 2021-09-10 06:44:09 -05:00
cd137f9da3 yarn build 2021-09-09 19:07:16 -05:00
aae3b679aa filter by recipe 2021-09-09 18:55:47 -05:00
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
51dd137d96 Merge branch 'develop' into create_inputList 2021-09-09 05:44:43 +02:00
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
5f37af5710 Move/Merge updated to handle object vs id 2021-09-08 09:16:58 -05:00
9bdcf09f60 started reworking books 2021-09-08 16:15:33 +02:00
04c047bd31 fixed keyword url parameter type in search view 2021-09-08 15:44:36 +02:00
19d152461c various fixes food serializer 2021-09-08 15:05:54 +02:00
68b64ba8e2 Merge branch 'pr/865' into develop 2021-09-08 09:42:16 +02:00
b3477332e7 Merge pull request #866 from smilerz/log_pagination
implemented pagination on Log apis
2021-09-08 09:32:51 +02:00
8edc01db26 Merge pull request #861 from smilerz/food_tree_patch
post food_tree bug fixing
2021-09-08 09:11:00 +02:00