Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/measurements

Roland Geiderdd812eb4ecdb
diff --cc docs/changelog.rst
index 4811f0b62,f13c0ab4b..4556be0cd
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@@ -15,7 -15,7 +15,8 @@@ Upgrade steps from 2.0
πŸš€ Features:
* New gallery where users can upload pictures to track their progress `#572`_
+ * Add comment filed to set for user notes `#702`_
+* Custom measurements such as biceps size or body fat `#133`_
πŸ› Bug Fixes:
@@@ -30,9 -30,10 +31,11 @@@
+ /workout/
- ``comment`` was renamed to name
- field ``description`` was added, for longer descriptions
- * `#666`_, `#656`_ (thanks `@jackmulligan-ire`_),
+ + /set/
+ - field ``comment`` added, for user notes
+ * `#666`_, `#656`_ (thanks `@jackmulligan-ire`_), `#716`_
+.. _#133: https://github.com/wger-project/wger/issues/133
.. _#572: https://github.com/wger-project/wger/issues/572
.. _#656: https://github.com/wger-project/wger/issues/656
.. _#666: https://github.com/wger-project/wger/issues/666