Merge remote-tracking branch 'origin/OpenOLAT_14.1'
Conflicts: src/main/java/org/olat/course/certificate/restapi/CertificationWebService.java src/main/java/org/olat/course/db/restapi/CourseDbWebService.java src/main/java/org/olat/course/nodes/co/COWebService.java src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java src/main/java/org/olat/modules/fo/restapi/ForumCourseNodeWebService.java src/main/java/org/olat/modules/fo/restapi/ForumWebService.java src/main/java/org/olat/registration/restapi/RegistrationWebService.java src/main/java/org/olat/restapi/group/LearningGroupWebService.java src/main/java/org/olat/restapi/group/MyGroupWebService.java
No related branches found
No related tags found
Showing
- src/main/java/org/olat/course/certificate/restapi/CertificationWebService.java 3 additions, 2 deletions...t/course/certificate/restapi/CertificationWebService.java
- src/main/java/org/olat/course/db/restapi/CourseDbWebService.java 4 additions, 3 deletions...n/java/org/olat/course/db/restapi/CourseDbWebService.java
- src/main/java/org/olat/course/nodes/co/COWebService.java 1 addition, 1 deletionsrc/main/java/org/olat/course/nodes/co/COWebService.java
- src/main/java/org/olat/login/auth/OLATAuthManager.java 1 addition, 1 deletionsrc/main/java/org/olat/login/auth/OLATAuthManager.java
- src/main/java/org/olat/login/validation/UsernameValidationRulesFactory.java 4 additions, 2 deletions...olat/login/validation/UsernameValidationRulesFactory.java
- src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java 4 additions, 3 deletions...ules/curriculum/restapi/CurriculumElementsWebService.java
- src/main/java/org/olat/modules/fo/restapi/ForumCourseNodeWebService.java 13 additions, 10 deletions...rg/olat/modules/fo/restapi/ForumCourseNodeWebService.java
- src/main/java/org/olat/modules/fo/restapi/ForumWebService.java 5 additions, 6 deletions...ain/java/org/olat/modules/fo/restapi/ForumWebService.java
- src/main/java/org/olat/registration/restapi/RegistrationWebService.java 2 additions, 1 deletion...org/olat/registration/restapi/RegistrationWebService.java
- src/main/java/org/olat/restapi/group/LearningGroupWebService.java 2 additions, 2 deletions.../java/org/olat/restapi/group/LearningGroupWebService.java
- src/main/java/org/olat/restapi/group/MyGroupWebService.java 5 additions, 4 deletionssrc/main/java/org/olat/restapi/group/MyGroupWebService.java
- src/main/java/org/olat/shibboleth/ShibbolethRegistrationForm.java 3 additions, 3 deletions.../java/org/olat/shibboleth/ShibbolethRegistrationForm.java
Loading
Please register or sign in to comment