Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'refs/heads/master' into fork/Frenzy-code/timer
Roland Geiderb8f3b256e157
diff --cc CHANGELOG.mdindex 28eb9ba40,ce808e96c..c7b1ee6be--- a/CHANGELOG.md+++ b/CHANGELOG.md@@@ -1,6 -1,11 +1,16 @@@# Changelog for the next release+ <https://github.com/wger-project/wger/issues/2231> Add vegan and vegetarian flags to+ the ingredient model. This allows to filter products based on dietary preferences.+ The unused `/api/v2/ingredient/search/` API endpoint has been removed.++ <https://github.com/wger-project/wger/pull/2222> Add flag for exercise images indicating+ whether the image was AI generated. This is currently not used, but can be used in the+ future if we rework the images,++ Add "warmup" to list of set types.+++<https://github.com/wger-project/wger/pull/2137>+Add more information to the repetition units in the routines. This will allow+us to e.g. properly handle time units in the mobile app, e.g. by showing a+timer or similar