Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'feature/user-gallery'
Roland Geiderc25a35ea9c2f
diff --cc docs/changelog.rstindex 2cea8347e,aa856a5d2..d607e2583--- a/docs/changelog.rst+++ b/docs/changelog.rst@@@ -26,12 -27,11 +27,13 @@@ Upgrade steps from 2.0+ /workout/- ``comment`` was renamed to name- field ``description`` was added, for longer descriptions-* `#666`_,+* `#666`_, `#656`_ (thanks `@jackmulligan-ire`_),+ .. _#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+.. _@jackmulligan-ire: https://github.com/jackmulligan-ire2.0diff --cc package.jsonindex 9b9238716,a28feaa63..8a3cd1ca2--- a/package.json+++ b/package.json@@@ -26,7 -26,8 +26,8 @@@"jquery": "^3.6.0","metrics-graphics": "mozilla/metrics-graphics#2.15.x","shariff": "^3.2.1",- "tinymce": "^5.8.0"- "tinymce": "^5.7.1",++ "tinymce": "^5.8.0",+ "masonry-layout": "^4.2.2"},"scripts": {"build:css:sass": "sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css"