There was an error fetching the commit references. Please try again later.
Merge remote-tracking branch 'origin/M2-user' into M2
# 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
Showing
- application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java 3 additions, 2 deletions.../src/main/java/org/fuseri/model/dto/course/CourseDto.java
- application/model/src/main/java/org/fuseri/model/dto/course/ProficiencyLevelDto.java 33 additions, 9 deletions...java/org/fuseri/model/dto/course/ProficiencyLevelDto.java
- application/model/src/main/java/org/fuseri/model/dto/user/AddressDto.java 7 additions, 0 deletions...l/src/main/java/org/fuseri/model/dto/user/AddressDto.java
- application/model/src/main/java/org/fuseri/model/dto/user/UserCreateDto.java 18 additions, 0 deletions...rc/main/java/org/fuseri/model/dto/user/UserCreateDto.java
- application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java 21 additions, 3 deletions...odel/src/main/java/org/fuseri/model/dto/user/UserDto.java
- application/model/src/main/java/org/fuseri/model/dto/user/UserLoginDto.java 2 additions, 0 deletions...src/main/java/org/fuseri/model/dto/user/UserLoginDto.java
- application/model/src/main/java/org/fuseri/model/dto/user/UserType.java 7 additions, 0 deletions...del/src/main/java/org/fuseri/model/dto/user/UserType.java
- application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java 0 additions, 1 deletion...g/fuseri/modulecertificate/service/CertificateFacade.java
- application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java 5 additions, 4 deletions.../fuseri/modulecertificate/CertificateControllerTests.java
- application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java 4 additions, 3 deletions.../org/fuseri/modulecertificate/CertificateFacadeTests.java
- application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java 5 additions, 3 deletions.../org/fuseri/modulecertificate/CertificateMapperTests.java
- application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java 3 additions, 3 deletions...org/fuseri/modulecertificate/CertificateServiceTests.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/DataInitializer.java 0 additions, 36 deletions...java/org/fuseri/modulelanguageschool/DataInitializer.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/common/DomainMapper.java 4 additions, 10 deletions.../org/fuseri/modulelanguageschool/common/DomainMapper.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/common/DomainService.java 24 additions, 0 deletions...org/fuseri/modulelanguageschool/common/DomainService.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/Course.java 13 additions, 0 deletions...n/java/org/fuseri/modulelanguageschool/course/Course.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseController.java 2 additions, 2 deletions.../fuseri/modulelanguageschool/course/CourseController.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseFacade.java 14 additions, 16 deletions.../org/fuseri/modulelanguageschool/course/CourseFacade.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseRepository.java 4 additions, 0 deletions.../fuseri/modulelanguageschool/course/CourseRepository.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/Address.java 1 addition, 0 deletions...in/java/org/fuseri/modulelanguageschool/user/Address.java
Loading
Please register or sign in to comment