Commit Graph

343 Commits

Author SHA1 Message Date
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
12a8582a9a fixed importer and copy recipe 2022-09-23 16:43:22 +02:00
6d866ae62b fixed keyword serialization 2022-09-17 08:43:18 +02:00
845408244b optimized recipe search query annotation performance 2022-09-16 13:24:57 +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
dc3b1566d7 made shared field for recipe api optional 2022-07-14 10:21:35 +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
e23d514d89 fix bookmarklet 2022-07-06 16:16:53 -05:00
690c486bb2 zip files before download in file broswer
needs to be completly rewritten in the future but for now this is more secure
2022-07-04 14:39:53 +02:00
27c695a393 allow disabling of ingredient overview 2022-06-26 12:36:37 +02:00
356dec636f fixed ingredient paste and plan share serialize 2022-06-14 21:48:17 +02:00
deeed4b65b testes and fixes for space, userspace and invitelink apis 2022-06-09 22:02:58 +02:00
2ab1560aed fixed user name api filter 2022-06-09 17:31:17 +02:00
d5b7d440fe fixed user preference api endpoint 2022-06-08 17:48:23 +02:00
e368488933 deprecated all old vue stuff and working on tests 2022-06-07 20:08:32 +02:00
37f0f7a0b7 added endpoint for space switching 2022-06-06 18:34:40 +02:00
e2b887b449 lots of fixes and stuff 2022-06-06 18:21:15 +02:00
07f78bb7b8 space management page progress 2022-06-02 16:20:52 +02:00
2afab2aec8 invite link basics 2022-06-01 17:42:07 +02:00
f41e4c62d4 space manage users and permissions 2022-06-01 17:01:13 +02:00
ded092ed23 baiscs of space edit page 2022-05-31 21:52:59 +02:00
151461508f multi space membership basics 2022-05-31 17:38:12 +02:00
cac72df7ba refactored recipe from source endpoint 2022-05-31 15:22:27 +02:00
6953f763d2 improved source url field rendering 2022-04-22 21:13:00 +02:00
3cf0395a18 lots of small fixes 2022-04-22 19:26:49 +02:00
2ddb0c719a Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
#	vue/src/apps/RecipeEditView/RecipeEditView.vue
#	vue/src/utils/openapi/api.ts
2022-04-22 16:41:13 +02:00
d9dd0a594e show recipe and allow delete in ingredient editor 2022-04-17 23:25:22 +02:00
d50fb69ce9 fixed errro message in meal plan when adding notes with add to shopping 2022-04-17 15:48:18 +02:00
7befa4a084 added basic ingredient editor 2022-04-14 13:01:27 +02:00
528ada7d32 Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
#	vue/package.json
2022-04-04 19:16:20 +02:00
b7e6e7b1b0 fixed s3 check 2022-04-04 19:15:11 +02:00
60bb3fd4aa Merge pull request #1633 from smilerz/recipe_as_food
allow marking recipe as food
2022-04-04 19:06:10 +02:00
b6e5425bd3 Get image from S3-Storage if configured 2022-04-02 11:35:35 +02:00
486d197854 allow marking recipe as food 2022-03-06 23:12:59 -06: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
55539c83c9 fixed supermarket category creation 2022-03-01 16:26:36 +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
abeeac838b fix serializer using food name instead of supermarket name 2022-02-23 14:31:43 -06:00
081edfd2d6 fix errors on Tandoor recipe import 2022-02-22 16:33:09 -06:00
e52054e732 retain original text when parsing ingredients 2022-02-21 09:47:27 -06:00
e04d672750 import with image working 2022-02-21 15:59:30 +01:00
c8fc67fa2b changed source import to match field structure of recipe model
first imports working
2022-02-19 17:54:00 +01:00