Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2 (773d6a51) · 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

773d6a51

Commit 773d6a51 authored 5 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

parents 1ad4d778 04ebea94

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/assessment/bulk/BulkAssessment_2_DatasStep.java 1 addition, 1 deletion

...at/course/assessment/bulk/BulkAssessment_2_DatasStep.java
src/main/java/org/olat/course/assessment/bulk/DataStepForm.java 69 additions, 16 deletions

...in/java/org/olat/course/assessment/bulk/DataStepForm.java
src/main/java/org/olat/course/assessment/bulk/_i18n/LocalStrings_de.properties 12 additions, 5 deletions

...t/course/assessment/bulk/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/bulk/_i18n/LocalStrings_en.properties 12 additions, 49 deletions

...t/course/assessment/bulk/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java 45 additions, 18 deletions

...rg/olat/course/assessment/manager/BulkAssessmentTask.java
src/main/java/org/olat/course/assessment/model/BulkAssessmentDatas.java 30 additions, 0 deletions

...org/olat/course/assessment/model/BulkAssessmentDatas.java
src/main/java/org/olat/course/nodes/gta/GTAManager.java 1 addition, 1 deletion

src/main/java/org/olat/course/nodes/gta/GTAManager.java
src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java 2 additions, 2 deletions

...ava/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
src/main/java/org/olat/course/nodes/gta/ui/GTACoachController.java 7 additions, 11 deletions

...java/org/olat/course/nodes/gta/ui/GTACoachController.java
src/main/java/org/olat/course/nodes/gta/ui/GTACoachRevisionAndCorrectionsController.java 1 addition, 1 deletion

...odes/gta/ui/GTACoachRevisionAndCorrectionsController.java

with 180 additions and 104 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