Merge branch 'OpenOLAT_15.2' (b6edef60) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

b6edef60

Commit b6edef60 authored 4 years ago by uhensler

Downloads
- Plain Diff

Merge branch 'OpenOLAT_15.2'

parents f74ad81f f3dd2f87

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/SurveyCourseNode.java 1 addition, 1 deletion

src/main/java/org/olat/course/nodes/SurveyCourseNode.java
src/main/java/org/olat/course/nodes/gta/ui/DirectoryController.java 3 additions, 1 deletion

...ava/org/olat/course/nodes/gta/ui/DirectoryController.java
src/main/java/org/olat/course/nodes/st/STCourseNodeDisplayConfigFormController.java 3 additions, 6 deletions

...rse/nodes/st/STCourseNodeDisplayConfigFormController.java
src/main/java/org/olat/course/nodes/survey/SurveyRunController.java 0 additions, 291 deletions

...ava/org/olat/course/nodes/survey/SurveyRunController.java
src/main/java/org/olat/course/nodes/survey/ui/SurveyReportingController.java 12 additions, 2 deletions

...lat/course/nodes/survey/ui/SurveyReportingController.java
src/main/java/org/olat/course/nodes/survey/ui/SurveyRunController.java 3 additions, 2 deletions

.../org/olat/course/nodes/survey/ui/SurveyRunController.java
src/main/java/org/olat/course/nodes/survey/ui/SurveyStatisticResourceResult.java 9 additions, 5 deletions

...course/nodes/survey/ui/SurveyStatisticResourceResult.java
src/main/java/org/olat/course/nodes/survey/ui/_i18n/LocalStrings_de.properties 22 additions, 20 deletions

...t/course/nodes/survey/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/survey/ui/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...t/course/nodes/survey/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/forms/ui/EvaluationFormReportsController.java 3 additions, 7 deletions

...lat/modules/forms/ui/EvaluationFormReportsController.java
src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java 3 additions, 4 deletions

...g/olat/selenium/page/course/CourseEditorPageFragment.java

with 61 additions and 339 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment