smilerz
554170a84e
Merge pull request #2615 from smilerz/clear_food_after_add
...
clears search on food in shopping form
2023-09-12 15:06:23 -05:00
smilerz
d43a6e551d
Merge pull request #2617 from smilerz/ignore_shopping_fix
...
respect ignore_shopping flag
2023-09-12 15:06:13 -05:00
smilerz
02cb6d1be7
Merge pull request #2619 from smilerz/meal_plan_date
...
update Meal Plan grid to respect localization on date format
2023-09-12 15:05:58 -05:00
smilerz
45b1eca48b
Merge pull request #2621 from smilerz/fix_recipe_count
...
fix recipe counting issue on extended mixin
2023-09-12 15:05:30 -05:00
smilerz
6dacd44f1f
regenerate openapi
2023-09-12 09:53:59 -05:00
smilerz
1b97472368
Squashed commit of the following:
...
commit 52909e8117
2023-09-12 09:48:41 -05:00
smilerz
d467352029
Squashed commit of the following:
...
commit c8fc6b5237
2023-09-12 09:48:22 -05:00
smilerz
a0256b607e
Squashed commit of the following:
...
commit f8f08ae337
2023-09-12 09:47:55 -05:00
smilerz
847fceaf10
Squashed commit of the following:
...
commit 4aa3e04df0
2023-09-12 09:47:07 -05:00
smilerz
9e831a22df
Squashed commit of the following:
...
commit bcfe6ca707
2023-09-12 09:46:42 -05:00
smilerz
768a5ea237
Squashed commit of the following:
...
commit 36403ecbae4620ebaf30c907da84c19b5e39415e2679a224648bae21025b4120adc54630c891abfcb8317c2c2939253cfd027c0b8b151c8e1b8923af52eb876a08a820b9c09e
2023-09-12 09:46:08 -05:00
smilerz
36403ecbae
update migration for new Automation Types
2023-09-12 09:42:09 -05:00
smilerz
4620ebaf30
add Name and Instruction automation to YouTube importer
2023-09-12 09:42:09 -05:00
smilerz
c907da84c1
remove old commented automation code
2023-09-12 09:42:08 -05:00
smilerz
9b5e39415e
test for automations applied during url import
...
renamed TITLE_REPLACE to NAME_REPLACE
2023-09-12 09:42:08 -05:00
smilerz
2679a22464
added tests for regex_replace
2023-09-12 09:42:07 -05:00
smilerz
8bae21025b
updated Automation Modal and translations
2023-09-12 09:42:07 -05:00
smilerz
4120adc546
applied regex_replace automation to food and unit automations
...
updated automation documentation
2023-09-12 09:41:49 -05:00
smilerz
30c891abfc
migrate regex_replace functions to AutomationEngine
...
create TITLE_REPLACE, UNIT_REPLACE and FOOD REPLACE automation types
create migration for new types
2023-09-12 09:41:49 -05:00
smilerz
b8317c2c29
move transpose words to AutomationEngine
...
create tests for transpose words
2023-09-12 09:40:17 -05:00
smilerz
39253cfd02
refactor never_unit automation to AutomationEngine
...
create tests for never_unit
2023-09-12 09:40:17 -05:00
smilerz
7c0b8b151c
update ingredient parser to use AutomationEngine for unt, keyword, food
...
update test_ingredient_parser tests to accomodate changes
2023-09-12 09:40:17 -05:00
smilerz
8e1b8923af
keyword and unit Automtations refactored to Automation Engine
...
keyword and unit automation tests added
2023-09-12 09:40:16 -05:00
smilerz
52eb876a08
food_alias tests added
2023-09-12 09:39:45 -05:00
smilerz
a820b9c09e
create AutomationEngine class
...
create food_automation method
refactor food automations to use AutomationEngine
2023-09-12 09:39:45 -05:00
smilerz
bcfe6ca707
fix custom_filter exports and errors on Download link
2023-09-12 09:36:44 -05:00
smilerz
4aa3e04df0
clears search on food in shopping form
2023-09-12 09:30:47 -05:00
smilerz
f8f08ae337
respect ignore_shopping flag
2023-09-12 09:29:11 -05:00
smilerz
c8fc6b5237
update Meal Plan grid to respect localization on date format
2023-09-12 09:25:42 -05:00
smilerz
52909e8117
fix recipe counting issue on extended mixin
2023-09-12 09:21:18 -05:00
vabene1111
c72bf57ccb
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2023-09-12 16:08:33 +02:00
vabene1111
d3c21cf97f
updated django
2023-09-12 16:08:28 +02:00
vabene1111
942edd9336
Merge pull request #2604 from TandoorRecipes/dependabot/pip/icalendar-5.0.7
...
Bump icalendar from 5.0.4 to 5.0.7
2023-09-12 16:07:35 +02:00
vabene1111
8fa6c98254
updated crispy forms
2023-09-12 16:07:16 +02:00
vabene1111
73c6bfce44
Merge pull request #2595 from djstini/develop
...
#2514 Importing a community curated list leads to an error
2023-09-12 16:00:25 +02:00
vabene1111
c105909933
Merge pull request #2603 from TandoorRecipes/dependabot/pip/django-oauth-toolkit-2.3.0
...
Bump django-oauth-toolkit from 2.2.0 to 2.3.0
2023-09-12 15:57:57 +02:00
vabene1111
13baf4f30a
Merge pull request #2605 from TandoorRecipes/dependabot/pip/django-scopes-2.0.0
...
Bump django-scopes from 1.2.0.post1 to 2.0.0
2023-09-12 15:56:52 +02:00
vabene1111
da5fd16338
fixed lockfile
2023-09-12 15:56:28 +02:00
vabene1111
83a52bd204
Merge pull request #2593 from BrainWart/issue-2261
...
allow signup for social accounts when the provider is set up
2023-09-12 15:50:32 +02:00
vabene1111
fe4bd6a127
Merge pull request #2624 from WoosterInitiative/Update-settings
...
Update and add settings
2023-09-12 15:43:41 +02:00
vabene1111
d193d91e6a
fixed migration
2023-09-12 15:41:38 +02:00
vabene1111
a2f9ef2e74
Merge pull request #2623 from smilerz/remove_facets
...
remove facets and treeselect
2023-09-12 15:36:24 +02:00
vabene1111
3f63eab68c
Merge branch 'develop' into remove_facets
2023-09-12 15:36:14 +02:00
Karl
9b6ed7a63a
Update .env.template
...
Add option for CSRF_TRUSTED_ORIGINS for better discoverability.
Add options for newly added CORS_ALLOW_ALL_ORIGINS for discoverability as well as flexibility.
2023-09-08 12:31:46 -07:00
Karl
e2f8efb521
Update settings.py
...
Add deprecation notice for `CORS_ORIGIN_ALLOW_ALL` and auto switch to `CORS_ALLOW_ALL_ORIGINS`
2023-09-08 12:29:06 -07:00
vabene1111
ce29283a52
fixed auto meal plan
2023-09-08 17:05:35 +02:00
vabene1111
dcf9d59b06
add more height to meal plan
2023-09-08 16:59:52 +02:00
vabene1111
794f9cf5b9
fixed meal plan factory
2023-09-08 16:38:38 +02:00
vabene1111
9954bb9410
fixed test and added meal plan client settings load save
2023-09-08 16:27:39 +02:00
vabene1111
e57be4a704
fixed lockfile
2023-09-08 15:47:08 +02:00
