Commit Graph

323 Commits

Author SHA1 Message Date
a2b987352f user nutrition types + ingredient nutrtion calculation 2023-02-24 22:12:52 +01:00
5651beffb2 Merge branch 'develop' into feature/unit-conversion
# Conflicts:
#	vue/yarn.lock
2023-02-24 20:41:01 +01:00
3c527fd112 allow infiinit sharing as space setting 2023-02-12 18:16:43 +01:00
5e332bb88c changed plural default 2023-01-20 10:20:03 +01:00
3ced8c7a1e first conversions working 2023-01-09 17:42:53 +01:00
6176eeb024 basics 2023-01-03 23:12:00 +01:00
b1ad5ef205 Add option to space to enable plural name usage
* Add option to space to enable usage of plural name
  for food and unit per space

* Respect option per space to use the plural name
2022-11-11 18:15:57 +01:00
9994b6f9c2 Add plural name for unit and food
Add an optional plural name for unit and food.
Additional options to show always the plural name for unit and food
for an ingredient is added.
2022-11-11 18:15:57 +01:00
e391abd23d moved annotation to default query manager 2022-09-16 18:18:59 +02:00
b315d6e171 adding debug toolbar 2022-09-12 17:58:20 +02:00
8ed5d52ddf fixed space settings saving issue 2022-08-04 18:54:00 +02:00
3f77b73a61 add multiple API tokens per user, removes old API tokens 2022-08-04 17:24:54 +02:00
ce1f55ffd1 settings wip 2022-07-15 17:12:01 +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
8d568526be Fixes #1857 2022-06-29 05:15:22 -07: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
deeed4b65b testes and fixes for space, userspace and invitelink apis 2022-06-09 22:02:58 +02:00
d5b7d440fe fixed user preference api endpoint 2022-06-08 17:48:23 +02:00
e2b887b449 lots of fixes and stuff 2022-06-06 18:21:15 +02:00
ded092ed23 baiscs of space edit page 2022-05-31 21:52:59 +02:00
007b7294d9 join and leave spaces 2022-05-31 20:38:53 +02:00
151461508f multi space membership basics 2022-05-31 17:38:12 +02: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
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
1bde4e81b7 fixed duplicate returns from tree manager get or create 2022-02-25 15:42:33 +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
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