Commit Graph

2544 Commits

Author SHA1 Message Date
7b49f1f437 Translated using Weblate (Spanish)
Currently translated at 56.1% (275 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/es/
2023-05-26 16:19:57 +00:00
256b7b1543 Merge branch 'develop' into feature/unit-conversion
# Conflicts:
#	cookbook/helper/recipe_url_import.py
2023-05-26 16:11:11 +02:00
ebc213395d added property api test 2023-05-26 16:06:49 +02:00
aeb944b281 dont show properties if no reference amout is given 2023-05-26 15:32:55 +02:00
43105ddd2f fixed onhand test (cache) and fixed shared recipe properties 2023-05-26 10:57:08 +02:00
3302dacdc3 properties structure imporioved 2023-05-25 16:13:16 +02:00
4c69a0b721 fixed json import missing source url attribute 2023-05-24 20:32:47 +02:00
2a538abf80 test work 2023-05-24 15:59:25 +02:00
3236b65d9e food editor and property view improvements 2023-05-24 13:49:29 +02:00
79cd17a5ba Merge branch 'develop' into feature/unit-conversion
# Conflicts:
#	vue/src/components/Modals/GenericModalForm.vue
2023-05-24 08:53:49 +02:00
06a08dcf6e allow plugins to add navs 2023-05-23 16:05:12 +02:00
976445c1f0 Merge pull request #2435 from screendriver/noindex
Prevent indexing content by search engines
2023-05-23 13:11:12 +02:00
b095bee229 added FDA key .env (temporarily) and plugin loader catch block 2023-05-22 17:47:13 +02:00
c777cfe5b9 improved plugin functionality
- added abiulity to extend default api router from plugion
- added dability to pass custom model definition to generic model/api functions
- added ability to pass custom API clients to generic API function
2023-05-20 12:53:14 +02:00
e860d0aa83 Merge branch 'develop' into feature/unit-conversion 2023-05-18 14:29:39 +02:00
ddd2f96b85 updated translations 2023-05-18 14:29:19 +02:00
2a5cba0178 improvements to property calculation 2023-05-07 00:30:32 +02:00
9a77089c6d improved unit conversion and tests 2023-05-06 23:57:45 +02:00
5f79895a97 added migration for existing nutrition information 2023-05-06 23:21:09 +02:00
19f5da77b2 cleanup migrations, remove pint to speed up base conversion and calculate properties on converted ingredients 2023-05-06 22:21:27 +02:00
2cc7278865 extremly innefficent WIP 2023-05-06 20:54:36 +02:00
60f31608b9 added recipe properties 2023-05-06 19:14:25 +02:00
763f71a05c cleanup views 2023-05-06 17:40:39 +02:00
e3921cd6a8 Merge branch 'develop' into feature/unit-conversion 2023-05-06 17:01:06 +02:00
86fd0dcab1 made the open data importer its own component 2023-05-05 16:33:30 +02:00
6b04c92297 Fix multiple file field
Due to [1], the previous solution does not work on recent Django releases.

See [2] for the documented work-around, as applied in this commit.

Closes #2457.

[1]: https://docs.djangoproject.com/en/4.2/releases/4.2.1/
[2]: https://docs.djangoproject.com/en/4.2/topics/http/file-uploads/#uploading-multiple-files
2023-05-04 22:41:19 +01:00
12da77f037 beser response and stuff 2023-05-04 17:12:49 +02:00
071926aada improved importer merging behavior 2023-05-04 15:29:06 +02:00
33d048e623 improve importer 2023-05-04 08:43:36 +02:00
135640dd58 Merge pull request #2454 from smilerz/pytest_fixes
reload food objects to resolve inconsistent behavior
2023-05-03 19:24:46 +02:00
d8ddf66921 reload food objects to resolve inconsistent behavior 2023-05-03 10:17:59 -05:00
274fce5236 fixed importer 2023-05-02 16:27:03 +02:00
1046065f46 fixed load bulk 2023-05-01 22:36:39 +02:00
60243ad901 load bulk 2023-05-01 13:39:09 +02:00
d62c49eb2f not yet fully working food import 2023-05-01 13:29:14 +02:00
ea4c16cc2a Translated using Weblate (Russian)
Currently translated at 9.6% (48 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/ru/
2023-05-01 07:55:47 +00:00
1bb6eb7141 import open data content 2023-04-30 22:30:56 +02:00
89e3e85d1e Merge branch 'develop' into feature/unit-conversion
# Conflicts:
#	requirements.txt
2023-04-30 21:51:56 +02:00
dfde340447 basic import working 2023-04-30 21:51:28 +02:00
e7239c7c68 Translated using Weblate (Italian)
Currently translated at 91.4% (448 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
2023-04-29 07:55:49 +00:00
cf86af7a23 Translated using Weblate (Romanian)
Currently translated at 100.0% (509 of 509 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/ro/
2023-04-27 08:55:57 +00:00
4337f594f6 Translated using Weblate (German)
Currently translated at 100.0% (489 of 489 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2023-04-27 08:55:57 +00:00
44771bde71 Prevent indexing content by search engines 2023-04-26 12:19:30 +02:00
7d99a9a9c3 updated translation files 2023-04-26 07:46:48 +02:00
b711ee5257 update User factory to make username unique 2023-04-24 07:33:47 -05:00
c7b6253e04 fixed food tree search filter tests 2023-04-24 07:01:28 -05:00
595de0c5a1 fixed pytests 2023-04-22 17:56:01 -05:00
8c3195937b fix food tests 2023-04-21 13:14:23 -05:00
29f13d687c Translated using Weblate (Norwegian Bokmål)
Currently translated at 52.8% (196 of 371 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nb_NO/
2023-04-17 20:55:47 +00:00
668ccf89fd Translated using Weblate (Norwegian Bokmål)
Currently translated at 28.8% (107 of 371 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nb_NO/
2023-04-15 22:55:47 +00:00