Merge remote-tracking branch 'upstream/OpenOLAT_12.5' (deb1ed33) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit deb1ed33 authored 6 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_12.5'

parents 0de00446 11f49e6e

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/commons/memberlist/ui/_i18n/LocalStrings_pt_BR.properties 8 additions, 2 deletions

...commons/memberlist/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...re/commons/modules/bc/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/dispatcher/ErrorsDispatcher.java 56 additions, 0 deletions

src/main/java/org/olat/core/dispatcher/ErrorsDispatcher.java
src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml 5 additions, 0 deletions

...va/org/olat/core/dispatcher/_spring/dispatcherContext.xml
src/main/java/org/olat/core/gui/control/navigation/AbstractSiteDefinition.java 14 additions, 1 deletion

...t/core/gui/control/navigation/AbstractSiteDefinition.java
src/main/java/org/olat/core/gui/control/winmgr/_content/serverpart.html 1 addition, 1 deletion

...org/olat/core/gui/control/winmgr/_content/serverpart.html
src/main/java/org/olat/core/servlets/OpenOLATServlet.java 7 additions, 0 deletions

src/main/java/org/olat/core/servlets/OpenOLATServlet.java
src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../org/olat/core/util/mail/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...va/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...rg/olat/course/editor/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/highscore/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...t/course/highscore/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java 14 additions, 5 deletions

...ava/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java 3 additions, 1 deletion

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

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

...org/olat/course/nodes/iq/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...org/olat/course/nodes/iq/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/run/RunMainController.java 2 additions, 2 deletions

src/main/java/org/olat/course/run/RunMainController.java
src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...org/olat/group/ui/run/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/ims/qti/export/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../org/olat/ims/qti/export/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/FeedbacksEditorController.java 16 additions, 3 deletions

...g/olat/ims/qti21/ui/editor/FeedbacksEditorController.java

with 139 additions and 26 deletions

Please register or to comment