Commit Graph

290 Commits

Author SHA1 Message Date
vabene1111
b30f8c245e added option to set URL on food 2023-07-22 09:12:45 +02:00
vabene1111
b599c4f6a9 added internal notes and improved invite link form 2023-06-30 23:09:22 +02:00
vabene1111
436158f596 fixed allow decimals in food property amount 2023-06-26 15:47:44 +02:00
vabene1111
dd88641763 improved plugin nav capabilities 2023-06-21 16:07:32 +02:00
vabene1111
23bfc3c3b0 re-added property imports for open data importer 2023-06-20 15:42:25 +02:00
vabene1111
3302dacdc3 properties structure imporioved 2023-05-25 16:13:16 +02:00
vabene1111
5f79895a97 added migration for existing nutrition information 2023-05-06 23:21:09 +02:00
vabene1111
19f5da77b2 cleanup migrations, remove pint to speed up base conversion and calculate properties on converted ingredients 2023-05-06 22:21:27 +02:00
vabene1111
60f31608b9 added recipe properties 2023-05-06 19:14:25 +02:00
vabene1111
071926aada improved importer merging behavior 2023-05-04 15:29:06 +02:00
vabene1111
33d048e623 improve importer 2023-05-04 08:43:36 +02:00
vabene1111
d62c49eb2f not yet fully working food import 2023-05-01 13:29:14 +02:00
vabene1111
1bb6eb7141 import open data content 2023-04-30 22:30:56 +02:00
vabene1111
6d5592c1be basic food property calculation 2023-03-25 07:46:06 +01:00
vabene1111
6efe4ab08d base unit conversions 2023-03-15 17:30:23 +01:00
vabene1111
38010117e5 optimized unit conversion queries
using filter breaks prefetch related
2023-02-26 08:22:07 +01:00
vabene1111
ff6c8d5822 added unique constraints 2023-02-24 22:27:35 +01:00
vabene1111
a2b987352f user nutrition types + ingredient nutrtion calculation 2023-02-24 22:12:52 +01:00
vabene1111
5651beffb2 Merge branch 'develop' into feature/unit-conversion
# Conflicts:
#	vue/yarn.lock
2023-02-24 20:41:01 +01:00
vabene1111
3c527fd112 allow infiinit sharing as space setting 2023-02-12 18:16:43 +01:00
vabene1111
5e332bb88c changed plural default 2023-01-20 10:20:03 +01:00
vabene1111
3ced8c7a1e first conversions working 2023-01-09 17:42:53 +01:00
vabene1111
6176eeb024 basics 2023-01-03 23:12:00 +01:00
vabene1111
39ccf7bbcf added plural migration and pass param trough in recipe view 2022-11-22 07:58:12 +01:00
vabene1111
b315d6e171 adding debug toolbar 2022-09-12 17:58:20 +02:00
vabene1111
8ed5d52ddf fixed space settings saving issue 2022-08-04 18:54:00 +02:00
vabene1111
8700e2df69 basics of new settings page working 2022-07-14 17:50:20 +02:00
vabene1111
f4df84b609 added ability to set space images 2022-07-14 15:23:59 +02:00
vabene1111
ba473123ba added ability to use invite link more than once 2022-07-14 11:28:13 +02:00
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
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
e2b887b449 lots of fixes and stuff 2022-06-06 18:21:15 +02:00
vabene1111
151461508f multi space membership basics 2022-05-31 17:38:12 +02:00
vabene1111
6d8fe3c162 wip 2022-03-04 15:54:11 +01: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
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
smilerz
d49818ae6a
change default trigram threshold 2022-02-17 10:27:15 -06:00
smilerz
c2961eede4
stub out receip search tests 2022-02-08 20:23:49 -06:00
smilerz
93b7e5790d
merge clashing commits 2022-02-07 18:11:38 -06:00
smilerz
286c6344ec
Merge branch 'feature/custom_filters' into feature/custom_filtersv2 2022-02-07 17:47:53 -06:00
smilerz
1be5889923
tests for makenow filter 2022-02-07 17:46:04 -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
c45bf3a994
WIP 2022-02-03 12:14:17 -06:00
Chris Scoggins
fcb8e520b7
WIP 2022-02-03 12:11:32 -06:00