Commit Graph

340 Commits

Author SHA1 Message Date
89348f69f1 basics of new import page 2022-02-19 16:55:17 +01:00
f1fa5e32bf fix case insensitive get_or_create 2022-02-17 10:50:38 -06:00
4e8bbefc17 minor cleanup 2022-02-15 06:42:57 -06:00
bf54680178 more recipe search tests 2022-02-13 13:53:07 -06:00
baa2aa51da more recipe search tests 2022-02-09 16:18:45 -06:00
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
d6af318c21 tests for single food reset inherit and additional inheritted fields 2022-02-07 09:16:48 -06:00
6ef25b604b add food substitutions 2022-02-03 15:04:46 -06:00
dcad389010 food edit modal - reset children inheritance 2022-02-03 12:15:04 -06:00
fcb8e520b7 WIP 2022-02-03 12:11:32 -06:00
890e9e7242 created CustomFilter model and api 2022-02-03 12:09:14 -06:00
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
a7796cbf5c fix shopping list sharing 2022-01-29 11:59:06 -06:00
a0892470e1 Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
c90e5d72af shopping list ux optimization, left handed mode 2022-01-21 00:13:36 +01:00
ab5bff62e3 Merge pull request #1381 from sebweb3r/spelling_mistakes
Fix typos
2022-01-20 17:44:49 +01:00
d27b39f7de changed default for auto on hand after shopping 2022-01-20 15:46:49 +01:00
c20e982fb1 Fix typos 2022-01-20 00:50:41 +01:00
3ea96d4102 basics 2022-01-18 21:09:08 +01:00
8d24ae9008 small tweaks to the recipe editor 2022-01-18 19:55:51 +01:00
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
dde350c8af prettier cleanup 2022-01-17 08:35:19 -06:00
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
6d9a90c6ba fix onhand_users 2022-01-13 16:49:10 -06:00
e313481fc8 WIP 2022-01-13 16:00:59 -06:00
25ccea90e0 WIP 2022-01-10 15:05:56 -06:00
9c873127a5 Added loading page 2022-01-08 11:07:33 -05:00
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
7c89117e04 make on_hand multiuser 2022-01-05 15:20:10 -06:00
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
3047c09e55 test rest food inheritance 2021-12-28 12:03:34 -06:00
8f0c5e21ad basic tests with new factories 2021-12-28 12:03:34 -06:00
2763eed5b2 minor cleanup 2021-12-28 12:03:34 -06:00
24b0643765 copy shopping as markdown 2021-12-28 12:03:34 -06:00
df54b10610 download as CSV 2021-12-28 12:03:33 -06:00
b92c027919 food inherit tests 2021-12-28 12:03:33 -06:00
a035e02288 refactor Food tests to use factory_boy fixture factories 2021-12-28 12:03:33 -06:00
94b2e9b01c minor updates 2021-12-28 12:03:33 -06:00
dcfe4de61f Fix after rebase 2021-12-28 12:03:32 -06:00
a217db5822 add new unit/food from shopping list 2021-12-28 12:03:32 -06:00
ecac3f3c2d related recipes included when adding mealplan to shopping list 2021-12-28 12:03:32 -06:00
6135a6f26d fix apis 2021-12-28 12:03:32 -06:00
7a0b395107 alpha shopping list 2021-12-28 12:03:32 -06:00
7c598720d0 WIP 2021-12-28 12:03:32 -06:00
2a138a852f inheritance works with object moves 2021-12-28 12:03:32 -06:00
fbe748db62 food inherit attributes 2021-12-28 12:03:32 -06:00
c5c76cadea getUserPreference available for all UserPreferences 2021-12-28 12:03:31 -06:00
6eea7ac99b model changes and GenericAutoSchema 2021-12-28 12:03:31 -06:00