Commit Graph

801 Commits

Author SHA1 Message Date
3b946e512c Aligned formatting. 2022-02-04 14:04:05 -08:00
d2a6409381 Fixed parsing error, } should've been included 2022-02-04 14:02:50 -08:00
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
3501bcadb1 removed old cook log modal 2022-02-03 15:44:57 +01:00
a0892470e1 Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
4a48019885 fix duplicate shopping entries when using old list 2022-01-26 14:47:33 -06:00
f274f31e80 fixed unit search on importer page 2022-01-21 16:56:47 +01:00
c20e982fb1 Fix typos 2022-01-20 00:50:41 +01:00
2a13a341dd enable/disable treeselect 2022-01-18 08:17:54 -06:00
edd47873f7 fixed signup button and autofocus on user input fields 2022-01-17 16:51:04 +01:00
ddb9e70d31 fix url_import 2022-01-17 09:46:26 -06:00
dde350c8af prettier cleanup 2022-01-17 08:35:19 -06:00
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
7c48c13dce Added export from url args 2022-01-08 13:37:26 -05:00
9c873127a5 Added loading page 2022-01-08 11:07:33 -05:00
30683fe455 Merge pull request #1252 from smilerz/sw_at_ScriptName
change manifest paths to be relative
2022-01-07 15:39:49 +01:00
5e2ca250b0 fixed nav and export required recipe 2022-01-07 11:01:53 +01:00
983d66c197 change manifest paths to be relative 2022-01-06 15:11:24 -06:00
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
3047c09e55 test rest food inheritance 2021-12-28 12:03:34 -06:00
7ad088d953 fix after rebase 2021-12-28 12:03:33 -06:00
94b2e9b01c minor updates 2021-12-28 12:03:33 -06:00
f245aa8b4f add to shopping from card context menu 2021-12-28 12:03:32 -06:00
a217db5822 add new unit/food from shopping list 2021-12-28 12:03:32 -06:00
ecac3f3c2d related recipes included when adding mealplan to shopping list 2021-12-28 12:03:32 -06:00
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
3ff15b6766 added copy me that importer 2021-12-23 15:54:48 +01:00
05f2fdecb3 fixes 1123 2021-12-23 07:44:11 -06:00
4d2e7eadb6 Merge branch 'develop' into generic_modal_v2 2021-11-30 17:23:27 +01:00
55a0304700 add search debug 2021-11-24 12:10:15 -06:00
5b6dd62f8e generic modal refactored 2021-11-23 19:18:10 -06:00
4288d76afd added more translations 2021-11-07 17:32:43 +01:00
1fad1d2b8f improved deletion of recipes 2021-11-04 12:27:21 +01:00
2215e06506 translation fixes 2021-11-03 21:34:18 +01:00
a40c8c3f83 added password reset from key templates 2021-11-03 20:44:36 +01:00
c9bd3ccae8 Merge branch 'develop' into feature/kilojoules 2021-11-01 09:46:04 +01:00
31720927b1 deprecated old meal plan 2021-10-31 18:08:37 +01:00
6949e17a33 possibly fixed sub path hosting issues 2021-10-29 11:29:55 +02:00
0091abd2c0 fixed typo 2021-10-26 14:51:30 +02:00
c9ff0543e3 Convert nutrition input from KJ to calories with preference 2021-10-25 17:37:31 +11:00
3d830a4449 Display nutritional energy in KJ with preference 2021-10-25 17:28:52 +11:00
8363b1925c Merge pull request #971 from vabene1111/feature/meal_plan_shopping
Feature/meal plan shopping
2021-10-21 20:36:44 +02:00
24c1bfa16f shopping and new nav for meal plan 2021-10-21 19:07:12 +02:00
ae12b8111d added debug info to system page 2021-10-20 17:51:23 +02:00
70df8a5ffd show better error message when recipe deletion breaks due to constraints 2021-10-19 18:22:18 +02:00
12b3d3a188 fixed shopping list decimal rounding 2021-10-19 17:03:24 +02:00
2e2b79c093 ical export and tooltips for new meal plan 2021-10-17 15:11:30 +02:00
54a2a45959 completed migration of file view to generic model list 2021-10-14 11:20:30 +02:00
4b1443a705 new meal type edit 2021-10-13 14:50:52 +02:00
38c0d01dc1 fixed old shopping list containing to many decimal places 2021-10-13 11:40:49 +02:00