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,221 Commits 21 Branches 170 Tags
b8bb1464229dc3fc54ed6be5667c5a8a3c124269
Commit Graph

3221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smilerz
6eec3d18fe more fixes after rebase 2021-12-28 12:03:33 -06:00
smilerz
94b2e9b01c minor updates 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
6135a6f26d fix apis 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
fbd17b48fe Fix after rebase 2021-12-28 12:03:31 -06:00
smilerz
6eea7ac99b model changes and GenericAutoSchema 2021-12-28 12:03:31 -06:00
smilerz
f5f9380344 model migrations 2021-12-28 12:03:31 -06:00
smilerz
e243e089cc WIP 2021-12-28 12:03:31 -06:00
smilerz
0b1d8bbd5f WIP 2021-12-28 12:03:31 -06:00
smilerz
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
vabene1111
f16e457d14 Merge pull request #1160 from TandoorRecipes/logout_redirect_patch 
fix logout redirect
 2021-12-26 13:50:06 +01:00
smilerz
64f2787943 fix logout redirect 2021-12-23 14:48:30 -06:00
vabene1111
3ff15b6766 added copy me that importer 2021-12-23 15:54:48 +01:00
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