Commit Graph

446 Commits

Author SHA1 Message Date
f57d2ca832 improved open data importer and fdc API 2024-02-18 08:50:50 +01:00
9cf13e898c all types of unit conversion fixed 2024-02-17 10:10:09 +01:00
705fa18dd6 fixed open data property type and category 2024-02-17 08:43:41 +01:00
631af65cf3 Merge pull request #2810 from m7modSy/develop
Reorder books #2338
2024-02-16 19:53:38 +01:00
03c775d1cc added merge capabilities to supermarket category 2024-02-10 09:01:21 +01:00
dffb2d4eae fixed test 2024-02-06 14:42:14 +01:00
4eafbddfdb fixed SLE api endpoint 2024-02-02 09:31:33 +01:00
bb1b1a40b6 fixed search on userfile and supermarket generic select 2024-02-01 20:00:51 +01:00
77f81523d0 lmiit SLE endpoint and always fitler for recent days 2024-01-29 09:02:11 +01:00
d4fbc266a1 removing wrong import and deleting migrations 2024-01-28 14:04:50 +01:00
67f6e04680 Merge branch 'develop' into feature/shopping-ui 2024-01-28 08:32:31 +01:00
d10c70b797 fixed iCal endpoint 2024-01-28 08:21:57 +01:00
7de9758ee1 auto sync proper data merging 2024-01-20 02:17:48 +08:00
764cd7dba0 SLE bulk permission and tests 2024-01-17 22:32:34 +08:00
2697e42af7 added bulk api endpoint for SLE checking 2024-01-16 08:06:26 +08:00
3cab0ab52e basic auto sync working 2024-01-04 20:22:31 +01:00
146e97c8ec Merge branch 'develop' into feature/shopping-ui
# Conflicts:
#	vue/src/locales/en.json
2024-01-03 15:09:30 +01:00
200cacb9ac changed keywords to be index based. 2024-01-02 18:44:23 -07:00
3d8b1d6ccb lots of theming related changes
- upload a custom logo for your space
    - space settings can override user settings for theming
    - spaces can upload custom CSS overrides
    - allow users to disable showing the tandoor/space logo
    - allow changing navigation background color to any color desired
    - allow switching navigation text color between dark/light (different effects depending on theme)
2024-01-01 22:14:01 +01:00
c76f5d9482 starting work on new sync algorithm 2024-01-01 12:01:39 +01:00
3b916cc6a4 fixed schema for recipe from source endpoint 2023-12-22 14:48:58 +01:00
99cd9bfb5b update meal_type filter on MealPlan to be a list 2023-12-19 12:59:24 -06:00
205bf5253d add ability to filter meal plans based on type 2023-12-19 12:59:19 -06:00
45c14f6a12 automatic ordering through api 2023-12-17 16:35:46 +01:00
dd3e91e10d added ability to set rate limiting for url import 2023-12-16 09:19:12 +01:00
3054297357 improved error handling and fixed meal plan api 2023-12-02 18:11:09 +01:00
d1174ea50d fixed api comment 2023-12-02 17:42:04 +01:00
fe11b88fd0 pretty nice property editor 2023-12-02 17:41:02 +01:00
0a0e3a48c3 first working property editor prototype 2023-11-29 21:20:10 +01:00
3c08e3a3f1 Improve import error messages 2023-11-10 13:28:20 +01:00
e89c1742fb remove deprecated django.db.backends.postgresql_psycopg2 2023-10-30 21:42:57 -05:00
538fb8b42e remove unused imports, vairables and commented code
from views, and base cookbook and recipes modules
2023-09-13 13:31:53 -05:00
1b97472368 Squashed commit of the following:
commit 52909e8117
Author: smilerz <smilerz@gmail.com>
Date:   Wed Sep 6 15:54:23 2023 -0500

    fix recipe counting issue on extended mixin
2023-09-12 09:48:41 -05:00
a0256b607e Squashed commit of the following:
commit f8f08ae337
Author: smilerz <smilerz@gmail.com>
Date:   Wed Sep 6 10:27:43 2023 -0500

    respect ignore_shopping flag
2023-09-12 09:47:55 -05:00
3f63eab68c Merge branch 'develop' into remove_facets 2023-09-12 15:36:14 +02:00
ce29283a52 fixed auto meal plan 2023-09-08 17:05:35 +02:00
94f398a7f6 added multi day meal planning 2023-09-08 15:31:42 +02:00
9ee4be621b remove facets and treeselect 2023-09-07 13:20:51 -05:00
05560c5730 improved user agent for url image import 2023-08-26 07:54:19 +02:00
8ff5142149 auto meal plan tweaks and improvements 2023-08-16 07:10:24 +02:00
f07dec6062 Merge pull request #2468 from AquaticLava/Auto-Planner
Auto meal plan
2023-08-16 06:18:43 +02:00
ecd828008e added auto shopping functionality. fixed bug when there are no matching recipes 2023-08-01 21:52:59 -06:00
df684f591a added share functionality. changed random recipe selection to prevent repeating duplicate choices. 2023-08-01 17:02:05 -06:00
a497a6b7f5 space api read for all users in space 2023-07-15 13:57:25 +02:00
e9748a160a addded paginated user space endpoint 2023-07-11 17:01:56 +02:00
7a2ccc075c improved shopping entry api endpoint performance 2023-07-04 16:49:56 +02:00
ac1d641bd5 added RO DRF permission and internal_note filters for invite/userspace 2023-07-03 21:59:15 +02:00
cc64717818 auto add schema attrs in json importer 2023-06-26 20:22:59 +02:00
bf458e22e8 fixed merging deleting food properties 2023-06-24 11:52:42 +02:00
ee38d93e3b Created auto meal plan api endpoint. 2023-06-21 19:31:49 -06:00