New chat2 (!119) · Merge requests · idatt2106_2022_02 / boco-frontend · GitLab

Snippets Groups Projects

Merged Haakon Tideman Kanter requested to merge newChat2 into main 3 years ago

May 05, 2022
- Merge branch 'main' of... · 28dfb5b5
  Haakon Tideman Kanter authored 3 years ago
  
  Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into newChat2
  28dfb5b5
- Merge branch 'newChat2' of... · 256f504c
  Haakon Tideman Kanter authored 3 years ago
  
  Merge branch 'newChat2' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into newChat2
  256f504c
- resolved merge conflict · 9205f206
  Haakon Tideman Kanter authored 3 years ago
  
  9205f206
- Merge branch 'newChat2' of... · 5182f05d
  Sander August Heggland Schrader authored 3 years ago
  
  Merge branch 'newChat2' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into newChat2
  5182f05d
- Added tests · bc223d49
  Sander August Heggland Schrader authored 3 years ago
  
  bc223d49
- Added time and date for messages · f1e1f07f
  Haakon Tideman Kanter authored 3 years ago
  
  f1e1f07f
- Fixed test and added coverage report · 35f1fde6
  Sander August Heggland Schrader authored 3 years ago
  
  35f1fde6
- Merge branch 'newChat2' of... · 137286a2
  Sander August Heggland Schrader authored 3 years ago
  
  Merge branch 'newChat2' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into newChat2
  137286a2
- Changes · cb5e3edd
  Sander August Heggland Schrader authored 3 years ago
  
  cb5e3edd
- Date changes · 3cfbfe92
  Sander August Heggland Schrader authored 3 years ago
  
  3cfbfe92
- Merge branch 'newChat2' of... · 5cb951e0
  Haakon Tideman Kanter authored 3 years ago
  
  Merge branch 'newChat2' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into newChat2
  5cb951e0
- Added v-if for accepted and deleted rental request · 6f230ce7
  Haakon Tideman Kanter authored 3 years ago
  
  6f230ce7
- Removed console log and fixed bug · af7bb3d6
  Sander August Heggland Schrader authored 3 years ago
  
  af7bb3d6
May 04, 2022
- Removed notification when on messages page · 4d67ddc7
  Sander August Heggland Schrader authored 3 years ago
  
  4d67ddc7
- Updated people list when new message is sent · 99940148
  Sander August Heggland Schrader authored 3 years ago
  
  99940148
- Added auto message update · 2bc96850
  Sander August Heggland Schrader authored 3 years ago
  
  2bc96850
- Merge branch 'main' into newChat2 · 889b7e83
  Sander August Heggland Schrader authored 3 years ago
  
  889b7e83
- Merge branch 'newChat2' of... · 205e71bd
  Sander August Heggland Schrader authored 3 years ago
  
  Merge branch 'newChat2' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into newChat2
  205e71bd
- added chat notification · 28caa556
  Sander August Heggland Schrader authored 3 years ago
  
  28caa556
- Added accept and reject features · 282669d4
  Haakon Tideman Kanter authored 3 years ago
  
  282669d4
- Changed content · 5e635cb3
  Sander August Heggland Schrader authored 3 years ago
  
  5e635cb3
- Added pfp and new url and rent messages · 616f1ecd
  Sander August Heggland Schrader authored 3 years ago
  
  616f1ecd
May 03, 2022
- Merge branch 'main' into newChat2 · ba0db911
  Sander August Heggland Schrader authored 3 years ago
  
  ba0db911
- Added rentalMessage and pfp · 6fc11ed1
  Sander August Heggland Schrader authored 3 years ago
  
  6fc11ed1
- Fixed merge conflict · de3a4f09
  Sander August Heggland Schrader authored 3 years ago
  
  de3a4f09
- Merge · 8d7453c6
  Sander August Heggland Schrader authored 3 years ago
  
  8d7453c6
- Rewritten the whole chat · f36eeb06
  Sander August Heggland Schrader authored 3 years ago
  
  f36eeb06