Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge remote-tracking branch 'origin/master'

Roland Geider86361277b7b5
diff --cc docs/changelog.rst
index 73d3a3ec3,87b8bea44..be20e109f
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@@ -30,8 -30,7 +30,9 @@@ Upgrade steps from 1.9
API calls `#411`_
* Show BMI on weight graph `#462`_ (thanks `@Svn-Sp`_)
* Allow user to edit and delete body weight entries `#478`_ (thanks `@beingbiplov`_)
+ * Show kJoules as well as kcal in nutritional plan `#568`_ (thanks `@nopinter`_ and `@derekli17`_)
+* Check name similarity when adding exercises to avoid duplicates `#551`_
+ (thanks `@lydiaxing`_, `@eq8913`_, `@Hita-K`_)
🐛 Bug Fixes:
@@@ -61,10 -60,8 +62,11 @@@
.. _@ryowright: https://github.com/ryowright
.. _@austin-leung: https://github.com/austin-leung
.. _@harlenesamra: https://github.com/harlenesamra
+.. _@lydiaxing: https://github.com/lydiaxing
+.. _@eq8913: https://github.com/eq8913
+.. _@Hita-K: https://github.com/Hita-K
-
+ .. _@derekli17: https://github.com/derekli17
+ .. _@nopinter: https://github.com/nopinter
.. _#246: https://github.com/wger-project/wger/issues/246
.. _#284: https://github.com/wger-project/wger/issues/284