Michael Lipschultz
f489043077
Assign authenticated user to created_by
2020-12-26 09:09:47 -05:00
vabene1111
bdd004518c
verified and updated importer tests
2020-12-26 14:50:54 +01:00
vabene1111
840f5ec60d
added ingredient parser test
2020-12-26 13:57:51 +01:00
vabene1111
566eea1d75
Merge pull request #277 from l0c4lh057/master
...
Improve text to ingredient parsing
2020-12-26 13:52:24 +01:00
vabene1111
bb48655acb
Merge pull request #279 from l0c4lh057/improve
...
Minor improvements
2020-12-26 13:48:54 +01:00
vabene1111
d723165b1c
updated base translations
2020-12-26 13:48:33 +01:00
vabene1111
592bd4f11e
fixed some english translations
2020-12-26 13:46:55 +01:00
vabene1111
0aec23fcdd
added tests for recipe view permissions
2020-12-26 13:28:49 +01:00
vabene1111
d364994ed7
compiled messages
2020-12-26 13:14:36 +01:00
vabene1111
1f5c02bcc3
Merge branch 'develop' into translations_cookbook-locale-en-lc-messages-django-po--develop_nl
2020-12-26 10:52:27 +01:00
transifex-integration[bot]
f753b63b13
Apply translations in es
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'es' language.
2020-12-25 22:47:41 +00:00
transifex-integration[bot]
5899527621
Apply translations in nl
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
2020-12-23 15:13:42 +00:00
Aaron
0a40de0f14
Add min/max to servings spinner
2020-12-22 23:52:40 +01:00
Aaron
bc31f013c0
Fix 'All Keywords' label in website import
2020-12-22 23:51:55 +01:00
Aaron
e7fc15dc72
Show advanced search again if it was used
2020-12-22 23:50:59 +01:00
Aaron
79396cec9e
switch from double to single quotes
2020-12-21 22:42:27 +01:00
Aaron
5e07c6130f
Switch to 4-space indentation
2020-12-21 20:14:32 +01:00
Aaron
94e1fdfbff
Improve text to ingredient parsing
...
The previous implementation of parsing ingredients was very simple. I now wrote a parser
that I would consider good. It takes care of several edge cases and notations.
- Supports fraction unicode (½, ¼, ⅜, ...)
- Supports notations like `1½` and `1 1/2`
- Supports unit directly after the amount without space inbetween (`2g`, `2½g`)
- Supports notes (`5g onion (cubed)` -> amount: 5, unit: g, ingredient: onion, note: cubed)
- Supports notes (`5g onion, cubed` -> amount: 5, unit: g, ingredient: onion, note: cubed)
- Does not break when both commas and brackets exist
2020-12-21 20:00:46 +01:00
transifex-integration[bot]
ec31d251ea
Apply translations in it
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2020-12-18 12:09:20 +00:00
transifex-integration[bot]
3f6a342026
Apply translations in fr
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'fr' language.
2020-12-16 14:47:47 +00:00
vabene1111
f72fc699f8
fixed import image error
2020-12-15 22:54:10 +01:00
vabene1111
7ca88f3c0a
fixed scaling for fractions
2020-12-15 22:16:15 +01:00
vabene1111
ac2e9dd6cb
updated german translation
2020-12-15 22:04:40 +01:00
transifex-integration[bot]
6124501f5a
Apply translations in de
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.
2020-12-15 21:03:40 +00:00
vabene1111
4ec313f752
fixed another importer issue
2020-12-15 21:59:34 +01:00
vabene1111
dd07c56ede
fixed issue with new fraction importer
2020-12-15 21:52:56 +01:00
vabene1111
77fae46aee
translation updates
2020-12-15 21:39:42 +01:00
transifex-integration[bot]
247eab2a4f
Apply translations in ca
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'ca' language.
2020-12-15 12:00:28 +00:00
vabene1111
9ea90f1c87
fraction import
2020-12-14 19:56:21 +01:00
vabene1111
e7922a7e47
nutirtion fix
2020-12-14 19:12:01 +01:00
vabene1111
d3bc440c83
meal plan quality of life stuff
2020-12-14 17:37:51 +01:00
vabene1111
910b28fe2d
meal plan date handling rewrite
2020-12-14 17:11:40 +01:00
vabene1111
89cd8bc2d2
fixed wrong translation
2020-12-14 15:49:32 +01:00
vabene1111
56c9edd328
removed deprecated psycopg2
2020-12-14 15:11:41 +01:00
vabene1111
7732aa7646
added support for fractions
2020-12-14 14:08:11 +01:00
vabene1111
9863447bac
small nutrition fixes
2020-12-14 12:56:18 +01:00
vabene1111
53b00cc4c8
Merge pull request #199 from sebimarkgraf/feature/nutrition
...
Add nutritional values
2020-12-14 12:29:56 +01:00
vabene1111
a5d2bd75d6
recompiled messages + added timezone setting
2020-12-14 12:03:43 +01:00
Sebastian Markgraf
422113a745
Finish editing of nutritional information
2020-11-17 22:27:01 +01:00
Sebastian Markgraf
c4fbad614e
Include random in filtermixin
2020-11-14 20:20:30 +01:00
vabene1111
4c92a4b39c
fixed shopping list recipe search
2020-11-14 11:20:43 +01:00
vabene1111
c413db5460
fixed english typo
2020-11-14 11:16:01 +01:00
vabene1111
0e319ff293
fixed typo in german transaltion
2020-11-14 11:15:21 +01:00
transifex-integration[bot]
19e2094ecd
Apply translations in nl
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'nl' language.
2020-11-13 22:21:02 +00:00
Sebastian Markgraf
2f038edf8c
Fix missing string literals for translations.
2020-11-06 17:24:20 +01:00
Sebastian Markgraf
a754002f4e
Revert approach to fixed nutritional values.
2020-11-06 17:22:21 +01:00
vabene1111
4dfda4439c
re added standard filter to recipe api
2020-11-04 16:53:49 +01:00
vabene1111
591d185b9d
improved random recipe queryset function
2020-11-04 15:09:35 +01:00
vabene1111
8d582548bd
Merge pull request #213 from tourn/random-recipes2
...
Show random recipes in meal planner
2020-11-04 15:06:50 +01:00
vabene1111
a1b15d46b8
fixed note only meal plan entries not working
2020-11-04 14:58:31 +01:00
