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

982201a2

Commit 982201a2 authored 4 years ago by Irina Kera Gundersen

Downloads
- Plain Diff

Merge branch 'UC-4' into 'master'

Uc 4

See merge request !4

parents a5378630 68f83d9d

No related branches found

No related tags found

1 merge request!4Uc 4

Pipeline #113400 passed 4 years ago

Stage: test

Stage: staging

Changes 6
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

backend/secfit/seed.json 3 additions, 0 deletions

backend/secfit/seed.json
backend/secfit/workouts/migrations/0001_initial.py 1 addition, 0 deletions

backend/secfit/workouts/migrations/0001_initial.py
backend/secfit/workouts/models.py 2 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 44 additions, 64 deletions

frontend/www/exercise.html
frontend/www/scripts/exercise.js 9 additions, 1 deletion

frontend/www/scripts/exercise.js

with 61 additions and 67 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