Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk (9182bcf3) · 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

9182bcf3

Commit 9182bcf3 authored 4 years ago by User expired

Downloads
- Plain Diff

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

parents 7d138095 491e4dd6

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/ims/qti21/questionimport/CSVToAssessmentItemConverter.java 20 additions, 21 deletions

...ms/qti21/questionimport/CSVToAssessmentItemConverter.java
src/main/java/org/olat/modules/bigbluebutton/ui/SlideUploadController.java 1 addition, 0 deletions

.../olat/modules/bigbluebutton/ui/SlideUploadController.java
src/main/java/org/olat/modules/coach/ui/curriculum/certificate/CertificateAndEfficiencyStatementCurriculumListController.java 9 additions, 44 deletions

...ficateAndEfficiencyStatementCurriculumListController.java
src/main/java/org/olat/modules/coach/ui/curriculum/certificate/CertificateAndEfficiencyStatementWrapperController.java 3 additions, 5 deletions

...e/CertificateAndEfficiencyStatementWrapperController.java
src/main/java/org/olat/modules/coach/ui/curriculum/certificate/CurriculumElementWithViewsDataModel.java 4 additions, 2 deletions

...ulum/certificate/CurriculumElementWithViewsDataModel.java
src/main/java/org/olat/modules/coach/ui/curriculum/certificate/CurriculumTreeWithViewsRow.java 16 additions, 0 deletions

...ui/curriculum/certificate/CurriculumTreeWithViewsRow.java
src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java 2 additions, 1 deletion

...olat/modules/portfolio/ui/AbstractPageListController.java
src/main/java/org/olat/modules/portfolio/ui/TableOfContentController.java 2 additions, 1 deletion

...g/olat/modules/portfolio/ui/TableOfContentController.java
src/main/resources/serviceconfig/olat.properties 2 additions, 2 deletions

src/main/resources/serviceconfig/olat.properties
src/main/webapp/static/js/functions.js 1 addition, 1 deletion

src/main/webapp/static/js/functions.js
src/main/webapp/static/js/js.plugins.min.js 1 addition, 1 deletion

src/main/webapp/static/js/js.plugins.min.js

with 61 additions and 78 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