Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1 (f07358c5) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit f07358c5 authored 4 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1

parents a13355e8 fa8eacc5

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/assessment/manager/AssessmentModeManagerImpl.java 2 additions, 6 deletions

.../course/assessment/manager/AssessmentModeManagerImpl.java
src/main/java/org/olat/course/reminder/rule/AttemptsRuleSPI.java 1 addition, 1 deletion

...n/java/org/olat/course/reminder/rule/AttemptsRuleSPI.java
src/main/java/org/olat/ims/qti21/AssessmentTestHelper.java 3 additions, 1 deletion

src/main/java/org/olat/ims/qti21/AssessmentTestHelper.java
src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java 10 additions, 7 deletions

...rg/olat/ims/qti21/ui/AssessmentTestDisplayController.java
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionAssessmentItemListController.java 2 additions, 2 deletions

...ui/assessment/CorrectionAssessmentItemListController.java
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemController.java 8 additions, 3 deletions

...ssessment/CorrectionIdentityAssessmentItemController.java
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemListController.java 1 addition, 1 deletion

...sment/CorrectionIdentityAssessmentItemListController.java
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemNavigationController.java 2 additions, 2 deletions

...CorrectionIdentityAssessmentItemNavigationController.java
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_de.properties 2 additions, 1 deletion

.../ims/qti21/ui/assessment/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

.../ims/qti21/ui/assessment/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

.../ims/qti21/ui/assessment/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/fo/Message.java 9 additions, 0 deletions

src/main/java/org/olat/modules/fo/Message.java
src/main/java/org/olat/modules/fo/MessageLight.java 5 additions, 0 deletions

src/main/java/org/olat/modules/fo/MessageLight.java
src/main/java/org/olat/modules/fo/archiver/MessageNode.java 5 additions, 1 deletion

src/main/java/org/olat/modules/fo/archiver/MessageNode.java
src/main/java/org/olat/modules/fo/manager/ForumManager.java 1 addition, 0 deletions

src/main/java/org/olat/modules/fo/manager/ForumManager.java
src/main/java/org/olat/modules/fo/model/MessageImpl.java 37 additions, 47 deletions

src/main/java/org/olat/modules/fo/model/MessageImpl.java
src/main/java/org/olat/modules/fo/model/MessageLightImpl.java 20 additions, 2 deletions

...main/java/org/olat/modules/fo/model/MessageLightImpl.java
src/main/java/org/olat/modules/fo/restapi/MessageVO.java 1 addition, 1 deletion

src/main/java/org/olat/modules/fo/restapi/MessageVO.java
src/main/java/org/olat/modules/fo/ui/MessageEditController.java 3 additions, 1 deletion

...in/java/org/olat/modules/fo/ui/MessageEditController.java
src/main/java/org/olat/modules/fo/ui/MessageListController.java 6 additions, 0 deletions

...in/java/org/olat/modules/fo/ui/MessageListController.java

with 121 additions and 77 deletions

Please register or to comment