Commit Graph

611 Commits

Author SHA1 Message Date
smilerz
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
smilerz
ab968f225b test recent shopping list 2021-12-28 12:03:34 -06:00
smilerz
8f0c5e21ad basic tests with new factories 2021-12-28 12:03:34 -06:00
smilerz
c7ad9c8d15 WIP 2021-12-28 12:03:34 -06:00
smilerz
729aa51901 fix package.json 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
fdd86b0c2d download shopping list PDF 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
smilerz
cae3773d5a Fix after rebase 2021-12-28 12:03:33 -06:00
smilerz
f2222fd7d5 pre-merge 2021-12-28 12:03:33 -06:00
smilerz
b8dfc00106 undo move 2021-12-28 12:03:33 -06:00
smilerz
1d224d8658 yarn build 2021-12-28 12:03:33 -06:00
smilerz
2b41fbc9f8 Fix after rebase 2021-12-28 12:03:33 -06:00
smilerz
6eec3d18fe more fixes after rebase 2021-12-28 12:03:33 -06:00
smilerz
de7d2e27d9 update migrations 2021-12-28 12:03:32 -06:00
smilerz
dcfe4de61f Fix after rebase 2021-12-28 12:03:32 -06:00
smilerz
f245aa8b4f add to shopping from card context menu 2021-12-28 12:03:32 -06:00
smilerz
a217db5822 add new unit/food from shopping list 2021-12-28 12:03:32 -06:00
smilerz
6e9d609fe0 edit supermarket categories 2021-12-28 12:03:32 -06:00
smilerz
ecac3f3c2d related recipes included when adding mealplan to shopping list 2021-12-28 12:03:32 -06:00
smilerz
7a0b395107 alpha shopping list 2021-12-28 12:03:32 -06:00
smilerz
1f41fa04a3 autosync 2021-12-28 12:03:32 -06:00
smilerz
7c598720d0 WIP 2021-12-28 12:03:32 -06:00
smilerz
5c9f5e0e1a fade-enter-active 2021-12-28 12:03:32 -06:00
smilerz
f400c7cd7c shopping line item 2021-12-28 12:03:32 -06:00
smilerz
2a138a852f inheritance works with object moves 2021-12-28 12:03:32 -06:00
smilerz
fbe748db62 food inherit attributes 2021-12-28 12:03:32 -06:00
smilerz
4377505b14 Fix after rebase 2021-12-28 12:03:31 -06:00
smilerz
c5c76cadea getUserPreference available for all UserPreferences 2021-12-28 12:03:31 -06:00
smilerz
6eea7ac99b model changes and GenericAutoSchema 2021-12-28 12:03:31 -06:00
smilerz
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
smilerz
67e4c88be7 implement related recipes on home page 2021-12-22 15:23:16 -06:00
smilerz
2d01a2af47 implemented quick switch 2021-12-22 14:43:00 -06:00
smilerz
efec416604 fix responsive display of detail shopping list 2021-12-21 20:41:49 -06:00
smilerz
e5a4f6b5bf fix responsive display of shopping list 2021-12-21 18:38:16 -06:00
smilerz
a55f975068 update console messages 2021-12-21 14:05:46 -06:00
smilerz
421ade7ad0 WIP 2021-12-21 13:53:40 -06:00
smilerz
c785b590a1 fix filter_to_supermarket setting 2021-12-21 13:53:16 -06:00
smilerz
42132568c4 fix categories in supermarket edit modal 2021-12-21 13:40:50 -06:00
smilerz
dfe414985b fix add to shopping from MealPlan Modal 2021-12-21 11:35:35 -06:00
smilerz
ee52092e24 delete supermarkets and categories from shopping list view 2021-12-21 11:05:24 -06:00
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
bf9e59d64c fix Shopping Modal to filter onhand from initial list 2021-12-20 14:59:56 -06:00
smilerz
132c48a490 fix shopping list api 2021-12-20 12:27:25 -06:00
smilerz
1a99a2d6f1 remove console.log 2021-12-19 11:31:16 -06:00
smilerz
cf3ddfc610 fix inconsistent pagination 2021-12-19 11:08:30 -06:00
smilerz
ecbd3edb97 WIP 2021-12-19 10:21:46 -06:00
smilerz
ea62c10d9a remove console message 2021-12-16 09:20:56 -06:00
smilerz
3516505dd1 fix bug in get_facet_api 2021-12-16 09:08:32 -06:00
smilerz
d4553c05c2 fix get_facets_API 2021-12-16 08:13:10 -06:00
smilerz
a313039b65 fix after rebase 2021-12-15 15:48:55 -06:00
smilerz
963dad39e8 fix rounding on new shopping list 2021-12-15 14:42:12 -06:00
smilerz
8b28a47297 rebase and fixes 2021-12-15 12:37:40 -06:00
smilerz
0866d21fa5 test recent shopping list 2021-12-15 12:37:40 -06:00
smilerz
b146e75daa basic tests with new factories 2021-12-15 12:37:40 -06:00
smilerz
1e36e6cd5b WIP 2021-12-15 12:37:40 -06:00
smilerz
4877d69947 fix package.json 2021-12-15 12:37:23 -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
2d7d160d1b download shopping list PDF 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
09b0dcb136 pre-merge 2021-12-15 12:37:03 -06:00
smilerz
5b4867d172 undo move 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
e229a70360 more fixes after rebase 2021-12-15 12:36:33 -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
7c6a7ef6a4 alpha shopping list 2021-12-15 12:35:48 -06:00
smilerz
4c506750de autosync 2021-12-15 12:35:48 -06:00
smilerz
b84d77be15 WIP 2021-12-15 12:35:48 -06:00
smilerz
247dd30b20 fade-enter-active 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
3d674cfca6 model changes and GenericAutoSchema 2021-12-15 12:35:48 -06:00
smilerz
9827c3ffd5 Fix after rebase 2021-12-15 12:35:48 -06:00
vabene1111
4a747f5cd4 Revert "Revert "fixed vue build""
This reverts commit edde015b71.
2021-12-15 18:02:37 +01:00
vabene1111
2559905a78 fixed empty fields breaking recipe update 2021-12-15 17:45:53 +01:00
vabene1111
edde015b71 Revert "fixed vue build"
This reverts commit 7e07508a31.
2021-12-15 17:26:06 +01:00
vabene1111
9b7b8beea4 addeed yarn lock 2021-12-15 17:22:24 +01:00
smilerz
09cc5aafe9 fix package.json 2021-12-07 15:38:03 -06:00
vabene1111
e3196a79a8
Merge pull request #1102 from TandoorRecipes/dependabot/npm_and_yarn/vue/typescript-4.5.2
Bump typescript from 4.4.4 to 4.5.2 in /vue
2021-12-03 17:38:53 +01:00
vabene1111
c89c88b981
Merge pull request #1101 from TandoorRecipes/dependabot/npm_and_yarn/vue/eslint-8.3.0
Bump eslint from 7.32.0 to 8.3.0 in /vue
2021-12-03 17:38:27 +01:00