Commit Graph

666 Commits

Author SHA1 Message Date
ee52092e24 delete supermarkets and categories from shopping list view 2021-12-21 11:05:24 -06:00
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
bf9e59d64c fix Shopping Modal to filter onhand from initial list 2021-12-20 14:59:56 -06:00
132c48a490 fix shopping list api 2021-12-20 12:27:25 -06:00
1a99a2d6f1 remove console.log 2021-12-19 11:31:16 -06:00
cf3ddfc610 fix inconsistent pagination 2021-12-19 11:08:30 -06:00
ecbd3edb97 WIP 2021-12-19 10:21:46 -06:00
ea62c10d9a remove console message 2021-12-16 09:20:56 -06:00
3516505dd1 fix bug in get_facet_api 2021-12-16 09:08:32 -06:00
d4553c05c2 fix get_facets_API 2021-12-16 08:13:10 -06:00
a313039b65 fix after rebase 2021-12-15 15:48:55 -06:00
963dad39e8 fix rounding on new shopping list 2021-12-15 14:42:12 -06:00
8b28a47297 rebase and fixes 2021-12-15 12:37:40 -06:00
0866d21fa5 test recent shopping list 2021-12-15 12:37:40 -06:00
b146e75daa basic tests with new factories 2021-12-15 12:37:40 -06:00
1e36e6cd5b WIP 2021-12-15 12:37:40 -06:00
4877d69947 fix package.json 2021-12-15 12:37:23 -06:00
f2f187a844 minor cleanup 2021-12-15 12:37:04 -06:00
c2e84c1fa4 visual indicator meal plan in shopping 2021-12-15 12:37:04 -06:00
ca93920f04 copy shopping as markdown 2021-12-15 12:37:04 -06:00
903a721a1d download as CSV 2021-12-15 12:37:04 -06:00
44e513ff2d fix after rebase 2021-12-15 12:37:03 -06:00
2d7d160d1b download shopping list PDF 2021-12-15 12:37:03 -06:00
54ca8b2bd0 refresh shopping list when item is delayed 2021-12-15 12:37:03 -06:00
a972a757b2 WIP 2021-12-15 12:37:03 -06:00
7c0d1236c2 Fix after rebase 2021-12-15 12:37:03 -06:00
09b0dcb136 pre-merge 2021-12-15 12:37:03 -06:00
5b4867d172 undo move 2021-12-15 12:37:03 -06:00
d3d4c210c1 yarn build 2021-12-15 12:37:03 -06:00
6cffee57fe Fix after rebase 2021-12-15 12:36:33 -06:00
e229a70360 more fixes after rebase 2021-12-15 12:36:33 -06:00
099a5420d6 update migrations 2021-12-15 12:36:06 -06:00
5a9543b4d8 Fix after rebase 2021-12-15 12:36:06 -06:00
60d7e63da8 add to shopping from card context menu 2021-12-15 12:36:06 -06:00
867e2d4fbf add new unit/food from shopping list 2021-12-15 12:36:06 -06:00
757fa5e49c edit supermarket categories 2021-12-15 12:36:06 -06:00
8b682c33f3 related recipes included when adding mealplan to shopping list 2021-12-15 12:35:48 -06:00
7c6a7ef6a4 alpha shopping list 2021-12-15 12:35:48 -06:00
4c506750de autosync 2021-12-15 12:35:48 -06:00
b84d77be15 WIP 2021-12-15 12:35:48 -06:00
247dd30b20 fade-enter-active 2021-12-15 12:35:48 -06:00
5e4e203dfb shopping line item 2021-12-15 12:35:48 -06:00
79b6d4817e inheritance works with object moves 2021-12-15 12:35:48 -06:00
6075ce50e7 food inherit attributes 2021-12-15 12:35:48 -06:00
2ca7722afb Fix after rebase 2021-12-15 12:35:48 -06:00
7a9e5b1e3f getUserPreference available for all UserPreferences 2021-12-15 12:35:48 -06:00
3d674cfca6 model changes and GenericAutoSchema 2021-12-15 12:35:48 -06:00
9827c3ffd5 Fix after rebase 2021-12-15 12:35:48 -06:00
4a747f5cd4 Revert "Revert "fixed vue build""
This reverts commit edde015b71.
2021-12-15 18:02:37 +01:00
2559905a78 fixed empty fields breaking recipe update 2021-12-15 17:45:53 +01:00