Merge branch 'dev' into 'ci'
Dev See merge request !4
No related branches found
No related tags found
Showing
- .idea/encodings.xml 4 additions, 0 deletions.idea/encodings.xml
- .idea/misc.xml 7 additions, 0 deletions.idea/misc.xml
- .idea/modules.xml 8 additions, 0 deletions.idea/modules.xml
- .idea/tdt4242-base.iml 11 additions, 0 deletions.idea/tdt4242-base.iml
- .idea/vcs.xml 6 additions, 0 deletions.idea/vcs.xml
- .idea/workspace.xml 523 additions, 0 deletions.idea/workspace.xml
- backend/secfit/secfit/settings.py 6 additions, 2 deletionsbackend/secfit/secfit/settings.py
- backend/secfit/workouts/admin.py 2 additions, 1 deletionbackend/secfit/workouts/admin.py
- backend/secfit/workouts/migrations/0004_workoutlike.py 24 additions, 0 deletionsbackend/secfit/workouts/migrations/0004_workoutlike.py
- backend/secfit/workouts/models.py 12 additions, 0 deletionsbackend/secfit/workouts/models.py
- backend/secfit/workouts/urls.py 10 additions, 0 deletionsbackend/secfit/workouts/urls.py
- backend/secfit/workouts/views.py 76 additions, 3 deletionsbackend/secfit/workouts/views.py
- frontend/www/exercise.html 8 additions, 0 deletionsfrontend/www/exercise.html
- frontend/www/scripts/exercise.js 170 additions, 121 deletionsfrontend/www/scripts/exercise.js
- frontend/www/scripts/workouts.js 84 additions, 3 deletionsfrontend/www/scripts/workouts.js
- frontend/www/styles/style.css 93 additions, 0 deletionsfrontend/www/styles/style.css
- frontend/www/workouts.html 12 additions, 0 deletionsfrontend/www/workouts.html
Loading
Please register or sign in to comment