Skip to content
Snippets Groups Projects
Select Git revision
No matching results
An error occurred while fetching branches. Retry the search.
An error occurred while fetching tags. Retry the search.
Search by author
  • Any Author
  • Dominika Zemanovičová Dominika Zemanovičová xzemanov
  • Ester Vilímková Ester Vilímková xvilimk
  • Jan Pokorný Jan Pokorný xpokorn8
  • Martin Gargalovič Martin Gargalovič xgargal
  • Pavel Šeda Pavel Šeda xseda2
5 authors
  1. Apr 30, 2023
  3. Apr 29, 2023
  5. Apr 17, 2023
    • 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
  7. Apr 16, 2023