Marcus Wolschon
|
8f08ba7114
|
#1093 conditional receipt link in plan
|
2022-01-12 16:15:55 +01:00 |
|
Marcus Wolschon
|
8a4f35e592
|
#1093 Recipe link in plan
#1093 add a recipe link into meal plan
|
2022-01-12 11:37:08 +01:00 |
|
vabene1111
|
e1e53d12f8
|
playing around with the reciupe switcher
|
2022-01-07 16:19:25 +01:00 |
|
vabene1111
|
0a6abf9688
|
Merge pull request #1211 from TiagoRascazzi/develop
Added Saffron and PDF export format
|
2022-01-07 10:31:13 +01:00 |
|
vabene1111
|
724217f142
|
Merge branch 'develop' into feature/shopping_list_v2
|
2022-01-06 16:27:39 +01:00 |
|
vabene1111
|
54b57a8bcb
|
Merge branch 'develop' into feature/related_recipe_switcher
|
2022-01-06 16:22:44 +01:00 |
|
smilerz
|
f65b5d0733
|
clear unit after adding shopping list item
|
2022-01-05 16:41:26 -06:00 |
|
smilerz
|
2c76fb7b69
|
make food onhand when complete shopping entry
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
b919fb4ae8
|
quick add shoppinglist
|
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 |
|
Hrachya Kocharyan
|
25c1689ca0
|
Translated using Weblate (Armenian)
Currently translated at 39.4% (82 of 208 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/hy/
|
2022-01-05 07:00:36 +00:00 |
|
Tiago Rascazzi
|
578154510b
|
Merge shopping_list develop
|
2022-01-04 13:19:34 -05:00 |
|
Tiago Rascazzi
|
1c30e643c3
|
Print format avoid breaking Ingredient and step
|
2022-01-02 22:28:16 -05:00 |
|
smilerz
|
795f3084d9
|
Merge branch 'feature/related_recipe_switcher' of https://github.com/TandoorRecipes/recipes into feature/related_recipe_switcher
|
2021-12-31 09:01:36 -06:00 |
|
smilerz
|
931eae4361
|
fix switcher to be TZ sensitive
|
2021-12-31 09:01:31 -06:00 |
|
smilerz
|
80fc50e09b
|
remove console message
|
2021-12-30 16:52:08 -06:00 |
|
smilerz
|
045a0b7d4f
|
persist servings changes
|
2021-12-30 15:33:47 -06:00 |
|
smilerz
|
957c659a62
|
Squashed commit of shoppinglist_v2
|
2021-12-30 15:33:34 -06:00 |
|
smilerz
|
b282c46c1a
|
Fix after rebase
|
2021-12-30 13:58:34 -06: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
|
f21587605a
|
fixed sub recipe rendering
|
2021-12-30 18:03:08 +01:00 |
|
vabene1111
|
2e69a00fce
|
improved recipe edit input validation
|
2021-12-30 17:57:04 +01:00 |
|
smilerz
|
3fafd43e58
|
merge ignore shopping with onhand
|
2021-12-29 16:32:19 -06:00 |
|
smilerz
|
52d1069353
|
fix reactivity of detailed items
|
2021-12-29 09:36:18 -06:00 |
|
smilerz
|
a4f2c994a0
|
fix responsive view of add-to-shopping form
|
2021-12-28 16:32:26 -06:00 |
|
smilerz
|
58d025f1a5
|
change default status of shopping in recipe view
|
2021-12-28 12:03:36 -06:00 |
|
smilerz
|
c20e036d90
|
add path to generic cards for food/keywords
|
2021-12-28 12:03:36 -06:00 |
|
smilerz
|
2d0a7330f3
|
reset new list item after create
|
2021-12-28 12:03:36 -06:00 |
|
smilerz
|
5b287ad484
|
fix responsive display of detail shopping list
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
e257a8d29b
|
fix responsive display of shopping list
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
889fa7b8ea
|
update console messages
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
a3008a6091
|
WIP
|
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
|
0f4bd9972e
|
delete supermarkets and categories from shopping list view
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
e66897c1ea
|
fix Shopping Modal to filter onhand from initial list
|
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
|
a20a877dc7
|
fix after rebase
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
ed50a27669
|
fix rounding on new shopping list
|
2021-12-28 12:03:35 -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
|
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
|
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
|
f2f187a844
|
minor cleanup
|
2021-12-15 12:37:04 -06:00 |
|