mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,094 Commits 21 Branches 170 Tags
e313481fc8b65acf5a6b9368242ebe349e0a702d
Commit Graph

3094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smilerz
d67c5fcf1b change default status of shopping in recipe view 2021-12-23 08:38:43 -06:00
vabene1111
b8e0a7cf69 Merge pull request #1157 from TandoorRecipes/brand_button_patch 
fixes 1123
 2021-12-23 15:00:33 +01:00
vabene1111
e2915dde55 Merge pull request #1156 from TandoorRecipes/1129_patch 
fixes 1129
 2021-12-23 14:59:45 +01:00
smilerz
05f2fdecb3 fixes 1123 2021-12-23 07:44:11 -06:00
smilerz
5d33d82d70 fixes 1129 2021-12-23 07:38:30 -06:00
smilerz
17efc388ca fix 1129 2021-12-23 07:37:26 -06:00
vabene1111
e3a3220f00 Merge pull request #1150 from auanasgheps/patch-1 
punctuation fixes
 2021-12-23 12:50:17 +01:00
vabene1111
f15f34887a Merge pull request #1149 from smilerz/search_pagination 
Search pagination
 2021-12-23 12:49:15 +01:00
smilerz
20984d3dd6 add path to generic cards for food/keywords 2021-12-22 16:18:45 -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
5272cf0a5c reset new list item after create 2021-12-22 10:19:15 -06:00
smilerz
6b848e27a8 pytest create recipe with ingredient as header 2021-12-22 08:31:32 -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
Oliver Cervera
e470a70321 punctuation fixes 
First commit was done in rush. Fixed a couple of punctuations.
 2021-12-20 11:09:05 +01: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
vabene1111
7837467c30 Merge pull request #1146 from auanasgheps/patch-1 
Add documentation about swag by linuxserver
 2021-12-18 23:14:24 +01:00
Oliver Cervera
84759383fa Add documentation about swag by linuxserver 
Documents behaviour in #959
 2021-12-18 13:49:09 +01:00
vabene1111
aaaae5b1ba Merge pull request #1143 from smilerz/fix_get_facet_api 
fix bug in get_facet_api
1.0.3 		2021-12-16 18:10:48 +01: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
edc670e87d filter fields available to inherit in space settings 2021-12-15 16:59:33 -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
8f19ab6e5e Update settings.py 2021-12-15 13:29:08 -06:00
smilerz
0e20f679b3 fix post_save signal for sqlite 2021-12-15 13:23:22 -06:00
smilerz
46b83c8205 delete yarn lock 2021-12-15 12:37:40 -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