Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'feature/measurements'

Roland Geider77d5ae5f6d7e
diff --cc docs/changelog.rst
index a7d08de5a,72e109953..60870176f
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@@ -34,8 -34,9 +35,9 @@@ Upgrade steps from 2.0
- field ``description`` was added, for longer descriptions
+ /set/
- field ``comment`` added, for user notes
-* `#666`_, `#656`_ (thanks `@jackmulligan-ire`_), `#716`_
+* `#666`_, `#667`_, `#656`_ (thanks `@jackmulligan-ire`_), `#716`_
+ .. _#133: https://github.com/wger-project/wger/issues/133
.. _#572: https://github.com/wger-project/wger/issues/572
.. _#639: https://github.com/wger-project/wger/issues/639
.. _#656: https://github.com/wger-project/wger/issues/656
diff --cc docs/tips_and_tricks.rst
index 026aa8457,a7c596e5c..96145446f
--- a/docs/tips_and_tricks.rst
+++ b/docs/tips_and_tricks.rst
@@@ -91,9 -91,10 +91,10 @@@ as 10 nutrition diary entries per day:
python generator.py weight 100
python generator.py nutrition 20
python generator.py nutrition-diary 10
+ python generator.py measurement 20
.. note::
- All generated users have their username as password.
+ All generated users have their username as a password.
.. note::
While it is possible to generate hundreds of users, gyms are more restricted and