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

05c61353

Commit 05c61353 authored 4 years ago by Vegard Murvold Sporstøl

Downloads
- Plain Diff

Merge branch 'UC-2' into 'master'

Uc 2

See merge request !1

parents b210c465 ed772d42

No related branches found

No related tags found

Loading

Pipeline #113336 passed 4 years ago

Stage: test

Stage: staging

Changes 13
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

frontend/www/exercise.html 94 additions, 47 deletions

frontend/www/exercise.html
frontend/www/login.html 69 additions, 31 deletions

frontend/www/login.html
frontend/www/logout.html 23 additions, 11 deletions

frontend/www/logout.html
frontend/www/mycoach.html 94 additions, 60 deletions

frontend/www/mycoach.html
frontend/www/register.html 144 additions, 64 deletions

frontend/www/register.html
frontend/www/scripts/navbar.js 8 additions, 9 deletions

frontend/www/scripts/navbar.js
frontend/www/scripts/scripts.js 57 additions, 44 deletions

frontend/www/scripts/scripts.js
frontend/www/scripts/statistics.js 80 additions, 0 deletions

frontend/www/scripts/statistics.js
frontend/www/scripts/workouts.js 102 additions, 87 deletions

frontend/www/scripts/workouts.js
frontend/www/statistics.html 60 additions, 0 deletions

frontend/www/statistics.html
frontend/www/styles/style.css 28 additions, 17 deletions

frontend/www/styles/style.css
frontend/www/workout.html 142 additions, 61 deletions

frontend/www/workout.html
frontend/www/workouts.html 116 additions, 45 deletions

frontend/www/workouts.html

with 1017 additions and 476 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