Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/api-docs
Roland Geider963059fbdad8
diff --cc requirements.txtindex 6d59a1ce5,c80615db1..f96872b9b--- a/requirements.txt+++ b/requirements.txt@@@ -13,23 -13,24 +13,23 @@@ django-formtools~=2.django-recaptcha~=3.0.0Django==4.1.7django-activity-stream==1.4.2- django-axes==5.41.0+ django-axes==5.41.1django-crispy-forms~=2.0crispy-bootstrap4==2022.1-# note: bs3 can be deleted when we solve https://github.com/wger-project/wger/issues/1127-crispy-bootstrap3==2022.1django-simple-history~=3.3django-email-verification~=0.3.1django_compressor~=4.3django_extensions~=3.2django-storages~=1.13django-environ==0.10.0+drf-spectacular[sidecar]==0.26.1easy-thumbnails==2.8.5fontawesomefree~=6.4.0- icalendar==4.1.0- invoke==2.0.0+ icalendar==5.0.7+ invoke==2.1.2pillow==9.5.0- reportlab==3.6.12- requests==2.28.2+ reportlab==4.0.0+ requests==2.30.0tzdata==2023.3celery[redis]==5.2.7flower==1.2.0diff --cc wger/exercises/api/serializers.pyindex b334bd5f0,e531d68f1..7ccc0a8c0--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@@ -84,8 -84,9 +84,10 @@@ class ExerciseImageSerializer(serialize"""ExerciseImage serializer"""+ author_history = serializers.ListSerializer(child=serializers.CharField())+ exercise_base_uuid = serializers.ReadOnlyField(source='exercise_base.uuid')+class Meta:model = ExerciseImagefields = [