Merge remote-tracking branch 'upstream/OpenOLAT_15.1' into OpenOLAT_15.1.uibk (a15a711c) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit a15a711c authored 4 years ago by Andreas Parschalk

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_15.1' into OpenOLAT_15.1.uibk

parents d90b0a04 912432bb

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 7 additions, 7 deletions

pom.xml
src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java 12 additions, 7 deletions

.../org/olat/admin/user/UsermanagerUserSearchController.java
src/main/java/org/olat/admin/user/UsermanagerUserSearchForm.java 1 addition, 1 deletion

...n/java/org/olat/admin/user/UsermanagerUserSearchForm.java
src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml 0 additions, 4 deletions

...org/olat/core/commons/services/jmx/_spring/jmxContext.xml
src/main/java/org/olat/core/gui/components/link/LinkRenderer.java 3 additions, 3 deletions

.../java/org/olat/core/gui/components/link/LinkRenderer.java
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

...org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_en.properties 2 additions, 2 deletions

...org/olat/course/nodes/iq/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/manager/QTI21StatisticsManagerImpl.java 2 additions, 1 deletion

...rg/olat/ims/qti21/manager/QTI21StatisticsManagerImpl.java
src/main/java/org/olat/ims/qti21/questionimport/CSVToAssessmentItemConverter.java 1 addition, 0 deletions

...ms/qti21/questionimport/CSVToAssessmentItemConverter.java
src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentTestSessionTableModel.java 7 additions, 5 deletions

...at/ims/qti21/ui/QTI21AssessmentTestSessionTableModel.java
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties 5 additions, 5 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties 4 additions, 4 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/grading/manager/GradingServiceImpl.java 8 additions, 1 deletion

.../org/olat/modules/grading/manager/GradingServiceImpl.java
src/main/java/org/olat/user/ui/admin/UserAdminMainController.java 15 additions, 14 deletions

.../java/org/olat/user/ui/admin/UserAdminMainController.java
src/main/java/org/olat/user/ui/admin/UserSearchTableController.java 1 addition, 1 deletion

...ava/org/olat/user/ui/admin/UserSearchTableController.java
src/main/java/org/olat/user/ui/admin/UserSearchTableSettings.java 14 additions, 5 deletions

.../java/org/olat/user/ui/admin/UserSearchTableSettings.java
src/main/java/org/olat/user/ui/admin/lifecycle/ConfirmDeleteUserController.java 7 additions, 1 deletion

.../user/ui/admin/lifecycle/ConfirmDeleteUserController.java
src/main/java/org/olat/user/ui/admin/lifecycle/UserLifecycleOverviewController.java 3 additions, 3 deletions

...r/ui/admin/lifecycle/UserLifecycleOverviewController.java

with 97 additions and 69 deletions

Please register or to comment