Skip to content
  1. Apr 30, 2023
  2. Apr 29, 2023
  3. Apr 28, 2023
  4. Apr 27, 2023
  5. Apr 26, 2023
  6. Apr 25, 2023
  7. Apr 17, 2023
    • Ester Vilímková's avatar
      Merge branch 'M2' into 'main' · fb23854f
      Ester Vilímková authored
      M2
      
      See merge request !31
      fb23854f
    • Dominika Zemanovičová's avatar
      Fix merge errors M2-user merge · 7f46a9f6
      Dominika Zemanovičová authored
      7f46a9f6
    • Dominika Zemanovičová's avatar
      Merge remote-tracking branch 'origin/M2-user' into M2 · edb79d88
      Dominika Zemanovičová authored
      # Conflicts:
      #	application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java
      #	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
      #	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java
      #	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java
      #	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java
      #	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseFacade.java
      #	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java
      edb79d88
    • Dominika Zemanovičová's avatar
      Fix merge errors · 42013ed6
      Dominika Zemanovičová authored
      42013ed6
    • Dominika Zemanovičová's avatar
      Merge branch 'M2-exercise' into M2 · 276a790a
      Dominika Zemanovičová authored
      # Conflicts:
      #	application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
      #	application/model/src/main/java/org/fuseri/model/dto/lecture/LectureDto.java
      #	application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java
      #	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
      #	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseControllerTest.java
      #	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java
      276a790a