|
|
51076d4ced
|
Merge branch 'master' into develop
|
2022-07-13 10:25:39 +02:00 |
|
|
|
1cb37fe2d2
|
dont allow space manage page in demo
|
2022-07-13 10:25:22 +02:00 |
|
|
|
c50efac00e
|
basics for profile page
|
2022-07-12 20:57:13 +02:00 |
|
|
|
bf16e61a1f
|
removed unused stuff and fixed manifest
|
2022-07-12 20:52:32 +02:00 |
|
|
|
da09602834
|
removed old search pages
|
2022-07-12 20:05:59 +02:00 |
|
|
|
8bb7ce2062
|
removed user servings feature
|
2022-07-12 19:43:11 +02:00 |
|
|
|
5de7fa9d48
|
fixed another social auth issues
|
2022-07-12 19:41:46 +02:00 |
|
|
|
38219a22ca
|
fixed issue with social default access and multi space tennany
|
2022-07-11 23:42:26 +02:00 |
|
|
|
30e4ee855c
|
switch space method signature change and test
|
2022-06-09 18:18:57 +02:00 |
|
|
|
e2b887b449
|
lots of fixes and stuff
|
2022-06-06 18:21:15 +02:00 |
|
|
|
ded092ed23
|
baiscs of space edit page
|
2022-05-31 21:52:59 +02:00 |
|
|
|
007b7294d9
|
join and leave spaces
|
2022-05-31 20:38:53 +02:00 |
|
|
|
b3fcfdfc96
|
space switcher
|
2022-05-31 17:48:43 +02:00 |
|
|
|
151461508f
|
multi space membership basics
|
2022-05-31 17:38:12 +02:00 |
|
|
|
f872f994f1
|
fixed import failure with leading commas in input strings
|
2022-05-18 15:29:03 +02:00 |
|
|
|
66c0cc070a
|
removed old shopping list
|
2022-04-23 14:43:03 +02:00 |
|
|
|
e2ab3a0efb
|
fixed ingredient parser length issues
|
2022-04-23 14:15:06 +02:00 |
|
|
|
e0b7d1a8f0
|
added support for unit/amount at end of ingredient
|
2022-04-23 13:53:04 +02:00 |
|
|
|
012a1a7915
|
ingredient parser produces expected results again
|
2022-04-23 13:03:15 +02:00 |
|
|
|
2ddb0c719a
|
Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
# vue/src/apps/RecipeEditView/RecipeEditView.vue
# vue/src/utils/openapi/api.ts
|
2022-04-22 16:41:13 +02:00 |
|
|
|
45a86a22e3
|
recipe switcher and navbar fixes
also added left_hand to global preferences
|
2022-04-18 14:13:23 +02:00 |
|
|
|
f0d59a8c9c
|
added ability to open ingredient editor from food/unit list
|
2022-04-17 22:43:33 +02:00 |
|
|
|
7befa4a084
|
added basic ingredient editor
|
2022-04-14 13:01:27 +02:00 |
|
|
|
2565ab30a4
|
lots of improvements and bookmarklet import working again
|
2022-03-05 15:16:58 +01:00 |
|
|
|
55b035eaaa
|
first boilerplate for new import view
|
2022-02-19 09:34:42 +01:00 |
|
|
|
4e8bbefc17
|
minor cleanup
|
2022-02-15 06:42:57 -06:00 |
|
|
|
bf54680178
|
more recipe search tests
|
2022-02-13 13:53:07 -06:00 |
|
|
|
88b3ba1427
|
various fixes
|
2022-02-08 08:13:16 -06:00 |
|
|
|
39ca3ac1ad
|
no system page for non superuser
|
2022-02-07 13:08:18 +01:00 |
|
|
|
d01cb26c4a
|
length filter for add to old shopping list
|
2022-02-03 15:46:59 +01:00 |
|
|
|
c20e982fb1
|
Fix typos
|
2022-01-20 00:50:41 +01:00 |
|
|
|
4e0cc34d41
|
better fix for counting facets
|
2022-01-17 17:18:43 -06:00 |
|
|
|
2c76fb7b69
|
make food onhand when complete shopping entry
|
2022-01-05 15:20:10 -06:00 |
|
|
|
79b4bc387e
|
change ingore_inherit to inherit_fields
|
2021-12-30 12:54:39 -06:00 |
|
|
|
ee4ab41c1c
|
test shoppingFood API
|
2021-12-28 12:03:34 -06:00 |
|
|
|
24b0643765
|
copy shopping as markdown
|
2021-12-28 12:03:34 -06:00 |
|
|
|
a217db5822
|
add new unit/food from shopping list
|
2021-12-28 12:03:32 -06:00 |
|
|
|
7a0b395107
|
alpha shopping list
|
2021-12-28 12:03:32 -06:00 |
|
|
|
7c598720d0
|
WIP
|
2021-12-28 12:03:32 -06:00 |
|
|
|
10a33add75
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
|
|
55a0304700
|
add search debug
|
2021-11-24 12:10:15 -06:00 |
|
|
|
dda2529f6f
|
fixed plan share space filter
|
2021-11-05 19:42:41 +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 |
|
|
|
b1b770c9e5
|
Add KJ user preference
|
2021-10-25 17:25:35 +11:00 |
|
|
|
54a2a45959
|
completed migration of file view to generic model list
|
2021-10-14 11:20:30 +02:00 |
|
|
|
20db5cfd74
|
search presets
|
2021-09-30 13:46:49 +02:00 |
|
|
|
856c34a3bf
|
fixed and expanded on trigram search
|
2021-09-28 19:12:51 +02:00 |
|
|
|
a7dc23194e
|
converted ingredient parser to class and added automation beta hint
|
2021-09-16 17:52:11 +02:00 |
|
|
|
d9300a9a90
|
meal planner refactor progress
|
2021-09-14 23:16:33 +02:00 |
|
