Commit Graph

1801 Commits

Author SHA1 Message Date
3b429c5d84 change iexact to exact for get_or_create tree mixing 2021-09-14 19:26:09 +02:00
5c6f09975b fixed importer rembering old ignored recipes 2021-09-14 15:17:00 +02:00
0e50e4e8a0 meal master tweak and frontend build 2021-09-14 14:48:50 +02:00
b151356bce recipe editor UI improvements 2021-09-14 11:47:00 +02:00
658ef23b42 compile messages 2021-09-13 22:40:53 +02:00
cfdce3de2a make and compile messages 2021-09-13 22:40:47 +02:00
02635b017c more minor drawer fixes 2021-09-13 22:38:24 +02:00
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
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
9ace332ba5 drawer added 2021-09-13 22:14:15 +02:00
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
6f44ad760c quick solution for external recipe nav 2021-09-13 21:51:24 +02:00
5e1ae1d877 add shopping_category and supermarkets 2021-09-13 14:41:50 -05:00
0c3dcf143f drawer rework 2021-09-13 21:41:15 +02:00
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
c1161edc6d build 2021-09-13 21:24:41 +02: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
9efc60232a removed old asset 2021-09-13 19:30:53 +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
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
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
7b3dee4595 fix food facets 2021-09-08 17:07:00 -05:00
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
6936710093 Merge pull request #869 from smilerz/fixes
Move/Merge updated to handle object vs id
2021-09-08 18:29:24 +02: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
2df8ed8e80 filter distinct on some queries with shared models 2021-09-08 15:58:27 +02:00
19d152461c various fixes food serializer 2021-09-08 15:05:54 +02:00
76b1ab9e85 fixed food serializer supermarket 2021-09-08 11:40:20 +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
8420995aa8 updated RecipeSearch API 2021-09-07 13:52:14 -05:00
f2497b0a52 Translated using Weblate (French)
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
2021-09-07 16:06:03 +00:00
4d27a80cd5 implemented pagination on Log apis 2021-09-07 07:35:17 -05:00
c9d1a9b551 finished unit page 2021-09-06 14:00:32 -05:00
84744560e0 infinite loader bug fixing 2021-09-06 12:28:14 -05:00
7053a857c2 reworked MergeMixin to handle non-trees 2021-09-06 10:45:16 -05:00