Merge branch 'OpenOLAT_15.0'
Conflicts: src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml src/main/resources/serviceconfig/olat.properties src/main/webapp/static/themes/light/theme.css src/main/webapp/static/themes/light/theme.css.map src/main/webapp/static/themes/openolat/theme.css src/main/webapp/static/themes/openolat/theme.css.map
No related branches found
No related tags found
Showing
- src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java 3 additions, 1 deletion...e/commons/services/vfs/ui/version/VFSTrashController.java
- src/main/java/org/olat/course/assessment/AssessmentManager.java 3 additions, 1 deletion...in/java/org/olat/course/assessment/AssessmentManager.java
- src/main/java/org/olat/course/assessment/CourseAssessmentService.java 2 additions, 1 deletion...a/org/olat/course/assessment/CourseAssessmentService.java
- src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java 3 additions, 2 deletions...se/assessment/manager/AssessmentNotificationsHandler.java
- src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java 4 additions, 1 deletion...ourse/assessment/manager/CourseAssessmentManagerImpl.java
- src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java 4 additions, 3 deletions...ourse/assessment/manager/CourseAssessmentServiceImpl.java
- src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java 5 additions, 1 deletion...va/org/olat/course/assessment/ui/tool/AssessmentForm.java
- src/main/java/org/olat/course/assessment/ui/tool/AssessmentToolController.java 6 additions, 1 deletion...t/course/assessment/ui/tool/AssessmentToolController.java
- src/main/java/org/olat/course/assessment/ui/tool/tools/ResetAttemptsConfirmationController.java 2 additions, 2 deletions...nt/ui/tool/tools/ResetAttemptsConfirmationController.java
- src/main/java/org/olat/course/condition/interpreter/GetLastAttemptDateFunction.java 15 additions, 30 deletions...rse/condition/interpreter/GetLastAttemptDateFunction.java
- src/main/java/org/olat/course/config/ui/AssessmentResetController.java 6 additions, 4 deletions.../org/olat/course/config/ui/AssessmentResetController.java
- src/main/java/org/olat/course/config/ui/CourseScoreController.java 1 addition, 1 deletion...java/org/olat/course/config/ui/CourseScoreController.java
- src/main/java/org/olat/course/learningpath/evaluation/DefaultLearningPathStatusEvaluator.java 2 additions, 2 deletions...ngpath/evaluation/DefaultLearningPathStatusEvaluator.java
- src/main/java/org/olat/course/learningpath/evaluation/LearningPathEvaluatorBuilder.java 1 addition, 1 deletion...learningpath/evaluation/LearningPathEvaluatorBuilder.java
- src/main/java/org/olat/course/learningpath/ui/LearningPathNodeConfigController.java 1 addition, 0 deletions...rse/learningpath/ui/LearningPathNodeConfigController.java
- src/main/java/org/olat/course/nodes/IQSURVCourseNode.java 0 additions, 23 deletionssrc/main/java/org/olat/course/nodes/IQSURVCourseNode.java
- src/main/java/org/olat/course/nodes/st/assessment/STAssessmentHandler.java 2 additions, 2 deletions.../olat/course/nodes/st/assessment/STAssessmentHandler.java
- src/main/java/org/olat/course/nodes/st/assessment/STConditionStatusEvaluator.java 7 additions, 7 deletions...ourse/nodes/st/assessment/STConditionStatusEvaluator.java
- src/main/java/org/olat/course/nodes/st/assessment/STLearningPathStatusEvaluator.java 2 additions, 2 deletions...se/nodes/st/assessment/STLearningPathStatusEvaluator.java
- src/main/java/org/olat/course/nodes/ta/ConvertToGTACourseNode.java 1 addition, 1 deletion...java/org/olat/course/nodes/ta/ConvertToGTACourseNode.java
Loading
Please register or sign in to comment