Commits · master · David Rusnák / PA165 Secret Service Archive

Jun 09, 2021
- Merge branch 'assign_FE' into 'master' · f16399a1
  Jakub Hanko authored Jun 09, 2021
```
Update ERD.jpg

See merge request !86
```
  f16399a1
Jun 08, 2021
- Update ERD.jpg · 5ca09e40
  Angie authored Jun 08, 2021
  
  5ca09e40
Jun 07, 2021
- Merge branch 'mission-fe-3' into 'master' · f99d7ee9
  David Myška authored Jun 07, 2021
```
Mission fe 3

See merge request !81
```
  f99d7ee9
Jun 06, 2021
- Merge branch 'swagger_fix' into 'master' · 9099b976
  David Rusnák authored Jun 06, 2021
```
fix swagger authentization

See merge request !85
```
  9099b976
- fix swagger authentization · b9dfe84a
  David Rusnák authored Jun 06, 2021
  
  b9dfe84a
Jun 05, 2021
- Merge branch 'cleanup' into 'master' · d9a4bac2
  David Rusnák authored Jun 05, 2021
```
Cleanup

See merge request !83
```
  d9a4bac2
- Cleanup · fde21dc6
  Jakub Hanko authored Jun 05, 2021 and David Rusnák committed Jun 05, 2021
  
  fde21dc6
- Merge branch 'fix_tests' into 'master' · 0b8d39ef
  David Rusnák authored Jun 05, 2021
```
tests fix

See merge request !84
```
  0b8d39ef
- tests fix · dc3e379b
  David Rusnák authored Jun 05, 2021
  
  dc3e379b
- Fixed assignments rendering in mission details. · 68b9830b
  Jakub Hanko authored Jun 05, 2021
  
  68b9830b
- WIP: assignments rendering in MissionDetails. · c58bc95c
  Jakub Hanko authored Jun 05, 2021
  
  c58bc95c
- Merge branch 'AssignmentDetails_FE' into 'master' · 46038348
  David Myška authored Jun 05, 2021
```
AssignmentDetails FE for Admin and Agent

See merge request !82
```
  46038348
- AssignmentDetails FE for Admin and Agent · c56d5e87
  xpecuch3 authored Jun 05, 2021
  
  c56d5e87
- update readme · 0c6c536f
  David Rusnák authored Jun 05, 2021
  
  0c6c536f
Jun 04, 2021
- Added edit and delete buttons to Mission Details. · bd0c6872
  Jakub Hanko authored Jun 04, 2021
  
  bd0c6872
- Merge remote-tracking branch 'origin/master' · 84fa7abb
  xpecuch3 authored Jun 04, 2021
```
# Conflicts:
#	service/src/test/java/cz/muni/fi/pa165/facade/TestMissionFacadeImpl.java
#	service/src/test/java/cz/muni/fi/pa165/service/TestMissionServiceImpl.java
```
  84fa7abb
- Merge branch 'fixed_variables_naming_in_tests' · 671ebe05
  xpecuch3 authored Jun 04, 2021
  
  671ebe05
- Made the spacing in MissionList similar to the rest of the application. · 839428e3
  Jakub Hanko authored Jun 04, 2021
  
  839428e3
- Fixed mission creation bug. · c4a0e3b1
  Jakub Hanko authored Jun 04, 2021
  
  c4a0e3b1
- Implemented AgentReport and OperatorReport, removed Report Entity (it was unneccesary) · 401c6228
  xpecuch3 authored Jun 04, 2021
  
  401c6228
- Merge branch 'code-cleanup' into 'master' · 529083e9
  David Myška authored Jun 04, 2021
```
Code cleanup

See merge request !79
```
  529083e9
- removed unnecesary comments and some unused code · 6f5d5284
  David Myska authored Jun 04, 2021
  
  6f5d5284
- Removed unused imports · 850bec86
  David Myska authored Jun 04, 2021
  
  850bec86
- Merge branch 'report_frontend+backend' into 'master' · d6f0f91a
  David Myška authored Jun 04, 2021
```
Implemented AgentReport and OperatorReport, removed Report Entity (it was unneccesary)

See merge request !78
```
  d6f0f91a
- Implemented AgentReport and OperatorReport, removed Report Entity (it was unneccesary) · 504e0404
  xpecuch3 authored Jun 04, 2021
  
  504e0404
- Merge branch 'updates' into 'master' · a873ff01
  David Myška authored Jun 04, 2021
```
Create Assignment works, agent details show assignments, other smaller stuff

See merge request !77
```
  a873ff01
- Create Assignment works, agent details show assignments, other smaller stuff · 79da8a7d
  David Myska authored Jun 04, 2021
  
  79da8a7d
Jun 02, 2021
- Merge branch 'assign_FE' into 'master' · bab9c88a
  Jakub Hanko authored Jun 02, 2021
```
Add FE for Assignment

See merge request !75
```
  bab9c88a
- Updated assignment · 4eab9880
  David Myska authored Jun 02, 2021
  
  4eab9880
Jun 01, 2021
- Merge branch 'master' of... · b5b8ab28
  Angie authored Jun 01, 2021
```
Merge branch 'master' of https://gitlab.fi.muni.cz/xrusnak1/pa165-secret-service-archive into assign_FE
Adjust FE for Assignment

GG
```
  b5b8ab28
- Merge branch 'agent-fe-additions' into 'master' · 1ef8151e
  David Myška authored Jun 01, 2021
```
Updates to the agent

See merge request !76
```
  1ef8151e
- Merge branch 'master' into 'agent-fe-additions' · 7f567bf3
  David Myška authored Jun 01, 2021
```
# Conflicts:
#   frontend/src/components/utilities/MainWindow.js
```
  7f567bf3
- Merge branch 'mission-fe-2' into 'master' · 8391d304
  David Myška authored Jun 01, 2021
```
Mission fe 2

See merge request !74
```
  8391d304
May 31, 2021
- Updates to the agent · e12e8567
  David Myska authored May 31, 2021
  
  e12e8567
- Added Unique constraint to Mission entity · b6dcdf2a
  Jakub Hanko authored May 31, 2021
  
  b6dcdf2a
- Allow only one demo data filling. · 88d0c9a4
  Jakub Hanko authored May 31, 2021
  
  88d0c9a4
- Merge branch 'master' of gitlab.fi.muni.cz:xrusnak1/pa165-secret-service-archive into mission-fe-2 · cdfbf12b
  Jakub Hanko authored May 31, 2021
  
  cdfbf12b
- Merge branch 'country_frontend_input_validation+roles' into 'master' · 75fb396c
  Jakub Hanko authored May 31, 2021
```
Country Frontend Input Validation And Roles

See merge request !73
```
  75fb396c
- Adjust FE · c409559a
  Angie authored May 31, 2021
  
  c409559a
- Repair mistakes · cde1073a
  Angie authored May 31, 2021
  
  cde1073a