Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1 (a8855e7a) · 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

a8855e7a

Commit a8855e7a authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1

parents 83006d7c 78c054df

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/commons/coordinate/cluster/lock/ClusterLocker.java 10 additions, 0 deletions

...g/olat/commons/coordinate/cluster/lock/ClusterLocker.java
src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxUIFactory.java 9 additions, 4 deletions

...at/core/gui/control/generic/modal/DialogBoxUIFactory.java
src/main/java/org/olat/core/util/coordinate/Locker.java 8 additions, 1 deletion

src/main/java/org/olat/core/util/coordinate/Locker.java
src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java 12 additions, 10 deletions

...sment/ui/tool/AssessmentIdentityCourseNodeController.java
src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java 33 additions, 1 deletion

.../assessment/ui/tool/IdentityListCourseNodeController.java
src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java 2 additions, 2 deletions

...rse/assessment/ui/tool/tools/AbstractToolsController.java
src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsManagerImpl.java 6 additions, 2 deletions

...modules/openmeetings/manager/OpenMeetingsManagerImpl.java
src/main/java/org/olat/modules/scorm/assessment/_i18n/LocalStrings_de.properties 4 additions, 4 deletions

...modules/scorm/assessment/_i18n/LocalStrings_de.properties

with 84 additions and 24 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