-
- Downloads
There was an error fetching the commit references. Please try again later.
Merge branch 'main' into 'language-school-user'
# Conflicts: # application/model/src/main/java/org/fuseri/model/dto/certificate/CertificateDto.java # application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java # application/model/src/main/java/org/fuseri/model/dto/course/LanguageTypeDto.java # application/model/src/main/java/org/fuseri/model/dto/lecture/LectureCreateDto.java # application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java # application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/Course.java # application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseController.java # application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/ProficiencyLevel.java # application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/Lecture.java # application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/LectureController.java # application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseTest.java # application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureTest.java
Showing
- application/model/src/main/java/org/fuseri/model/dto/certificate/CertificateDto.java 6 additions, 1 deletion...java/org/fuseri/model/dto/certificate/CertificateDto.java
- application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java 2 additions, 0 deletions.../src/main/java/org/fuseri/model/dto/course/CourseDto.java
- application/model/src/main/java/org/fuseri/model/dto/course/LanguageTypeDto.java 0 additions, 3 deletions...ain/java/org/fuseri/model/dto/course/LanguageTypeDto.java
- application/model/src/main/java/org/fuseri/model/dto/lecture/LectureCreateDto.java 9 additions, 1 deletion...n/java/org/fuseri/model/dto/lecture/LectureCreateDto.java
- application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java 4 additions, 14 deletions...seri/modulecertificate/service/CertificateController.java
- application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java 165 additions, 0 deletions.../fuseri/modulecertificate/CertificateControllerTests.java
- application/module-language-school/pom.xml 8 additions, 0 deletionsapplication/module-language-school/pom.xml
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/Course.java 1 addition, 5 deletions...n/java/org/fuseri/modulelanguageschool/course/Course.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseController.java 7 additions, 6 deletions.../fuseri/modulelanguageschool/course/CourseController.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/Lecture.java 0 additions, 4 deletions...java/org/fuseri/modulelanguageschool/lecture/Lecture.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/LectureController.java 3 additions, 5 deletions...useri/modulelanguageschool/lecture/LectureController.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/ModuleLanguageSchoolApplicationTests.java 0 additions, 13 deletions...elanguageschool/ModuleLanguageSchoolApplicationTests.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseTest.java 290 additions, 15 deletions...va/org/fuseri/modulelanguageschool/course/CourseTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureTest.java 228 additions, 24 deletions.../org/fuseri/modulelanguageschool/lecture/LectureTest.java
Loading
Please register or sign in to comment