vabene1111
|
6176eeb024
|
basics
|
2023-01-03 23:12:00 +01:00 |
|
Niklas Schwarz
|
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 |
|
Niklas Schwarz
|
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 |
|
vabene1111
|
12a8582a9a
|
fixed importer and copy recipe
|
2022-09-23 16:43:22 +02:00 |
|
vabene1111
|
6d866ae62b
|
fixed keyword serialization
|
2022-09-17 08:43:18 +02:00 |
|
vabene1111
|
845408244b
|
optimized recipe search query annotation performance
|
2022-09-16 13:24:57 +02:00 |
|
vabene1111
|
8ed5d52ddf
|
fixed space settings saving issue
|
2022-08-04 18:54:00 +02:00 |
|
vabene1111
|
3f77b73a61
|
add multiple API tokens per user, removes old API tokens
|
2022-08-04 17:24:54 +02:00 |
|
vabene1111
|
ce1f55ffd1
|
settings wip
|
2022-07-15 17:12:01 +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
|
dc3b1566d7
|
made shared field for recipe api optional
|
2022-07-14 10:21:35 +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 |
|
smilerz
|
e23d514d89
|
fix bookmarklet
|
2022-07-06 16:16:53 -05:00 |
|
vabene1111
|
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 |
|
vabene1111
|
27c695a393
|
allow disabling of ingredient overview
|
2022-06-26 12:36:37 +02:00 |
|
vabene1111
|
356dec636f
|
fixed ingredient paste and plan share serialize
|
2022-06-14 21:48:17 +02:00 |
|
vabene1111
|
deeed4b65b
|
testes and fixes for space, userspace and invitelink apis
|
2022-06-09 22:02:58 +02:00 |
|
vabene1111
|
2ab1560aed
|
fixed user name api filter
|
2022-06-09 17:31:17 +02:00 |
|
vabene1111
|
d5b7d440fe
|
fixed user preference api endpoint
|
2022-06-08 17:48:23 +02:00 |
|
vabene1111
|
e368488933
|
deprecated all old vue stuff and working on tests
|
2022-06-07 20:08:32 +02:00 |
|
vabene1111
|
37f0f7a0b7
|
added endpoint for space switching
|
2022-06-06 18:34:40 +02:00 |
|
vabene1111
|
e2b887b449
|
lots of fixes and stuff
|
2022-06-06 18:21:15 +02:00 |
|
vabene1111
|
07f78bb7b8
|
space management page progress
|
2022-06-02 16:20:52 +02:00 |
|
vabene1111
|
2afab2aec8
|
invite link basics
|
2022-06-01 17:42:07 +02:00 |
|
vabene1111
|
f41e4c62d4
|
space manage users and permissions
|
2022-06-01 17:01:13 +02:00 |
|
vabene1111
|
ded092ed23
|
baiscs of space edit page
|
2022-05-31 21:52:59 +02:00 |
|
vabene1111
|
151461508f
|
multi space membership basics
|
2022-05-31 17:38:12 +02:00 |
|
vabene1111
|
cac72df7ba
|
refactored recipe from source endpoint
|
2022-05-31 15:22:27 +02:00 |
|
vabene1111
|
6953f763d2
|
improved source url field rendering
|
2022-04-22 21:13:00 +02:00 |
|
vabene1111
|
3cf0395a18
|
lots of small fixes
|
2022-04-22 19:26:49 +02:00 |
|
vabene1111
|
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 |
|
vabene1111
|
d9dd0a594e
|
show recipe and allow delete in ingredient editor
|
2022-04-17 23:25:22 +02:00 |
|
vabene1111
|
d50fb69ce9
|
fixed errro message in meal plan when adding notes with add to shopping
|
2022-04-17 15:48:18 +02:00 |
|
vabene1111
|
7befa4a084
|
added basic ingredient editor
|
2022-04-14 13:01:27 +02:00 |
|
vabene1111
|
528ada7d32
|
Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
# vue/package.json
|
2022-04-04 19:16:20 +02:00 |
|
vabene1111
|
b7e6e7b1b0
|
fixed s3 check
|
2022-04-04 19:15:11 +02:00 |
|
vabene1111
|
60bb3fd4aa
|
Merge pull request #1633 from smilerz/recipe_as_food
allow marking recipe as food
|
2022-04-04 19:06:10 +02:00 |
|
Volker Kettenbach
|
b6e5425bd3
|
Get image from S3-Storage if configured
|
2022-04-02 11:35:35 +02:00 |
|
smilerz
|
486d197854
|
allow marking recipe as food
|
2022-03-06 23:12:59 -06: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
|
55539c83c9
|
fixed supermarket category creation
|
2022-03-01 16:26:36 +01:00 |
|
vabene1111
|
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 |
|
smilerz
|
abeeac838b
|
fix serializer using food name instead of supermarket name
|
2022-02-23 14:31:43 -06:00 |
|
smilerz
|
081edfd2d6
|
fix errors on Tandoor recipe import
|
2022-02-22 16:33:09 -06:00 |
|
smilerz
|
e52054e732
|
retain original text when parsing ingredients
|
2022-02-21 09:47:27 -06:00 |
|
vabene1111
|
e04d672750
|
import with image working
|
2022-02-21 15:59:30 +01:00 |
|
vabene1111
|
c8fc67fa2b
|
changed source import to match field structure of recipe model
first imports working
|
2022-02-19 17:54:00 +01:00 |
|
vabene1111
|
e081d823ed
|
fix book share permission
|
2022-02-18 17:52:32 +01:00 |
|
smilerz
|
6b5a099ba0
|
removed case insensitive get_or_create for units
|
2022-02-17 12:49:41 -06:00 |
|
smilerz
|
f1fa5e32bf
|
fix case insensitive get_or_create
|
2022-02-17 10:50:38 -06:00 |
|
smilerz
|
1b7f97dc64
|
case insensitive get_or_create
|
2022-02-17 10:23:31 -06:00 |
|
smilerz
|
4c9ddee55c
|
restrict get_or_create to name & space
|
2022-02-16 10:50:01 -06:00 |
|
smilerz
|
924ffc473b
|
fix recipe sharing
|
2022-02-08 14:59:54 -06:00 |
|
smilerz
|
0e258a49fb
|
reload book recipes when adding filter
|
2022-02-08 12:30:11 -06:00 |
|
smilerz
|
dc71260baa
|
Merge branch 'additional_fixes' into feature/custom_filters
|
2022-02-08 09:05:07 -06:00 |
|
smilerz
|
88b3ba1427
|
various fixes
|
2022-02-08 08:13:16 -06:00 |
|
smilerz
|
93b7e5790d
|
merge clashing commits
|
2022-02-07 18:11:38 -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 |
|
vabene1111
|
969df37e28
|
fixed sharing and added additional tests
|
2022-02-07 15:43:06 +01:00 |
|
Chris Scoggins
|
6ef25b604b
|
add food substitutions
|
2022-02-03 15:04:46 -06:00 |
|
Chris Scoggins
|
dcad389010
|
food edit modal - reset children inheritance
|
2022-02-03 12:15:04 -06:00 |
|
Chris Scoggins
|
fcb8e520b7
|
WIP
|
2022-02-03 12:11:32 -06:00 |
|
Chris Scoggins
|
890e9e7242
|
created CustomFilter model and api
|
2022-02-03 12:09:14 -06:00 |
|
vabene1111
|
a3fa01d8d3
|
Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress
|
2022-02-03 15:59:18 +01:00 |
|
Chris Scoggins
|
e2f8f29ec8
|
refactor list_from_recipe as class RecipeShoppingEditor
|
2022-01-29 10:28:01 -06:00 |
|
vabene1111
|
a0892470e1
|
Merge branch 'feature/export-progress' into develop
|
2022-01-28 15:41:49 +01:00 |
|
Chris Scoggins
|
4a48019885
|
fix duplicate shopping entries when using old list
|
2022-01-26 14:47:33 -06:00 |
|
Chris Scoggins
|
47823132f0
|
add ignore_shopping && additional help
|
2022-01-26 12:57:29 -06:00 |
|
Chris Scoggins
|
2e2080d8d1
|
fix Recipe Counts on food/keyword/unit serializer
|
2022-01-25 16:48:30 -06:00 |
|
vabene1111
|
ae14dde13d
|
propperly fixed setting
|
2022-01-25 18:33:12 +01:00 |
|
Kaibu
|
c90e5d72af
|
shopping list ux optimization, left handed mode
|
2022-01-21 00:13:36 +01:00 |
|
Sebastian Weber
|
c20e982fb1
|
Fix typos
|
2022-01-20 00:50:41 +01:00 |
|
vabene1111
|
890817ef6d
|
Merge pull request #1374 from smilerz/patch-updated-search
fix sort by new and show recent recipes
|
2022-01-19 17:01:46 +01:00 |
|
vabene1111
|
61a253675c
|
fixed default import / export
|
2022-01-19 16:08:03 +01:00 |
|
smilerz
|
530b1a8986
|
fix sort by new
|
2022-01-19 08:39:40 -06:00 |
|
vabene1111
|
3ea96d4102
|
basics
|
2022-01-18 21:09:08 +01:00 |
|
vabene1111
|
532d32c194
|
fixed shopping user save setting would not work
|
2022-01-17 22:41:38 +01:00 |
|
vabene1111
|
90b6f9ad06
|
fixed sub recipe issue
|
2022-01-17 19:54:16 +01:00 |
|
vabene1111
|
306f90aa98
|
recipe editor decimal fixes
|
2022-01-17 16:27:10 +01:00 |
|
smilerz
|
37971acb48
|
refactor recipe search
|
2022-01-17 08:26:34 -06:00 |
|
smilerz
|
6d9a90c6ba
|
fix onhand_users
|
2022-01-13 16:49:10 -06:00 |
|
smilerz
|
e313481fc8
|
WIP
|
2022-01-13 16:00:59 -06:00 |
|
smilerz
|
f9b04a3f1e
|
bug fix
|
2022-01-11 08:33:42 -06:00 |
|
smilerz
|
f7cb067b52
|
construct values in queryset instead of serializer methods
|
2022-01-11 07:24:59 -06:00 |
|
Tiago Rascazzi
|
9c873127a5
|
Added loading page
|
2022-01-08 11:07:33 -05:00 |
|
smilerz
|
922eb7402b
|
fix tess
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
2c76fb7b69
|
make food onhand when complete shopping entry
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
7c89117e04
|
make on_hand multiuser
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
29aa52aa3d
|
fix saving old list
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
79b4bc387e
|
change ingore_inherit to inherit_fields
|
2021-12-30 12:54:39 -06:00 |
|
smilerz
|
3fafd43e58
|
merge ignore shopping with onhand
|
2021-12-29 16:32:19 -06:00 |
|
smilerz
|
c20e036d90
|
add path to generic cards for food/keywords
|
2021-12-28 12:03:36 -06:00 |
|
smilerz
|
24bef756e8
|
fix filter_to_supermarket setting
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
63fe174070
|
fix add to shopping from MealPlan Modal
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
2d94cb70ab
|
fix shopping list api
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
453b1eb5b9
|
rebase and fixes
|
2021-12-28 12:03:34 -06:00 |
|