Skip to content
  1. May 23, 2023
  2. May 22, 2023
  3. May 20, 2023
  4. May 19, 2023
  5. May 08, 2023
    • Kryštof-Mikuláš Štys's avatar
      Merge branch 'removed_todo' into 'develop' · ea931aa3
      Kryštof-Mikuláš Štys authored
      Small mistakes changes
      
      See merge request !96
      ea931aa3
    • Matej Gorgol's avatar
      Merge branch 'develop' into removed_todo · 836fd738
      Matej Gorgol authored
      # Conflicts:
      #	flight-module/src/main/java/cz/muni/fi/pa165/airportmanager/flightmodule/rest/FlightController.java
      836fd738
    • Kryštof-Mikuláš Štys's avatar
      Merge branch 'check-style' into 'develop' · 20ba2651
      Kryštof-Mikuláš Štys authored
      Checkstyle for the Classes
      
      See merge request !91
      20ba2651
    • Matej Gorgol's avatar
      Small mistakes changes · 5ed5aac5
      Matej Gorgol authored
      5ed5aac5
    • Tereza Vrabcová's avatar
      Merge branch 'develop' into 'check-style' · 9b8ffaa2
      Tereza Vrabcová authored
      # Conflicts:
      #   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/rest/PlaneController.java
      9b8ffaa2
    • Kryštof-Mikuláš Štys's avatar
      Merge branch 'flight-error-text-fix' into 'develop' · 935d05fa
      Kryštof-Mikuláš Štys authored
      [Enh] makes the flight-stewards error message better
      
      See merge request !94
      935d05fa
    • Kryštof-Mikuláš Štys's avatar
      Merge branch 'plane-module' into 'develop' · a94c94a7
      Kryštof-Mikuláš Štys authored
      [Enh] PlaneModule: Annotation fix, Endpoint parameter example
      
      See merge request !95
      a94c94a7
    • Tomáš Tomala's avatar
      [Enh] Example ZonedDateTime · 339a568e
      Tomáš Tomala authored
      339a568e
    • Matej Gorgol's avatar
      6c0a0921
    • Tereza Vrabcová's avatar
      [fix] resolve merge conflicts · 471b7276
      Tereza Vrabcová authored
      471b7276
    • Tomáš Tomala's avatar
      [Fix] Zero capacity fix · de48acab
      Tomáš Tomala authored
      de48acab
    • Matěj Gorgol's avatar
      Merge branch 'Readme-additions' into 'develop' · 24736024
      Matěj Gorgol authored
      [Enh] Readme additions
      
      See merge request !93
      24736024
    • Kryštof-Mikuláš Štys's avatar
      [Enh] Readme additions · bccb87c7
      Kryštof-Mikuláš Štys authored
      bccb87c7
    • Tereza Vrabcová's avatar
      Merge branch 'develop' into 'check-style' · 92b008fe
      Tereza Vrabcová authored
      # Conflicts:
      #   domain-module/src/main/java/cz/muni/fi/pa165/airportmanager/domainmodule/service/RetrieveEntityServiceImpl.java
      #   domain-module/src/main/java/cz/muni/fi/pa165/airportmanager/domainmodule/service/RetrieveMultipleEntitiesByIdServiceImpl.java
      #   domain-module/src/main/java/cz/muni/fi/pa165/airportmanager/domainmodule/service/RetrieveMultipleEntitiesService.java
      #   flight-module/src/main/java/cz/muni/fi/pa165/airportmanager/flightmodule/facade/FlightFacade.java
      #   flight-module/src/main/java/cz/muni/fi/pa165/airportmanager/flightmodule/facade/FlightFacadeImpl.java
      #   flight-module/src/main/java/cz/muni/fi/pa165/airportmanager/flightmodule/rest/FlightController.java
      #   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/facade/PlaneFacade.java
      #   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/facade/PlaneFacadeImpl.java
      #   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/rest/PlaneController.java
      #   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/service/FlightServiceImpl.java
      #   plane-module/src/test/java/cz/muni/fi/pa165/airportmanager/planemodule/facade/PlaneFacadeImplTest.java
      #   plane-module/src/test/java/cz/muni/fi/pa165/airportmanager/planemodule/rest/PlaneControllerTest.java
      #   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/facade/StewardFacadeImpl.java
      #   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/rest/StewardController.java
      #   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/service/AirlineServiceImpl.java
      #   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/service/DestinationServiceImpl.java
      #   steward-module/src/test/java/cz/muni/fi/pa165/airportmanager/stewardmodule/endtoendtests/StewardEndToEndTests.java
      #   steward-module/src/test/java/cz/muni/fi/pa165/airportmanager/stewardmodule/facade/StewardFacadeTest.java
      #   steward-module/src/test/java/cz/muni/fi/pa165/airportmanager/stewardmodule/integrationtests/StewardIntegrationTest.java
      #   steward-module/src/test/java/cz/muni/fi/pa165/airportmanager/stewardmodule/service/StewardServiceTest.java
      92b008fe
  6. May 07, 2023