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

Commit 22ce340d authored 4 years ago by User expired

Browse files

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

parents a028ca42 3dc90b12

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/gui/components/form/flexible/impl/Form.java 9 additions, 6 deletions

...org/olat/core/gui/components/form/flexible/impl/Form.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java 7 additions, 1 deletion

...m/flexible/impl/elements/table/FlexiTableElementImpl.java
src/main/java/org/olat/core/util/FileUtils.java 1 addition, 1 deletion

src/main/java/org/olat/core/util/FileUtils.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 11 additions, 3 deletions

...ava/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
src/main/java/org/olat/course/nodes/iq/QTI21EditLayoutForm.java 1 addition, 1 deletion

...in/java/org/olat/course/nodes/iq/QTI21EditLayoutForm.java
src/main/java/org/olat/course/nodes/survey/SurveyManager.java 3 additions, 2 deletions

...main/java/org/olat/course/nodes/survey/SurveyManager.java
src/main/java/org/olat/course/nodes/survey/manager/SurveyManagerImpl.java 3 additions, 2 deletions

...g/olat/course/nodes/survey/manager/SurveyManagerImpl.java
src/main/java/org/olat/course/nodes/survey/ui/SurveyDeleteDataConfirmationController.java 7 additions, 4 deletions

...des/survey/ui/SurveyDeleteDataConfirmationController.java
src/main/java/org/olat/course/nodes/survey/ui/SurveyRunController.java 4 additions, 2 deletions

.../org/olat/course/nodes/survey/ui/SurveyRunController.java
src/main/java/org/olat/course/nodes/survey/ui/_content/delete_data_confirmation.html 1 addition, 1 deletion

...se/nodes/survey/ui/_content/delete_data_confirmation.html
src/main/java/org/olat/course/nodes/survey/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

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

...t/course/nodes/survey/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/survey/ui/_i18n/LocalStrings_fr.properties 26 additions, 27 deletions

...t/course/nodes/survey/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/survey/ui/_i18n/LocalStrings_it.properties 5 additions, 6 deletions

...t/course/nodes/survey/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/nodes/survey/ui/_i18n/LocalStrings_pt_BR.properties 19 additions, 20 deletions

...ourse/nodes/survey/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java 20 additions, 11 deletions

...ules/bigbluebutton/ui/BigBlueButtonMeetingController.java
src/main/java/org/olat/modules/forms/EvaluationFormManager.java 0 additions, 2 deletions

...in/java/org/olat/modules/forms/EvaluationFormManager.java
src/main/java/org/olat/modules/forms/SessionFilterFactory.java 4 additions, 0 deletions

...ain/java/org/olat/modules/forms/SessionFilterFactory.java
src/main/java/org/olat/modules/forms/manager/EvaluationFormManagerImpl.java 0 additions, 5 deletions

...olat/modules/forms/manager/EvaluationFormManagerImpl.java

with 124 additions and 97 deletions

Please register or to comment