vabene1111
b99443cb30
Merge pull request #2938 from patmagauran/meal-plan-serving-size-link
...
Add ability to open recipes with specified number of servings from meal plan
2024-02-16 19:46:36 +01:00
smilerz
9506f2889a
deprecate unused forms
2024-02-16 09:21:27 -06:00
tomtjes
f34dc4d242
move escapeCSS function to mixins
2024-02-15 14:56:04 -05:00
vabene1111
5bbcdd2551
Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop
2024-02-15 20:55:02 +01:00
vabene1111
43443305e6
basic bold function
2024-02-15 20:54:54 +01:00
dalan
038d03783f
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 99.2% (558 of 562 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
2024-02-15 03:19:57 +00:00
dalan
80c594d486
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (490 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
2024-02-15 03:19:57 +00:00
tomtjes
b5a204265a
fix CSS escape (remove HTML sanitize)
2024-02-14 17:18:26 -05:00
tomtjes
8e72108290
use BEM classes
...
add class names for foods, units, keywords (not following BEM closely)
2024-02-14 16:44:12 -05:00
vabene1111
d1042835a5
Merge pull request #2948 from maxemann96/bugfix/wrong-keycloak-docs
...
Fixed wrong keycloak docs
2024-02-14 07:42:25 +01:00
Patrick Magauran
cf190734b2
Switches to named GET Parameter for servings
2024-02-13 20:59:04 -05:00
Patrick Magauran
a9a3dd6e51
Revert "Add Setting to enable / disable feature"
...
This reverts commit 768e9f8801
2024-02-13 20:30:59 -05:00
vabene1111
00ff13ae08
basic button affecting editor
2024-02-13 17:59:44 +01:00
Kirstin Seidel-Gebert
d7d34b2326
Translated using Weblate (German)
...
Currently translated at 100.0% (490 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2024-02-13 16:19:57 +00:00
Maximilian Hippler
250d58f8a1
Fixed wrong keycloak docs
2024-02-13 16:09:06 +01:00
vabene1111
0499745772
added captcha option to password reset form
2024-02-13 10:56:43 +01:00
vabene1111
1b2c4a3062
added additional rate limiting to password reset
2024-02-13 10:03:24 +01:00
Tomasz Klimczak
9232465e21
Translated using Weblate (Polish)
...
Currently translated at 100.0% (562 of 562 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2024-02-12 12:19:57 +00:00
Kirstin Seidel-Gebert
30e853088c
Translated using Weblate (German)
...
Currently translated at 100.0% (562 of 562 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2024-02-12 12:19:57 +00:00
Kirstin Seidel-Gebert
c45a88d048
Translated using Weblate (German)
...
Currently translated at 100.0% (490 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
2024-02-12 12:19:57 +00:00
vabene1111
8f272eba3b
able to edit template strings
2024-02-11 10:41:15 +01:00
vabene1111
ad5562d850
Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop
2024-02-11 10:00:54 +01:00
vabene1111
ca35052ac0
some more markdown editor progress
2024-02-11 10:00:49 +01:00
vabene1111
3f19d94d2f
Merge pull request #2937 from smilerz/automation_fix
...
regex replace not run on food if there are no food aliases
2024-02-11 09:31:15 +01:00
Jonan B
b5c3ef72ef
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (490 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
2024-02-10 12:20:02 +00:00
vabene1111
cca7b7f558
codemirror history and highlighting
2024-02-10 12:10:21 +01:00
vabene1111
3f962345f7
placeholder working
2024-02-10 10:08:32 +01:00
dependabot[bot]
d92211485d
Bump typescript from 5.1.6 to 5.3.3 in /vue
...
Bumps [typescript](https://github.com/Microsoft/TypeScript ) from 5.1.6 to 5.3.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases )
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.1.6...v5.3.3 )
---
updated-dependencies:
- dependency-name: typescript
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-10 08:29:08 +00:00
vabene1111
0827cb387f
markdown editor in test view
2024-02-10 09:28:44 +01:00
vabene1111
b2a4b084d7
Merge branch 'feature/shopping-ui' into develop
2024-02-10 09:26:46 +01:00
vabene1111
8e4e785179
added editor button for scalable number
2024-02-10 09:26:29 +01:00
vabene1111
ef0f181268
Merge branch 'develop' into feature/shopping-ui
2024-02-10 09:12:34 +01:00
vabene1111
f3e42f13b1
Merge pull request #2940 from TandoorRecipes/dependabot/pip/django-4.2.10
...
Bump django from 4.2.7 to 4.2.10
2024-02-10 09:07:56 +01:00
vabene1111
fb8e04fee5
swipe test view
2024-02-10 09:07:03 +01:00
vabene1111
03c775d1cc
added merge capabilities to supermarket category
2024-02-10 09:01:21 +01:00
vabene1111
6aa2aa42c7
added more editing capabilities to line item modal
2024-02-10 08:56:15 +01:00
tomtjes
0ee5164aac
remove class used twice
2024-02-07 20:51:59 -05:00
tomtjes
1819ff2bbd
add classes to main components/views
2024-02-07 19:18:51 -05:00
tomtjes
14c2be9277
add classes to scalable numbers
...
apply "scalable" to all
apply "scaled-up" when ingredient factor is >1
apply "unscaled" when ingredient factor is 1
apply "scaled-down" when factor is <1
2024-02-07 16:51:19 -05:00
dependabot[bot]
6377d55ea5
Bump django from 4.2.7 to 4.2.10
...
Bumps [django](https://github.com/django/django ) from 4.2.7 to 4.2.10.
- [Commits](https://github.com/django/django/compare/4.2.7...4.2.10 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-02-07 18:21:59 +00:00
Patrick Magauran
768e9f8801
Add Setting to enable / disable feature
2024-02-06 22:52:59 -05:00
Patrick Magauran
e8db2b6401
Clicking on Recipe in Meal Plan auto does servings
2024-02-06 22:37:25 -05:00
Patrick Magauran
13f532a67b
Add serving size to recipe url so it loads with num
2024-02-06 22:21:37 -05:00
vabene1111
61ccc6061c
updated api client
2024-02-06 19:21:55 +01:00
smilerz
dc7db75963
regex replace not run on food if there are no food aliases
2024-02-06 11:14:47 -06:00
vabene1111
98b06b6f3c
improved modal
2024-02-06 14:48:18 +01:00
vabene1111
dffb2d4eae
fixed test
2024-02-06 14:42:14 +01:00
vabene1111
08a2b4d0b2
formatted file
2024-02-06 14:10:36 +01:00
vabene1111
5211fbe6da
styling and bg sync message
2024-02-06 13:52:26 +01:00
vabene1111
a2cb1ccf3a
Revert "playing with checkbox design"
...
This reverts commit ece7ca7e82
2024-02-06 13:25:34 +01:00
