Merge remote-tracking branch 'upstream/OpenOLAT_15.0' into OpenOLAT_15.0.uibk (57fdbf8f) · 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

57fdbf8f

Commit 57fdbf8f authored 4 years ago by User expired

Downloads
- Plain Diff

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

parents eb5d012e 6ce2e869

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/gui/exception/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

.../olat/core/gui/exception/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/mode/AssessmentModeEditController.java 28 additions, 21 deletions

...urse/assessment/ui/mode/AssessmentModeEditController.java
src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...ourse/assessment/ui/mode/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_en.properties 2 additions, 2 deletions

...ourse/assessment/ui/mode/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...ourse/assessment/ui/mode/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_pt_BR.properties 0 additions, 2 deletions

...se/assessment/ui/mode/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/forms/manager/EvaluationFormSessionDAO.java 1 addition, 1 deletion

.../olat/modules/forms/manager/EvaluationFormSessionDAO.java
src/test/java/org/olat/selenium/page/LoginPage.java 5 additions, 1 deletion

src/test/java/org/olat/selenium/page/LoginPage.java
src/test/java/org/olat/selenium/page/course/MyCoursesPage.java 6 additions, 12 deletions

...est/java/org/olat/selenium/page/course/MyCoursesPage.java

with 49 additions and 46 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