vabene1111
|
f5837fdbd2
|
Merge branch 'develop' into feature/vue3
|
2025-01-29 20:22:04 +01:00 |
|
vabene1111
|
aa903da042
|
fixed file type check case sensitivity
|
2025-01-28 07:37:37 +01:00 |
|
vabene1111
|
503a4881fe
|
Merge branch 'develop' into feature/vue3
|
2025-01-19 18:44:14 +01:00 |
|
smilerz
|
157af15a2a
|
added (',', ';', ':') to notes tokenization in ingredient_parser.py
|
2025-01-18 09:29:09 -06:00 |
|
vabene1111
|
1d2bfb4462
|
Merge branch 'develop' into feature/vue3
|
2025-01-18 11:33:57 +01:00 |
|
vabene1111
|
cb26c5dfc8
|
allow gif
|
2025-01-18 09:23:56 +01:00 |
|
vabene1111
|
3e37d11c6a
|
restrict file upload to certain types
|
2025-01-18 09:22:29 +01:00 |
|
vabene1111
|
325ee16d39
|
importer stuff
|
2024-12-12 17:26:01 +01:00 |
|
vabene1111
|
e3f20459dd
|
basic url importer working
|
2024-12-08 21:54:14 +01:00 |
|
vabene1111
|
425f00860f
|
Merge branch 'develop' into feature/vue3
# Conflicts:
# docs/features/authentication.md
|
2024-11-27 15:56:28 +01:00 |
|
vabene1111
|
e6087d5129
|
use Sandbox Environment to render templates
|
2024-11-26 17:18:47 +01:00 |
|
vabene1111
|
78d20e8340
|
removed log
|
2024-11-23 21:59:40 +01:00 |
|
vabene1111
|
98c95a94bc
|
fixed youtube importer
|
2024-11-23 21:56:32 +01:00 |
|
vabene1111
|
39ab8b00c4
|
Merge branch 'develop' into feature/vue3
|
2024-08-24 08:29:04 +02:00 |
|
smilerz
|
b6fa74c601
|
text
|
2024-08-22 12:45:49 -05:00 |
|
vabene1111
|
b5e0055876
|
Merge branch 'develop' into feature/vue3
# Conflicts:
# cookbook/views/api.py
# vue/src/utils/models.js
|
2024-08-20 11:54:19 +02:00 |
|
vabene1111
|
f6f6754669
|
removed validators library and improved url validation
|
2024-08-20 11:45:23 +02:00 |
|
vabene1111
|
752a25b1f8
|
fixed comma
|
2024-08-18 14:41:17 +02:00 |
|
cleo miao
|
8c8bb159ea
|
Update unit_conversion_helper.py
added us cup as a volume measurement
|
2024-08-14 02:43:19 +02:00 |
|
vabene1111
|
0e44243e55
|
Merge branch 'develop' into feature/vue3
# Conflicts:
# recipes/settings.py
# requirements.txt
|
2024-08-01 15:03:40 +02:00 |
|
smilerz
|
a02582e9f8
|
rebase
|
2024-07-09 08:01:39 -05:00 |
|
vabene1111
|
930e686cbd
|
Merge branch 'develop' into feature/vue3
# Conflicts:
# .env.template
# cookbook/views/views.py
# requirements.txt
|
2024-07-09 07:26:11 +02:00 |
|
smilerz
|
6385866e98
|
url import fixes
|
2024-07-08 08:35:59 -05:00 |
|
vabene1111
|
e405aab310
|
no longer split schema in request/response
|
2024-04-27 10:40:09 +02:00 |
|
smilerz
|
4771f890cb
|
add ability to generate legacy API with legacy naming scheme
regenerate legacy API
|
2024-04-26 12:21:34 -05:00 |
|
vabene1111
|
12cf9da8fc
|
fixed api client generation
|
2024-04-22 19:33:09 +02:00 |
|
vabene1111
|
849856df26
|
Merge branch 'develop' into feature/vue3
# Conflicts:
# cookbook/views/api.py
|
2024-04-14 21:24:43 +02:00 |
|
smilerz
|
1700b9c531
|
change test_automations to use scrape_html
remove reliance on custom text_scraper class
changed url on test case to generic wildmode vs specific site
|
2024-04-12 09:20:56 -05:00 |
|
smilerz
|
7133249f4b
|
update recipe_scrapers to use scrape_html
scrape_me has been deprecated
|
2024-04-12 08:11:59 -05:00 |
|
vabene1111
|
dfd9f7b066
|
posprocessing hook for DRF
|
2024-03-30 11:01:37 +01:00 |
|
smilerz
|
2475eadab9
|
Merge remote-tracking branch 'upstream/feature/vue3' into feature/vue3
|
2024-03-28 07:59:44 -05:00 |
|
smilerz
|
2c12ce3edf
|
added permissions to docs/api
added swagger api view
added authentication method to openapi schema
added logo to docs/api
fixed tree and merge schemas
|
2024-03-27 15:45:51 -05:00 |
|
vabene1111
|
b67281bbc8
|
fixed property helper calculation
|
2024-03-25 20:27:33 +01:00 |
|
smilerz
|
149cf93618
|
removed unused CustomTestRunner
|
2024-03-21 08:56:21 -05:00 |
|
vabene1111
|
312c215813
|
Merge branch 'develop' into feature/vue3
# Conflicts:
# cookbook/urls.py
|
2024-03-09 14:34:44 +01:00 |
|
vabene1111
|
1a31847223
|
Merge branch 'develop' into deprecate_old_code
|
2024-02-28 17:10:03 +01:00 |
|
smilerz
|
8f65ecfc18
|
remove dal autocomplete
|
2024-02-20 17:14:55 -06:00 |
|
smilerz
|
c8c8792ea8
|
remove ShoppingList model and tests
|
2024-02-20 17:09:18 -06:00 |
|
Mikhail Epifanov
|
3e641e4d28
|
Merge remote-tracking branch 'origin/develop' into HomeAssistantConnector
# Conflicts:
# cookbook/forms.py
# requirements.txt
|
2024-02-20 09:18:19 +01:00 |
|
vabene1111
|
de80702e3f
|
fixed property duplicate detection
|
2024-02-20 07:54:13 +01:00 |
|
vabene1111
|
fece7e9bd6
|
fixed food create
|
2024-02-19 19:57:56 +01:00 |
|
vabene1111
|
b109e28b0c
|
almost all unit conversion working
|
2024-02-19 17:20:04 +01:00 |
|
vabene1111
|
33ac00e294
|
improved importer functions unit and category
|
2024-02-19 09:41:45 +01:00 |
|
vabene1111
|
3a349b1bd2
|
use ID in unit food import
|
2024-02-18 21:38:52 +01:00 |
|
vabene1111
|
f085e7ff2f
|
fixed merging issue
|
2024-02-18 21:35:16 +01:00 |
|
vabene1111
|
ac68fd30ae
|
fixed two more import errors
|
2024-02-18 21:30:02 +01:00 |
|
vabene1111
|
7c1de82c8a
|
what you get for not testing locally
|
2024-02-18 18:12:24 +01:00 |
|
vabene1111
|
7bc567ab95
|
name uniquness checking for food import
|
2024-02-18 18:01:59 +01:00 |
|
vabene1111
|
bfb8c31329
|
fixed issue in open data importer
|
2024-02-18 17:51:01 +01:00 |
|
vabene1111
|
9e63c5321e
|
fixed property calculation issues
- don't count ingredients without amounts as missing properties
- don't fail when property_amount is null
|
2024-02-18 17:45:56 +01:00 |
|