Merge remote-tracking branch 'upstream/master' into OpenOLAT_14.0.uibk (c598b554) · 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

c598b554

Commit c598b554 authored 5 years ago by User expired

Downloads
- Plain Diff

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

parents 3d94df82 e7ac636c

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/core/dispatcher/mapper/MapperDispatcher.java 6 additions, 5 deletions

...ava/org/olat/core/dispatcher/mapper/MapperDispatcher.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/Form.java 10 additions, 6 deletions

...org/olat/core/gui/components/form/flexible/impl/Form.java
src/main/java/org/olat/course/assessment/manager/AssessmentModeCoordinationServiceImpl.java 7 additions, 0 deletions

...ssment/manager/AssessmentModeCoordinationServiceImpl.java
src/main/java/org/olat/course/editor/MultiSPController.java 27 additions, 3 deletions

src/main/java/org/olat/course/editor/MultiSPController.java
src/main/java/org/olat/ims/qti21/ui/_content/assessment_results.html 8 additions, 0 deletions

...va/org/olat/ims/qti21/ui/_content/assessment_results.html
src/main/java/org/olat/modules/forms/model/jpa/RubricStatisticImpl.java 10 additions, 21 deletions

...org/olat/modules/forms/model/jpa/RubricStatisticImpl.java
src/main/java/org/olat/modules/forms/ui/EvaluationFormExecutionController.java 5 additions, 9 deletions

...t/modules/forms/ui/EvaluationFormExecutionController.java
src/main/java/org/olat/modules/forms/ui/TextInputController.java 2 additions, 2 deletions

...n/java/org/olat/modules/forms/ui/TextInputController.java
src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.js 2 additions, 1 deletion

.../webapp/static/js/jquery/openolat/jquery.contenteditor.js
src/test/java/org/olat/modules/adobeconnect/manager/AdobeConnectProviderTest.java 3 additions, 1 deletion

...odules/adobeconnect/manager/AdobeConnectProviderTest.java

with 80 additions and 48 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