vabene1111
|
6053b1419c
|
fixed undefined var
|
2022-01-06 16:57:17 +01:00 |
|
vabene1111
|
5c98f06208
|
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
|
2022-01-06 16:34:53 +01:00 |
|
vabene1111
|
c141dc850f
|
Merge pull request #1245 from TandoorRecipes/fix_scopes_subfolder
added prefix to request.path.startswith() conditionals
|
2022-01-06 16:30:27 +01:00 |
|
vabene1111
|
063a0dec24
|
Merge branch 'master' into develop
# Conflicts:
# requirements.txt
|
2022-01-06 16:08:06 +01:00 |
|
smilerz
|
6a1fcabae0
|
added prefix to request.path.startswith() conditionals
|
2022-01-06 07:37:02 -06:00 |
|
smilerz
|
13115a1e53
|
fixes 1176
|
2022-01-05 17:49:38 -06: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
|
214db80dac
|
add category context menu
|
2022-01-05 15:20:10 -06:00 |
|
vabene1111
|
4047febec9
|
Merge branch 'develop' into feature/shopping_list_v2
|
2022-01-04 07:58:36 +01:00 |
|
smilerz
|
582e145a9f
|
Fix after rebase
|
2021-12-30 13:55:38 -06:00 |
|
smilerz
|
79b4bc387e
|
change ingore_inherit to inherit_fields
|
2021-12-30 12:54:39 -06:00 |
|
vabene1111
|
c50a89c651
|
disabled tree fix at startup for now
|
2021-12-30 18:08:29 +01:00 |
|
vabene1111
|
2e69a00fce
|
improved recipe edit input validation
|
2021-12-30 17:57:04 +01:00 |
|
vabene1111
|
bddaa77f71
|
fixed space not honourd in invite link
|
2021-12-30 17:37:10 +01:00 |
|
smilerz
|
3fafd43e58
|
merge ignore shopping with onhand
|
2021-12-29 16:32:19 -06:00 |
|
vabene1111
|
c961909342
|
fixed import
|
2021-12-29 15:54:20 +01:00 |
|
smilerz
|
c43b8e91da
|
Fix after rebase
|
2021-12-28 12:05:14 -06:00 |
|
smilerz
|
c20e036d90
|
add path to generic cards for food/keywords
|
2021-12-28 12:03:36 -06:00 |
|
smilerz
|
279faadf46
|
pytest create recipe with ingredient as header
|
2021-12-28 12:03:36 -06:00 |
|
smilerz
|
e257a8d29b
|
fix responsive display of shopping list
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
24bef756e8
|
fix filter_to_supermarket setting
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
b4510a2cc1
|
fix categories in supermarket edit modal
|
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
|
9794d544cc
|
Squashed commit of the following:
commit 7837467c30
Merge: aaaae5b1b 84759383f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Sat Dec 18 23:14:24 2021 +0100
Merge pull request #1146 from auanasgheps/patch-1
Add documentation about swag by linuxserver
commit 84759383fa
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date: Sat Dec 18 13:49:09 2021 +0100
Add documentation about swag by linuxserver
Documents behaviour in #959
commit aaaae5b1ba
Merge: 4a747f5cd ea62c10d9
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date: Thu Dec 16 18:10:48 2021 +0100
Merge pull request #1143 from smilerz/fix_get_facet_api
fix bug in get_facet_api
commit ea62c10d9a
Author: smilerz <smilerz@gmail.com>
Date: Thu Dec 16 09:20:56 2021 -0600
remove console message
commit 3516505dd1
Author: smilerz <smilerz@gmail.com>
Date: Thu Dec 16 09:08:32 2021 -0600
fix bug in get_facet_api
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
2d94cb70ab
|
fix shopping list api
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
f5e4adba8b
|
fix get_facets_API
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
b0705da1fe
|
filter fields available to inherit in space settings
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
682f4a4297
|
fix post_save signal for sqlite
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
453b1eb5b9
|
rebase and fixes
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
ee4ab41c1c
|
test shoppingFood API
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
1364f75f21
|
test userpreference food_inherit defaults
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
3047c09e55
|
test rest food inheritance
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
5bdcbb1d17
|
pytest shopping user preferences
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
35e81f6247
|
update
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
a51eb7a2cb
|
pytest edit shopping list recipes
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
262387da3e
|
pytest shopping list from recipe methods
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
ab968f225b
|
test recent shopping list
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
0e6685882c
|
test shopping list sharing
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
8f0c5e21ad
|
basic tests with new factories
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
b5bf0a4584
|
fixed userpref serializer
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
2763eed5b2
|
minor cleanup
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
2af7b64d4f
|
visual indicator meal plan in shopping
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
24b0643765
|
copy shopping as markdown
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
df54b10610
|
download as CSV
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
7ad088d953
|
fix after rebase
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
8dcdf00dc7
|
refresh shopping list when item is delayed
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
0693d31550
|
WIP
|
2021-12-28 12:03:33 -06:00 |
|