Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

TDT4242-group15
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a3910326

Commit a3910326 authored 4 years ago by Vegard Murvold Sporstøl

Downloads
- Plain Diff

Merge branch 'UC-1' into 'master'

Uc 1

See merge request !6

parents fb433f0a 181d31e3

No related branches found

No related tags found

1 merge request!6Uc 1

Pipeline #113913 passed 4 years ago

Stage: test

Stage: staging

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

backend/secfit/workouts/serializers.py 3 additions, 0 deletions

backend/secfit/workouts/serializers.py
backend/secfit/workouts/views.py 5 additions, 1 deletion

backend/secfit/workouts/views.py
frontend/www/scripts/workout.js 403 additions, 295 deletions

frontend/www/scripts/workout.js
frontend/www/statistics.html 3 additions, 3 deletions

frontend/www/statistics.html
frontend/www/workout.html 36 additions, 17 deletions

frontend/www/workout.html

with 450 additions and 316 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