Commits · 8dd5602693657c16f130a485618f1f6f908578d5 · Dávid Želník / Music Band Manager

May 17, 2022
- Merge branch 'milestone-3-pavel' into 'milestone-3' · 8dd56026
  Dávid Želník authored May 17, 2022
```
Add spring boot starter

See merge request !61
```
  8dd56026
May 16, 2022
- Add spring boot starter and rename User table · 056ba97a
  Pavel Vašina authored May 16, 2022
  
  056ba97a
May 15, 2022
- springboot run failing · ab46274d
  David Zelnik authored May 15, 2022
  
  ab46274d
- added axios get for musicians, failing · 8b75106a
  David Zelnik authored May 15, 2022
  
  8b75106a
- security merge · 9700b96c
  David Zelnik authored May 15, 2022
  
  9700b96c
- wip fe · e66205e3
  David Zelnik authored May 15, 2022
  
  e66205e3
- Merge branch 'milestone-3-rest-zuz' into 'milestone-3' · 25ab6fca
  Dávid Želník authored May 15, 2022
```
M3: data initialization and security

See merge request !60
```
  25ab6fca
May 14, 2022
- Fixed findByName error in UserDaoImpl · c90e26f8
  Zuzana Tunegová authored May 14, 2022
  
  c90e26f8
- Merge remote-tracking branch 'origin/milestone-3-rest-zuz' into milestone-3-rest-zuz · 223a597c
  Zuzana Tunegová authored May 14, 2022
```
# Conflicts:
#	mbm-api/src/main/java/cz/fi/muni/pa165/dto/SystemUserDto.java
#	mbm-rest/src/main/java/cz/fi/muni/pa165/ApiUris.java
```
  223a597c
- Fixed pom on rest layer · 695f1657
  Zuzana Tunegová authored May 14, 2022
  
  695f1657
- Security, UserDao error occurred in findByName · 55abc2e6
  Zuzana Tunegová authored May 09, 2022
  
  55abc2e6
- Fixed pom on rest layer · 6d8abbb8
  Zuzana Tunegová authored May 14, 2022
  
  6d8abbb8
- Merge branch 'milestone-3' into milestone-3-fe-zelnik · 4846e71e
  David Zelnik authored May 14, 2022
  
  4846e71e
- Merge branch 'milestone2-review' into 'milestone-3' · 937a4e56
  Dávid Želník authored May 14, 2022
```
Milestone2 review

See merge request !59
```
  937a4e56
- Fixed findAvailableMusicians · be01253a
  Zuzana Tunegová authored May 14, 2022
  
  be01253a
- Fixed addManagedBand · 2b1a959f
  Zuzana Tunegová authored May 14, 2022
  
  2b1a959f
- Added song and album mappers · 7dc15fee
  Zuzana Tunegová authored May 14, 2022
  
  7dc15fee
- fe setup working · a9b7ad47
  David Zelnik authored May 14, 2022
  
  a9b7ad47
- Merge remote-tracking branch 'origin/milestone2-review' into milestone2-review · 9b808a2a
  Zuzana Tunegová authored May 14, 2022
```
# Conflicts:
#	mbm-api/src/main/java/cz/fi/muni/pa165/dto/album/AlbumUpdateDto.java
#	mbm-api/src/main/java/cz/fi/muni/pa165/dto/song/SongUpdateDto.java
#	mbm-rest/src/main/java/cz/fi/muni/pa165/mapper/UpdateDtoMapper.java
```
  9b808a2a
- Packages change · 9d834a54
  Zuzana Tunegová authored May 14, 2022
  
  9d834a54
- Persistence module removed from API module · 36d9bdfb
  Zuzana Tunegová authored May 14, 2022
  
  36d9bdfb
- Dtos fixed · 3428b9a3
  Zuzana Tunegová authored May 14, 2022
  
  3428b9a3
- Packages change · fcdae9cb
  Zuzana Tunegová authored May 14, 2022
  
  fcdae9cb
- Persistence module removed from API module · b3aefde0
  Zuzana Tunegová authored May 14, 2022
  
  b3aefde0
- Dtos fixed · 58d34f53
  Zuzana Tunegová authored May 14, 2022
  
  58d34f53
May 12, 2022
- fe setup not working · 4f0d0ad9
  David Zelnik authored May 12, 2022
  
  4f0d0ad9
May 11, 2022
- Merge branch 'milestone-3-controllers-sapak' into 'milestone-3' · 1d77ae57
  Dávid Želník authored May 11, 2022
```
Milestone 3 controllers sapak

See merge request !54
```
  1d77ae57
- merge conflicts resolved · 3471d410
  David Sapák authored May 11, 2022
  
  3471d410
- Apply 1 suggestion(s) to 1 file(s) · 993b64cd
  Dávid Želník authored May 11, 2022 and David Sapák committed May 11, 2022
  
  993b64cd
May 09, 2022
- Security, UserDao error occurred in findByName · 9193e9cc
  Zuzana Tunegová authored May 09, 2022
  
  9193e9cc
May 07, 2022
- Merge branch 'milestone-3-pavel-2' into 'milestone-3' · 5a1d3693
  Dávid Želník authored May 07, 2022
```
Add Manager dto, controllers

See merge request !58
```
  5a1d3693
- Add Manager dto, controllers · 42190a1a
  Pavel Vašina authored May 07, 2022
  
  42190a1a
May 06, 2022
- Merge branch 'milestone-3-zelnik-controllers' into 'milestone-3' · cda11c2d
  Dávid Želník authored May 06, 2022
```
Band, activity controllers

See merge request !57
```
  cda11c2d
- Milestone-3 merge and update fix · 9378e2dc
  David Zelnik authored May 06, 2022
  
  9378e2dc
- Merge branch 'milestone-3-controllers-zuz' into 'milestone-3' · fefb4e80
  Dávid Želník authored May 06, 2022
```
Controllers

See merge request !56
```
  fefb4e80
May 05, 2022
- song controller · 91de2447
  David Sapák authored May 05, 2022
  
  91de2447
- created album controller · 8e580525
  David Sapák authored May 05, 2022
  
  8e580525
- Merge branch 'milestone-3-controllers-zuz' into milestone-3-controllers-sapak · f0d4be67
  David Sapák authored May 05, 2022
  
  f0d4be67
- Fixed update method in MusicianController and OfferController · 7434fc7c
  Zuzana Tunegová authored May 05, 2022
  
  7434fc7c
- Changed updatedtomapper for band and activity · ec88a77b
  David Zelnik authored May 05, 2022
  
  ec88a77b