Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

tdt4242-ex2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d65fa134

Commit d65fa134 authored 3 years ago by Haakon Gunleiksrud

Downloads
- Plain Diff

Merge branch 'feat/addMoreFields' into 'master'

Feat/add more fields

See merge request aasmuha/tdt4242-base!15

parents 37f14a8e 246bd5fa

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

backend/secfit/workouts/models.py 6 additions, 0 deletions

backend/secfit/workouts/models.py
backend/secfit/workouts/serializers.py 2 additions, 2 deletions

backend/secfit/workouts/serializers.py
frontend/www/exercise.html 22 additions, 0 deletions

frontend/www/exercise.html
frontend/www/scripts/exercise.js 46 additions, 4 deletions

frontend/www/scripts/exercise.js

with 76 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment