Merge branch 'master' into 'feat/Frontend-select-training-type'
# Conflicts: # backend/secfit/workouts/models.py # backend/secfit/workouts/serializers.py
Branches feat/Frontend-select-training-type
No related tags found
Showing
- .gitlab-ci.yml 3 additions, 0 deletions.gitlab-ci.yml
- backend/secfit/requirements.txt 0 additions, 0 deletionsbackend/secfit/requirements.txt
- backend/secfit/secfit/settings.py 6 additions, 2 deletionsbackend/secfit/secfit/settings.py
- backend/secfit/secfit/templates/registration/password_reset_email.html 14 additions, 0 deletions...t/secfit/templates/registration/password_reset_email.html
- backend/secfit/secfit/urls.py 9 additions, 1 deletionbackend/secfit/secfit/urls.py
- backend/secfit/workouts/migrations/0004_workout_planned.py 18 additions, 0 deletionsbackend/secfit/workouts/migrations/0004_workout_planned.py
- backend/secfit/workouts/models.py 4 additions, 0 deletionsbackend/secfit/workouts/models.py
- backend/secfit/workouts/serializers.py 2 additions, 0 deletionsbackend/secfit/workouts/serializers.py
- frontend/www/forgotpassword.html 39 additions, 0 deletionsfrontend/www/forgotpassword.html
- frontend/www/login.html 3 additions, 0 deletionsfrontend/www/login.html
- frontend/www/passwordchanged.html 30 additions, 0 deletionsfrontend/www/passwordchanged.html
- frontend/www/resetconfirmed.html 30 additions, 0 deletionsfrontend/www/resetconfirmed.html
- frontend/www/resetpassword.html 60 additions, 0 deletionsfrontend/www/resetpassword.html
- frontend/www/scripts/forgotpassword.js 13 additions, 0 deletionsfrontend/www/scripts/forgotpassword.js
- frontend/www/scripts/resetpassword.js 14 additions, 0 deletionsfrontend/www/scripts/resetpassword.js
- frontend/www/scripts/workouts.js 7 additions, 0 deletionsfrontend/www/scripts/workouts.js
- frontend/www/workouts.html 1 addition, 0 deletionsfrontend/www/workouts.html
Loading
Please register or sign in to comment