Commits · main · idatt2106_2022_02 / boco-backend

06 May, 2022 40 commits
- Merge branch 'oahjellj-main-patch-98039' into 'main' · d9e7f7d8
  Sander August Heggland Schrader authored May 06, 2022
```
Update README.md

See merge request !91
```
  d9e7f7d8
- Update README.md · 2e14b95e
  Sander August Heggland Schrader authored May 06, 2022
  
  2e14b95e
- Update README.md · 28e71314
  Oda Alida Fønstelien Hjelljord authored May 06, 2022
  
  28e71314
- Update README.md · bc517acc
  Oda Alida Fønstelien Hjelljord authored May 06, 2022
  
  bc517acc
- Merge branch 'SA_fix' into 'main' · a14860a7
  Aleksander Halvorsen Holthe authored May 06, 2022
```
Sa fix

See merge request !79
```
  a14860a7
- Merge branch 'testCoverage' into 'main' · 025322c2
  Aleksander Halvorsen Holthe authored May 06, 2022
```
Test coverage

See merge request !90
```
  025322c2
- Merge branch 'main' into Sa_fix · 09b046ab
  Sander August Heggland Schrader authored May 06, 2022
  
  09b046ab
- Fixed tests · 90bb2b1b
  Sander August Heggland Schrader authored May 06, 2022
  
  90bb2b1b
- Added test to for 57% and 50% coverage · 5a8ab847
  Sander August Heggland Schrader authored May 06, 2022
  
  5a8ab847
- Test coverage · b154528e
  Sander August Heggland Schrader authored May 06, 2022
  
  b154528e
- Merge branch 'controller_docpdate' into 'main' · c7859c64
  Håkon Eilertsen Røskaft authored May 06, 2022
```
Controller docpdate

See merge request !88
```
  c7859c64
- Merge branch 'erikbhan-main-patch-14164' into 'main' · 9015b134
  Erik Borgeteien Hansen authored May 06, 2022
```
Update README.md

See merge request !89
```
  9015b134
- Update README.md · 44674194
  Erik Borgeteien Hansen authored May 06, 2022
  
  44674194
- ChatService doc added · 81432024
  Morten Aune authored May 06, 2022
  
  81432024
- Merge branch 'erikbhan-main-patch-83519' into 'main' · 972e32c4
  Erik Borgeteien Hansen authored May 06, 2022
```
Update README.md

See merge request !87
```
  972e32c4
- Update README.md · 239144b9
  Erik Borgeteien Hansen authored May 06, 2022
  
  239144b9
- swagger apiResponce fixed · fdd9d62a
  Morten Aune authored May 06, 2022
  
  fdd9d62a
- Merge branch 'readme' into 'main' · bb503ed9
  Haakon Tideman Kanter authored May 06, 2022
```
Readme

See merge request !86
```
  bb503ed9
- update readme · f00747dd
  Erik Borgeteien Hansen authored May 06, 2022
  
  f00747dd
- update docker and readme · 37063b1d
  Erik Borgeteien Hansen authored May 06, 2022
  
  37063b1d
- tiny doc change · a424d6e5
  Morten Aune authored May 06, 2022
  
  a424d6e5
- Merge remote-tracking branch 'origin/controller_docpdate' into controller_docpdate · a9ae98a7
  Morten Aune authored May 06, 2022
```
# Conflicts:
#	src/main/java/no/ntnu/idatt2106/service/CommunityListingService.java
```
  a9ae98a7
- some more doc · b1187035
  Morten Aune authored May 06, 2022
  
  b1187035
- Merge branch 'controller_docpdate' of... · 1b3dccf5
  Haakon Tideman Kanter authored May 06, 2022
```
Merge branch 'controller_docpdate' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-backend into controller_docpdate
```
  1b3dccf5
- Fixed CommunityRequestService javadoc · 185e7f9a
  Haakon Tideman Kanter authored May 06, 2022
  
  185e7f9a
- Pulled from main · 40c4d34b
  Aleksander halvorsen Holthe authored May 06, 2022
  
  40c4d34b
- Merge branch 'main' of gitlab.stud.idi.ntnu.no:idatt2106_2022_02/boco-backend... · 29db089a
  Aleksander halvorsen Holthe authored May 06, 2022
```
Merge branch 'main' of gitlab.stud.idi.ntnu.no:idatt2106_2022_02/boco-backend into controller_docpdate

 Conflicts:
	src/main/java/no/ntnu/idatt2106/service/ChatService.java
```
  29db089a
- Merge branch 'controller_docpdate' of... · 772bf9e1
  Aleksander halvorsen Holthe authored May 06, 2022
```
Merge branch 'controller_docpdate' of gitlab.stud.idi.ntnu.no:idatt2106_2022_02/boco-backend into controller_docpdate

 Conflicts:
	src/main/java/no/ntnu/idatt2106/service/CommunityRequestService.java
```
  772bf9e1
- Added more tests · f12859bd
  Aleksander halvorsen Holthe authored May 06, 2022
  
  f12859bd
- Addedjavadoc for community listing and request · cb0552d3
  Haakon Tideman Kanter authored May 06, 2022
  
  cb0552d3
- Added loginService javadoc · 73335364
  Haakon Tideman Kanter authored May 06, 2022
  
  73335364
- Merge branch 'SortChat' into 'main' · be60d511
  Morten Aune authored May 06, 2022
```
Sort chat

See merge request !84
```
  be60d511
- Merge branch 'main' into SortChat · fa72f548
  Sander August Heggland Schrader authored May 06, 2022
  
  fa72f548
- Sorting chat · d572b670
  Sander August Heggland Schrader authored May 06, 2022
  
  d572b670
- Merge remote-tracking branch 'origin/controller_docpdate' into controller_docpdate · c7a493cd
  Morten Aune authored May 06, 2022
  
  c7a493cd
- some changes · c1f1d4c5
  Morten Aune authored May 06, 2022
  
  c1f1d4c5
- Merge branch 'controller_docpdate' of... · 56693d38
  Aleksander halvorsen Holthe authored May 06, 2022
```
Merge branch 'controller_docpdate' of gitlab.stud.idi.ntnu.no:idatt2106_2022_02/boco-backend into controller_docpdate
```
  56693d38
- Added a lot of documentation · 55d6a801
  Aleksander halvorsen Holthe authored May 06, 2022
  
  55d6a801
- RentController doc · e4fea71d
  Morten Aune authored May 06, 2022
  
  e4fea71d
- Fixed some typos · 0fd6fea9
  Haakon Tideman Kanter authored May 06, 2022
  
  0fd6fea9