mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-02 12:49:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,177 Commits 21 Branches 170 Tags
f07dec60628a6ff2c2ce43aaad091516fe477c65
Commit Graph

176 Commits

Author SHA1 Message Date
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
xeals
3d830a4449 Display nutritional energy in KJ with preference 2021-10-25 17:28:52 +11:00
vabene1111
54a2a45959 completed migration of file view to generic model list 2021-10-14 11:20:30 +02:00
vabene1111
1b1945d954 started migrating file editor page to generic model list 2021-10-13 15:03:59 +02:00
smilerz
613b618533 ExtendedRecipeMixin 2021-10-05 06:28:25 -05:00
vabene1111
b6d878e885 fixed model list error 2021-10-01 18:34:30 +02:00
smilerz
17cedf17b5 stubbed out new shopping list 2021-09-30 14:56:59 -05:00
smilerz
c1a22ea2a6 chain supermarket create/update to include categories 2021-09-27 17:55:58 -05:00
smilerz
b3cffa4a38 cached facet results 2021-09-26 16:44:12 -05:00
Kaibu
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
vabene1111
19d1e2d456 moved toast to bottom right to not obstruct modals 2021-09-15 14:35:03 +02:00
vabene1111
d6f7aade46 basics for automation 2021-09-15 13:07:25 +02:00
smilerz
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
smilerz
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05:00
vabene1111
aca526a9cd added sharing back to recipe books 2021-09-14 21:07:15 +02:00
smilerz
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
Kaibu
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
Kaibu
8b09777b2c Merge branch 'feature/books_refactor' into develop 
# Conflicts:
#	vue/webpack-stats.json
 2021-09-13 19:30:13 +02:00
Kaibu
fd8797e2b7 cookbook view refactored, minor ui fixes 2021-09-13 19:28:16 +02:00
vabene1111
79c1f2eb86 Merge branch 'develop' into generic_card_fix 2021-09-11 13:09:02 +02:00
smilerz
f6eb1b69cb card loading fixes 2021-09-10 11:37:27 -05:00
smilerz
aae3b679aa filter by recipe 2021-09-09 18:55:47 -05:00
smilerz
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
smilerz
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
smilerz
8420995aa8 updated RecipeSearch API 2021-09-07 13:52:14 -05:00
smilerz
c9d1a9b551 finished unit page 2021-09-06 14:00:32 -05:00
smilerz
84744560e0 infinite loader bug fixing 2021-09-06 12:28:14 -05:00
smilerz
7053a857c2 reworked MergeMixin to handle non-trees 2021-09-06 10:45:16 -05:00
smilerz
f12558951a moved keyword Vue to generic components 2021-09-05 16:26:01 -05:00
smilerz
d33a49538e Squashed commit of the following: 2021-09-05 11:18:57 -05:00
smilerz
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
smilerz
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00
smilerz
52abba1f16 stubbed out all Food GenericModalForms 2021-08-31 14:58:41 -05:00
smilerz
a1d1cbac5d refactored Generic API 2021-08-31 14:58:40 -05:00
smilerz
35dc981713 generic api mixin 2021-08-31 14:58:39 -05:00
smilerz
a605113b00 abstract merge function to handle all related models 2021-08-31 14:58:38 -05:00
vabene1111
31cb9e283a Merge branch 'develop' into feature/fulltext-search 
# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	requirements.txt
#	vue/src/apps/RecipeSearchView/RecipeSearchView.vue
#	vue/src/components/GenericMultiselect.vue
#	vue/src/locales/en.json
 2021-08-22 13:28:57 +02:00
smilerz
1f21631c5a yarn build 2021-07-30 16:30:23 -05:00
smilerz
2da0f5c478 keyword update, tests sqlite and PG 2021-07-30 14:00:09 -05:00