Merge branch 'workoutLikes' into 'dev' (7bd8552a) · Commits · Tor Martin Frøberg Wang / tdt4242-base-APU · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

tdt4242-base-APU
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7bd8552a

Commit 7bd8552a authored 4 years ago by Tor Martin Frøberg Wang

Downloads
- Plain Diff

Merge branch 'workoutLikes' into 'dev'

Workout likes

See merge request !3

parents a5270963 fbe66920

No related branches found

No related tags found

Loading

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.idea/workspace.xml 190 additions, 104 deletions

.idea/workspace.xml
backend/secfit/workouts/admin.py 2 additions, 1 deletion

backend/secfit/workouts/admin.py
backend/secfit/workouts/migrations/0004_workoutlike.py 24 additions, 0 deletions

backend/secfit/workouts/migrations/0004_workoutlike.py
backend/secfit/workouts/models.py 12 additions, 0 deletions

backend/secfit/workouts/models.py
backend/secfit/workouts/urls.py 5 additions, 0 deletions

backend/secfit/workouts/urls.py
backend/secfit/workouts/views.py 34 additions, 1 deletion

backend/secfit/workouts/views.py
frontend/www/scripts/workouts.js 84 additions, 3 deletions

frontend/www/scripts/workouts.js
frontend/www/styles/style.css 93 additions, 0 deletions

frontend/www/styles/style.css
frontend/www/workouts.html 12 additions, 0 deletions

frontend/www/workouts.html

with 456 additions and 109 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