Commits · UC-3 · Vegard Murvold Sporstøl / TDT4242-group15

04 Mar, 2021 19 commits
- complete sorting of exercises · 35d55f8c
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  35d55f8c
- Merge branch 'UC-4' of https://gitlab.stud.idi.ntnu.no/vegarms/tdt4242-base into UC-4 · 68f83d9d
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  68f83d9d
- Categorize exercises · c7de5794
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  c7de5794
- Categorize exercises · 9228151d
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  9228151d
- Merge branch 'dev' into 'master' · a5378630
  Irina Kera Gundersen authored Mar 04, 2021
```
# Conflicts:
#   .gitlab-ci.yml
```
  a5378630
- Merge branch 'UC-2' into 'master' · 05c61353
  Vegard Murvold Sporstøl authored Mar 04, 2021
```
Uc 2

See merge request !1
```
  05c61353
- fix stylesheet · ed772d42
  Irina Kera Gundersen authored Mar 04, 2021
  
  ed772d42
- Display workout statistics · 53d58adb
  Irina Kera Gundersen authored Mar 04, 2021
  
  53d58adb
- Enable check week/month/year · e1d6917f
  Irina Kera Gundersen authored Mar 02, 2021
  
  e1d6917f
- Create new page for statistics · 0d22a9c3
  Irina Kera Gundersen authored Mar 01, 2021
  
  0d22a9c3
- Create new page for statistics · 0973525f
  Irina Kera Gundersen authored Mar 01, 2021
  
  0973525f
- Display workout statistics · a8c153e6
  Irina Kera Gundersen authored Mar 04, 2021
  
  a8c153e6
- Add new file · b210c465
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  b210c465
- Add new file · 53382d3e
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  53382d3e
- update procfile · fae3031f
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  fae3031f
- update procfile · 10b279ba
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  10b279ba
- update requirements · 823d5a5b
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  823d5a5b
- update from base repository · 693379f8
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  693379f8
- update from base repository · 1dcab67b
  Vegard Murvold Sporstøl authored Mar 04, 2021
  
  1dcab67b
02 Mar, 2021 21 commits
- update urls · 4eaf5ede
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  4eaf5ede
- remove django_heroku · b7415c1e
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  b7415c1e
- include django-heroku in settings.py · 09715333
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  09715333
- move procfile · 7c189842
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  7c189842
- move profile · 79581dba
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  79581dba
- change Procfile · 30bd4e1b
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  30bd4e1b
- change Procfile · cbeb05bf
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  cbeb05bf
- move Procfile · 479dd48f
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  479dd48f
- Add new file · 86b4341a
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  86b4341a
- change url · 307b8401
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  307b8401
- change url · b92ae5c6
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  b92ae5c6
- fix · ad6a7f13
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  ad6a7f13
- Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/vegarms/tdt4242-base · 1aeed95a
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  1aeed95a
- initial commit · f6c9a64f
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  f6c9a64f
- Revert "Add new file" · 2e084278
  Vegard Murvold Sporstøl authored Mar 02, 2021
```
This reverts commit 41d0c083
```
  2e084278
- Update Procfile · 0b44e13a
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  0b44e13a
- structure change · cfad5ac6
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  cfad5ac6
- Add new file · 41d0c083
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  41d0c083
- Add new file · b3b61dca
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  b3b61dca
- Update settings.py · 35a1ff1e
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  35a1ff1e
- Update requirements.txt · f7cdeccf
  Vegard Murvold Sporstøl authored Mar 02, 2021
  
  f7cdeccf