Commit Graph

307 Commits

Author SHA1 Message Date
vabene1111
e91790f5ac added ability to mark recipes as private 2022-07-13 15:46:39 +02:00
vabene1111
da09602834 removed old search pages 2022-07-12 20:05:59 +02:00
Joshua Bonnett
8d568526be Fixes #1857 2022-06-29 05:15:22 -07:00
vabene1111
27c695a393 allow disabling of ingredient overview 2022-06-26 12:36:37 +02:00
vabene1111
889089b4cd fixed search defaults 2022-06-14 16:49:58 +02:00
vabene1111
deeed4b65b testes and fixes for space, userspace and invitelink apis 2022-06-09 22:02:58 +02:00
vabene1111
d5b7d440fe fixed user preference api endpoint 2022-06-08 17:48:23 +02:00
vabene1111
e2b887b449 lots of fixes and stuff 2022-06-06 18:21:15 +02:00
vabene1111
ded092ed23 baiscs of space edit page 2022-05-31 21:52:59 +02:00
vabene1111
007b7294d9 join and leave spaces 2022-05-31 20:38:53 +02:00
vabene1111
151461508f multi space membership basics 2022-05-31 17:38:12 +02: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
vabene1111
90d477a0fd small change to be able to retain large texts 2022-02-25 16:19:49 +01: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
vabene1111
1bde4e81b7 fixed duplicate returns from tree manager get or create 2022-02-25 15:42:33 +01:00
smilerz
e52054e732
retain original text when parsing ingredients 2022-02-21 09:47:27 -06: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
smilerz
f1fa5e32bf
fix case insensitive get_or_create 2022-02-17 10:50:38 -06:00
smilerz
4e8bbefc17
minor cleanup 2022-02-15 06:42:57 -06:00
smilerz
bf54680178
more recipe search tests 2022-02-13 13:53:07 -06:00
smilerz
baa2aa51da
more recipe search tests 2022-02-09 16:18:45 -06:00
vabene1111
4c5994ee7f Merge branch 'develop' into feature/custom_filters
# Conflicts:
#	cookbook/serializer.py
#	cookbook/views/api.py
#	vue/src/utils/openapi/api.ts
2022-02-07 18:56:19 +01:00
smilerz
d6af318c21
tests for single food reset inherit and additional inheritted fields 2022-02-07 09:16:48 -06:00
Chris Scoggins
6ef25b604b
add food substitutions 2022-02-03 15:04:46 -06:00
Chris Scoggins
dcad389010
food edit modal - reset children inheritance 2022-02-03 12:15:04 -06:00
Chris Scoggins
fcb8e520b7
WIP 2022-02-03 12:11:32 -06:00
Chris Scoggins
890e9e7242
created CustomFilter model and api 2022-02-03 12:09:14 -06:00
vabene1111
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
Chris Scoggins
a7796cbf5c
fix shopping list sharing 2022-01-29 11:59:06 -06:00
vabene1111
a0892470e1
Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
Kaibu
c90e5d72af shopping list ux optimization, left handed mode 2022-01-21 00:13:36 +01:00
vabene1111
ab5bff62e3
Merge pull request #1381 from sebweb3r/spelling_mistakes
Fix typos
2022-01-20 17:44:49 +01:00
vabene1111
d27b39f7de changed default for auto on hand after shopping 2022-01-20 15:46:49 +01:00
Sebastian Weber
c20e982fb1
Fix typos 2022-01-20 00:50:41 +01:00
vabene1111
3ea96d4102 basics 2022-01-18 21:09:08 +01:00
vabene1111
8d24ae9008 small tweaks to the recipe editor 2022-01-18 19:55:51 +01:00
smilerz
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
smilerz
dde350c8af prettier cleanup 2022-01-17 08:35:19 -06:00
smilerz
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
smilerz
6d9a90c6ba fix onhand_users 2022-01-13 16:49:10 -06:00
smilerz
e313481fc8 WIP 2022-01-13 16:00:59 -06:00
smilerz
25ccea90e0 WIP 2022-01-10 15:05:56 -06:00
Tiago Rascazzi
9c873127a5 Added loading page 2022-01-08 11:07:33 -05:00
smilerz
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
smilerz
7c89117e04 make on_hand multiuser 2022-01-05 15:20:10 -06:00
smilerz
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
smilerz
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
smilerz
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
smilerz
3047c09e55 test rest food inheritance 2021-12-28 12:03:34 -06:00