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

114 Commits

Author SHA1 Message Date
smilerz
8fa00b50b1 added update_at filter 2022-02-14 15:13:34 -06:00
smilerz
ef81700c05 add created filter, viewed filter and viewed sort 2022-02-13 14:07:43 -06:00
smilerz
bf54680178 more recipe search tests 2022-02-13 13:53:07 -06:00
vabene1111
4c5994ee7f Merge branch 'develop' into feature/custom_filters 
# Conflicts:
#	cookbook/serializer.py
#	cookbook/views/api.py
#	vue/src/utils/openapi/api.ts
 2022-02-07 18:56:19 +01:00
smilerz
d6af318c21 tests for single food reset inherit and additional inheritted fields 2022-02-07 09:16:48 -06:00
Chris Scoggins
6ef25b604b add food substitutions 2022-02-03 15:04:46 -06:00
Chris Scoggins
dcad389010 food edit modal - reset children inheritance 2022-02-03 12:15:04 -06:00
Chris Scoggins
9ffae0da7b rebuild openapi 2022-02-03 12:14:42 -06:00
Chris Scoggins
04c4182b24 WIP 2022-02-03 12:14:42 -06:00
Chris Scoggins
c45bf3a994 WIP 2022-02-03 12:14:17 -06:00
Chris Scoggins
07d5ead128 load RecipeFilter cookbook entries 2022-02-03 12:14:04 -06:00
Chris Scoggins
fcb8e520b7 WIP 2022-02-03 12:11:32 -06:00
Chris Scoggins
5959914932 makenow filter 2022-02-03 12:11:32 -06:00
Chris Scoggins
890e9e7242 created CustomFilter model and api 2022-02-03 12:09:14 -06:00
Chris Scoggins
d0549bcb6d complex book filters 2022-02-03 12:07:51 -06:00
Chris Scoggins
5e36bd0c27 complex food filters 2022-02-03 12:07:51 -06:00
Chris Scoggins
28d3d8a1e0 complex keyword filters 2022-02-03 12:07:50 -06:00
vabene1111
a0892470e1 Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
Chris Scoggins
6e4bb64b4e fix translation on ModelListMenu 2022-01-26 15:00:21 -06:00
Chris Scoggins
47823132f0 add ignore_shopping && additional help 2022-01-26 12:57:29 -06:00
vabene1111
e33cf08fca Revert "use old system to define frontend settings" 
This reverts commit f2e9f50d94.
 2022-01-25 18:26:51 +01:00
vabene1111
f2e9f50d94 use old system to define frontend settings 2022-01-25 18:14:25 +01:00
smilerz
b3417be2ec fix supermarket categories 2022-01-18 13:26:07 -06:00
Tiago Rascazzi
9c873127a5 Added loading page 2022-01-08 11:07:33 -05:00
smilerz
b919fb4ae8 quick add shoppinglist 2022-01-05 15:20:10 -06:00
smilerz
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
smilerz
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
smilerz
c20e036d90 add path to generic cards for food/keywords 2021-12-28 12:03:36 -06:00
smilerz
889fa7b8ea update console messages 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
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
8f0c5e21ad basic tests with new factories 2021-12-28 12:03:34 -06:00
smilerz
7ad088d953 fix after rebase 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
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
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
fbe748db62 food inherit attributes 2021-12-28 12:03:32 -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
5b6dd62f8e generic modal refactored 2021-11-23 19:18:10 -06:00
vabene1111
695cab29a1 fixed book sharing and added step page 2021-11-14 15:33:25 +01:00
xeals
15eec9d373 Set calories heading based on user preference 2021-10-25 17:38:41 +11:00
xeals
c9ff0543e3 Convert nutrition input from KJ to calories with preference 2021-10-25 17:37:31 +11:00