mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,991 Commits 21 Branches 170 Tags
29411b5a74cff99fd5efb5dd005f141bf21e2cb4
Commit Graph

2991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
29411b5a74 Bump lxml from 4.6.5 to 4.7.1 
Bumps [lxml](https://github.com/lxml/lxml) from 4.6.5 to 4.7.1.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.5...lxml-4.7.1)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 07:29:50 +00:00
vabene1111
e99c3af5d6 Merge pull request #1145 from TandoorRecipes/feature/shopping_list_v2 
Feature/shopping list v2
 2022-01-04 07:58:43 +01:00
vabene1111
4047febec9 Merge branch 'develop' into feature/shopping_list_v2 2022-01-04 07:58:36 +01: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
c50a89c651 disabled tree fix at startup for now 2021-12-30 18:08:29 +01: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
vabene1111
bddaa77f71 fixed space not honourd in invite link 2021-12-30 17:37:10 +01:00
vabene1111
3743a08996 marked required env fields 2021-12-30 09:47:36 +01:00
smilerz
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
smilerz
2787b64a96 Merge branch 'feature/shopping_list_v2' of https://github.com/TandoorRecipes/recipes into feature/shopping_list_v2 2021-12-29 09:37:38 -06:00
smilerz
52d1069353 fix reactivity of detailed items 2021-12-29 09:36:18 -06:00
vabene1111
c961909342 fixed import 2021-12-29 15:54:20 +01:00
vabene1111
ccd0966d92 Merge branch 'feature/shopping_list_v2' of https://github.com/vabene1111/recipes into feature/shopping_list_v2 
# Conflicts:
#	cookbook/static/django_js_reverse/reverse.js
#	cookbook/tests/api/test_api_shopping_recipe.py
#	vue/src/apps/ShoppingListView/ShoppingListView.vue
 2021-12-29 15:26:22 +01:00
smilerz
a4f2c994a0 fix responsive view of add-to-shopping form 2021-12-28 16:32:26 -06:00
smilerz
c43b8e91da Fix after rebase 2021-12-28 12:05:14 -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
279faadf46 pytest create recipe with ingredient as header 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
9794d544cc 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-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
b0705da1fe filter fields available to inherit in space settings 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
b3f4f2c895 Update settings.py 2021-12-28 12:03:35 -06:00
smilerz
682f4a4297 fix post_save signal for sqlite 2021-12-28 12:03:35 -06:00
smilerz
e33ca876a6 delete yarn lock 2021-12-28 12:03:34 -06:00
smilerz
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
smilerz
ee4ab41c1c test shoppingFood API 2021-12-28 12:03:34 -06:00
smilerz
1364f75f21 test userpreference food_inherit defaults 2021-12-28 12:03:34 -06:00
smilerz
3047c09e55 test rest food inheritance 2021-12-28 12:03:34 -06:00
smilerz
5bdcbb1d17 pytest shopping user preferences 2021-12-28 12:03:34 -06:00
smilerz
35e81f6247 update 2021-12-28 12:03:34 -06:00
smilerz
a51eb7a2cb pytest edit shopping list recipes 2021-12-28 12:03:34 -06:00
smilerz
262387da3e pytest shopping list from recipe methods 2021-12-28 12:03:34 -06:00
smilerz
ab968f225b test recent shopping list 2021-12-28 12:03:34 -06:00
smilerz
0e6685882c test shopping list sharing 2021-12-28 12:03:34 -06:00