Commit Graph

1844 Commits

Author SHA1 Message Date
smilerz
75b45ba8eb 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-20 15:26:31 -06:00
smilerz
132c48a490 fix shopping list api 2021-12-20 12:27:25 -06:00
smilerz
d4553c05c2 fix get_facets_API 2021-12-16 08:13:10 -06:00
smilerz
edc670e87d filter fields available to inherit in space settings 2021-12-15 16:59:33 -06:00
smilerz
0e20f679b3 fix post_save signal for sqlite 2021-12-15 13:23:22 -06:00
smilerz
8b28a47297 rebase and fixes 2021-12-15 12:37:40 -06:00
smilerz
e7e3a3083d test shoppingFood API 2021-12-15 12:37:40 -06:00
smilerz
ea7d34c8d2 test userpreference food_inherit defaults 2021-12-15 12:37:40 -06:00
smilerz
7e081d4389 test rest food inheritance 2021-12-15 12:37:40 -06:00
smilerz
2edb455bd6 pytest shopping user preferences 2021-12-15 12:37:40 -06:00
smilerz
c32a96fd6f update 2021-12-15 12:37:40 -06:00
smilerz
6d1476b2d8 pytest edit shopping list recipes 2021-12-15 12:37:40 -06:00
smilerz
5d79e4d3be pytest shopping list from recipe methods 2021-12-15 12:37:40 -06:00
smilerz
0866d21fa5 test recent shopping list 2021-12-15 12:37:40 -06:00
smilerz
6448c062f9 test shopping list sharing 2021-12-15 12:37:40 -06:00
smilerz
b146e75daa basic tests with new factories 2021-12-15 12:37:40 -06:00
smilerz
68927d141e fixed userpref serializer 2021-12-15 12:37:40 -06:00
smilerz
f2f187a844 minor cleanup 2021-12-15 12:37:04 -06:00
smilerz
c2e84c1fa4 visual indicator meal plan in shopping 2021-12-15 12:37:04 -06:00
smilerz
ca93920f04 copy shopping as markdown 2021-12-15 12:37:04 -06:00
smilerz
903a721a1d download as CSV 2021-12-15 12:37:04 -06:00
smilerz
44e513ff2d fix after rebase 2021-12-15 12:37:03 -06:00
smilerz
54ca8b2bd0 refresh shopping list when item is delayed 2021-12-15 12:37:03 -06:00
smilerz
a972a757b2 WIP 2021-12-15 12:37:03 -06:00
smilerz
7c0d1236c2 Fix after rebase 2021-12-15 12:37:03 -06:00
smilerz
d3d4c210c1 yarn build 2021-12-15 12:37:03 -06:00
smilerz
6cffee57fe Fix after rebase 2021-12-15 12:36:33 -06:00
smilerz
286595e03d WIP 2021-12-15 12:36:33 -06:00
smilerz
0d1c55d2e4 RecipeFactory and all related models 2021-12-15 12:36:33 -06:00
smilerz
fd8ca2e9ac food inherit tests 2021-12-15 12:36:33 -06:00
smilerz
9ef4c88d02 finish refactoring test_api_food to use factoryboy 2021-12-15 12:36:33 -06:00
smilerz
08d3c40200 refactor Food tests to use factory_boy fixture factories 2021-12-15 12:36:33 -06:00
smilerz
e229a70360 more fixes after rebase 2021-12-15 12:36:33 -06:00
smilerz
06b7ba809b minor updates 2021-12-15 12:36:06 -06:00
smilerz
099a5420d6 update migrations 2021-12-15 12:36:06 -06:00
smilerz
5a9543b4d8 Fix after rebase 2021-12-15 12:36:06 -06:00
smilerz
60d7e63da8 add to shopping from card context menu 2021-12-15 12:36:06 -06:00
smilerz
867e2d4fbf add new unit/food from shopping list 2021-12-15 12:36:06 -06:00
smilerz
757fa5e49c edit supermarket categories 2021-12-15 12:36:06 -06:00
smilerz
8b682c33f3 related recipes included when adding mealplan to shopping list 2021-12-15 12:35:48 -06:00
smilerz
27f358dd03 fix apis 2021-12-15 12:35:48 -06:00
smilerz
7c6a7ef6a4 alpha shopping list 2021-12-15 12:35:48 -06:00
smilerz
b84d77be15 WIP 2021-12-15 12:35:48 -06:00
smilerz
5e4e203dfb shopping line item 2021-12-15 12:35:48 -06:00
smilerz
79b6d4817e inheritance works with object moves 2021-12-15 12:35:48 -06:00
smilerz
6075ce50e7 food inherit attributes 2021-12-15 12:35:48 -06:00
smilerz
2ca7722afb Fix after rebase 2021-12-15 12:35:48 -06:00
smilerz
7a9e5b1e3f getUserPreference available for all UserPreferences 2021-12-15 12:35:48 -06:00
smilerz
7f87a9efed Fix after rebase 2021-12-15 12:35:48 -06:00
smilerz
3d674cfca6 model changes and GenericAutoSchema 2021-12-15 12:35:48 -06:00