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

Commit 9a7c4d82 authored 4 years ago by Andreas Parschalk

Browse files

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

parents 0ddb4be0 3ad3ac50

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java 4 additions, 37 deletions

...lat/core/commons/fullWebApp/BaseFullWebappController.java
src/main/java/org/olat/core/commons/services/webdav/manager/VFSResourceRoot.java 3 additions, 3 deletions

...core/commons/services/webdav/manager/VFSResourceRoot.java
src/main/java/org/olat/core/gui/control/winmgr/CommandFactory.java 6 additions, 1 deletion

...java/org/olat/core/gui/control/winmgr/CommandFactory.java
src/main/java/org/olat/core/util/StringHelper.java 2 additions, 0 deletions

src/main/java/org/olat/core/util/StringHelper.java
src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java 4 additions, 13 deletions

...n/java/org/olat/course/nodes/ProjectBrokerCourseNode.java
src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../olat/course/nodes/cl/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java 16 additions, 0 deletions

...ava/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
src/main/java/org/olat/course/nodes/gta/model/TaskDefinition.java 11 additions, 0 deletions

.../java/org/olat/course/nodes/gta/model/TaskDefinition.java
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

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

...org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerControllerFactory.java 2 additions, 7 deletions

...e/nodes/projectbroker/ProjectBrokerControllerFactory.java
src/main/java/org/olat/course/nodes/projectbroker/ProjectListController.java 3 additions, 4 deletions

...lat/course/nodes/projectbroker/ProjectListController.java
src/main/java/org/olat/dispatcher/DMZDispatcher.java 2 additions, 2 deletions

src/main/java/org/olat/dispatcher/DMZDispatcher.java
src/main/java/org/olat/ims/qti21/resultexport/QTI21ResultsExportMediaResource.java 4 additions, 0 deletions

...s/qti21/resultexport/QTI21ResultsExportMediaResource.java
src/main/java/org/olat/ims/qti21/ui/components/_content/choiceInteraction.html 2 additions, 2 deletions

...t/ims/qti21/ui/components/_content/choiceInteraction.html
src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java 1 addition, 1 deletion

...main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java
src/main/java/org/olat/ldap/ui/DeletStep00.java 0 additions, 1 deletion

src/main/java/org/olat/ldap/ui/DeletStep00.java
src/main/java/org/olat/ldap/ui/DeletStep01.java 0 additions, 1 deletion

src/main/java/org/olat/ldap/ui/DeletStep01.java
src/main/java/org/olat/user/ui/admin/UserSearchTableController.java 3 additions, 1 deletion

...ava/org/olat/user/ui/admin/UserSearchTableController.java
src/main/resources/serviceconfig/olat.properties 2 additions, 2 deletions

src/main/resources/serviceconfig/olat.properties

with 98 additions and 108 deletions

Please register or to comment