Commits · master · Esther Vogt / tdt4242-base

24 Mar, 2022 2 commits
- Merge branch 'development' into 'master' · 20647618
  Esther Vogt authored Mar 24, 2022
```
Deploy final version

See merge request !11
```
  20647618
- Deploy final version · 6e5f73a2
  Esther Vogt authored Mar 24, 2022
  
  6e5f73a2
21 Mar, 2022 4 commits
- Merge branch 'add-team' into 'master' · d8736029
  Esther Vogt authored Mar 21, 2022
```
Fixed merge conflicts locally

See merge request !8
```
  d8736029
- Fixed merge conflicts locally · 85f73ab7
  Esther Vogt authored Mar 21, 2022
  
  85f73ab7
- Merge branch 'test-user-serializer' into 'master' · c5d90f4b
  Esther Vogt authored Mar 21, 2022
```
Finalize merge of test-user-serializer into master

See merge request !6
```
  c5d90f4b
- Finalize merge of test-user-serializer into master · c4612712
  Esther Vogt authored Mar 21, 2022
  
  c4612712
17 Mar, 2022 6 commits
- Merge branch 'test-user-serializer' into 'master' · b35e874b
  Esther Vogt authored Mar 17, 2022
```
Added test scripts for UserSerializer and Workout Permissions

See merge request !5
```
  b35e874b
- Added test scripts for UserSerializer and Workout Permissions · 420a7732
  Esther Vogt authored Mar 17, 2022
  
  420a7732
- Updated link to app (frontend+backend) · b1dca11e
  Esther Vogt authored Mar 17, 2022
  
  b1dca11e
- Update .gitlab-ci.yml · 211a0eaa
  Esther Vogt authored Mar 17, 2022
  
  211a0eaa
- Merge branch 'add-team' into 'master' · 27a55e52
  Esther Vogt authored Mar 17, 2022
```
Added teams app to store a coach, athletes, and a name. Not functional atm....

See merge request !3
```
  27a55e52
- Added teams app to store a coach, athletes, and a name. Not functional atm.... · dea67913
  Esther Vogt authored Mar 17, 2022
  
  dea67913
10 Mar, 2022 9 commits
- Merge branch 'select-user-role' into 'master' · d0594fb1
  Esther Vogt authored Mar 10, 2022
```
Reset role default to "Athlete"

See merge request !2
```
  d0594fb1
- Reset role default to "Athlete" · f601510e
  Esther Vogt authored Mar 10, 2022
  
  f601510e
- Merge branch 'select-user-role' into 'master' · 525adc0e
  Esther Vogt authored Mar 10, 2022
```
Add user role to profile and limit page access accordingly (v1)

See merge request !1
```
  525adc0e
- Added junit and coverage call to pytest.ini · dc1b04b9
  Esther Vogt authored Mar 10, 2022
  
  dc1b04b9
- Adjusted .gitlab-ci.yml to create both coverage and junit report · 914545a2
  Esther Vogt authored Mar 10, 2022
  
  914545a2
- Revert to junit xml report · b57ddf26
  Esther Vogt authored Mar 10, 2022
  
  b57ddf26
- Replaced junit xml report by coverage.xml report · 996e6c2f
  Esther Vogt authored Mar 10, 2022
  
  996e6c2f
- Added backend/secfit to junit path · ebb06d13
  Esther Vogt authored Mar 10, 2022
  
  ebb06d13
- Added pytest functionality and jnuit xml reporting to .gitlab-ci.yml · 9f8c045c
  Esther Vogt authored Mar 10, 2022
  
  9f8c045c
09 Mar, 2022 2 commits
- Moved tests_gitlab.sh to backend/secfit · 209b459f
  Esther Vogt authored Mar 09, 2022
  
  209b459f
- Added tests to app=users for UseCase1 - Registration / Allowed for automatic... · b0cb1bf9
  Esther Vogt authored Mar 09, 2022
```
Added tests to app=users for UseCase1 - Registration / Allowed for automatic retrieval of RoleGroups in frontend
```
  b0cb1bf9
07 Mar, 2022 1 commit
- Extended research results on testing · 9767b25b
  Esther Vogt authored Mar 07, 2022
  
  9767b25b
03 Mar, 2022 1 commit

Prevent athletes from accessing /myathletes.html and coaches form accessing... · 4dbd4ada

Esther Vogt authored Mar 03, 2022

Prevent athletes from accessing /myathletes.html and coaches form accessing /mycoach.html, Made email a mandatory and unique field

4dbd4ada

02 Mar, 2022 1 commit
- Adjusted navbar to filter tabs based on user role · da17a70f
  Esther Vogt authored Mar 02, 2022
  
  da17a70f
01 Mar, 2022 1 commit
- Added dropdown for user role to registration · 4b45ba77
  Esther Vogt authored Mar 01, 2022
  
  4b45ba77
28 Feb, 2022 2 commits
- Stopped tracking .env file · ffe21a5f
  Esther Vogt authored Feb 28, 2022
  
  ffe21a5f
- Extended documentation script Codestructure.md for understanding of User group... · ab5dc36d
  Esther Vogt authored Feb 28, 2022
```
Extended documentation script Codestructure.md for understanding of User group and permission management
```
  ab5dc36d
24 Feb, 2022 1 commit
- Added documentation script Codestructure.md for understanding of App structure and Django Framework · 509f3588
  Esther Vogt authored Feb 24, 2022
  
  509f3588
22 Feb, 2022 2 commits
- Updated .gitignore · 726c499d
  Esther Vogt authored Feb 22, 2022
  
  726c499d
- Add Heroku app for backend and frontend · 60240e74
  Esther Vogt authored Feb 22, 2022
  
  60240e74
10 Jan, 2022 2 commits
- Update README.md clone URL working · 954382ef
  Mathias Lundteigen Mohus authored Jan 10, 2022
  
  954382ef
- Update README.md with proper git clone URL, and added sections on running Docker as admin · a3426b90
  Mathias Lundteigen Mohus authored Jan 10, 2022
  
  a3426b90
18 Dec, 2021 2 commits
- Update .gitlab-ci.yml · 12c2cc67
  Haakon Gunleiksrud authored Dec 18, 2021
  
  12c2cc67
- Update .gitlab-ci.yml · be9a3fc2
  Haakon Gunleiksrud authored Dec 18, 2021
  
  be9a3fc2
08 Dec, 2021 1 commit
- feat/update description of exercise form inputs · efa689b3
  Haakon Gunleiksrud authored Dec 08, 2021
  
  efa689b3
22 Nov, 2021 2 commits
- Merge branch 'feat/workout_image_advanced_gallery' into 'master' · 1667e8c1
  Haakon Gunleiksrud authored Nov 22, 2021
```
Feat/workout image advanced gallery

See merge request aasmuha/tdt4242-base!21
```
  1667e8c1
- Feat/workout image advanced gallery · 0f6502fe
  Haakon Gunleiksrud authored Nov 22, 2021
  
  0f6502fe
05 Nov, 2021 1 commit
- Merge branch 'devops/setup_live_demo' into 'master' · 7c500bee
  Haakon Gunleiksrud authored Nov 05, 2021
```
Devops/setup live demo

See merge request aasmuha/tdt4242-base!20
```
  7c500bee