Commit Graph

265 Commits

Author SHA1 Message Date
8ed5d52ddf fixed space settings saving issue 2022-08-04 18:54:00 +02:00
8700e2df69 basics of new settings page working 2022-07-14 17:50:20 +02:00
f4df84b609 added ability to set space images 2022-07-14 15:23:59 +02:00
ba473123ba added ability to use invite link more than once 2022-07-14 11:28:13 +02:00
e91790f5ac added ability to mark recipes as private 2022-07-13 15:46:39 +02:00
da09602834 removed old search pages 2022-07-12 20:05:59 +02:00
27c695a393 allow disabling of ingredient overview 2022-06-26 12:36:37 +02:00
889089b4cd fixed search defaults 2022-06-14 16:49:58 +02:00
e2b887b449 lots of fixes and stuff 2022-06-06 18:21:15 +02:00
151461508f multi space membership basics 2022-05-31 17:38:12 +02:00
6d8fe3c162 wip 2022-03-04 15:54:11 +01:00
bdccdf0893 Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
#	cookbook/helper/recipe_url_import.py
2022-03-04 14:33:59 +01:00
90d477a0fd small change to be able to retain large texts 2022-02-25 16:19:49 +01:00
e52054e732 retain original text when parsing ingredients 2022-02-21 09:47:27 -06:00
c8fc67fa2b changed source import to match field structure of recipe model
first imports working
2022-02-19 17:54:00 +01:00
d49818ae6a change default trigram threshold 2022-02-17 10:27:15 -06:00
c2961eede4 stub out receip search tests 2022-02-08 20:23:49 -06:00
93b7e5790d merge clashing commits 2022-02-07 18:11:38 -06:00
286c6344ec Merge branch 'feature/custom_filters' into feature/custom_filtersv2 2022-02-07 17:47:53 -06:00
1be5889923 tests for makenow filter 2022-02-07 17:46:04 -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
c45bf3a994 WIP 2022-02-03 12:14:17 -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
d45e3b8e60 some tweaks for new exporter 2022-02-03 18:00:02 +01: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
f45e09a5a5 add units to search fields 2022-01-31 14:41:18 -06:00
a0892470e1 Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
75259ec230 corrected comment 2022-01-25 17:38:35 +01:00
8c49e6ba18 another small migration fix 2022-01-25 15:29:36 +01:00
f3f50d179f fixed missing field 2022-01-24 19:16:14 -06:00
c90e5d72af shopping list ux optimization, left handed mode 2022-01-21 00:13:36 +01:00
d27b39f7de changed default for auto on hand after shopping 2022-01-20 15:46:49 +01:00
3ea96d4102 basics 2022-01-18 21:09:08 +01:00
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
9c873127a5 Added loading page 2022-01-08 11:07:33 -05: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
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
6eec3d18fe more fixes after rebase 2021-12-28 12:03:33 -06:00
de7d2e27d9 update migrations 2021-12-28 12:03:32 -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
7a0b395107 alpha shopping list 2021-12-28 12:03:32 -06:00
f400c7cd7c shopping line item 2021-12-28 12:03:32 -06:00