Merge remote-tracking branch 'upstream/OpenOLAT_14.1' into OpenOLAT_14.1.uibk (7889900d) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 7889900d authored 5 years ago by User expired

Browse files

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

parents befee8e0 2587b7df

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/sysinfo/SchedulerController.java 19 additions, 0 deletions

...main/java/org/olat/admin/sysinfo/SchedulerController.java
src/main/java/org/olat/collaboration/CollaborationTools.java 2 additions, 2 deletions

src/main/java/org/olat/collaboration/CollaborationTools.java
src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfoFormController.java 23 additions, 0 deletions

.../core/commons/modules/bc/meta/MetaInfoFormController.java
src/main/java/org/olat/core/commons/services/vfs/VFSRepositoryService.java 1 addition, 1 deletion

.../olat/core/commons/services/vfs/VFSRepositoryService.java
src/main/java/org/olat/core/commons/services/vfs/manager/MetaInfoReader.java 6 additions, 7 deletions

...lat/core/commons/services/vfs/manager/MetaInfoReader.java
src/main/java/org/olat/core/commons/services/vfs/manager/VFSRepositoryServiceImpl.java 5 additions, 5 deletions

...ommons/services/vfs/manager/VFSRepositoryServiceImpl.java
src/main/java/org/olat/core/util/ZipUtil.java 43 additions, 18 deletions

src/main/java/org/olat/core/util/ZipUtil.java
src/main/java/org/olat/course/highscore/ui/_content/highscore.html 1 addition, 1 deletion

...java/org/olat/course/highscore/ui/_content/highscore.html
src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java 1 addition, 0 deletions

...rg/olat/course/nodes/gta/ui/GTAParticipantController.java
src/main/java/org/olat/ims/qti21/manager/AssessmentResponseDAO.java 15 additions, 29 deletions

...ava/org/olat/ims/qti21/manager/AssessmentResponseDAO.java
src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java 14 additions, 23 deletions

...rg/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java
src/main/java/org/olat/modules/curriculum/CurriculumService.java 2 additions, 0 deletions

...n/java/org/olat/modules/curriculum/CurriculumService.java
src/main/java/org/olat/modules/curriculum/manager/CurriculumDAO.java 18 additions, 0 deletions

...va/org/olat/modules/curriculum/manager/CurriculumDAO.java
src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java 5 additions, 0 deletions

...lat/modules/curriculum/manager/CurriculumServiceImpl.java
src/main/java/org/olat/modules/forms/ui/FileUploadController.java 1 addition, 1 deletion

.../java/org/olat/modules/forms/ui/FileUploadController.java
src/main/java/org/olat/modules/forms/ui/_content/file_upload.html 17 additions, 1 deletion

.../java/org/olat/modules/forms/ui/_content/file_upload.html
src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_de.properties 37 additions, 37 deletions

...rg/olat/modules/forms/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_en.properties 4 additions, 4 deletions

...rg/olat/modules/forms/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/quality/analysis/manager/AnalysisPresentationXStream.java 1 addition, 2 deletions

...quality/analysis/manager/AnalysisPresentationXStream.java
src/main/java/org/olat/modules/taxonomy/ui/EditTaxonomyLevelController.java 4 additions, 4 deletions

...olat/modules/taxonomy/ui/EditTaxonomyLevelController.java

with 219 additions and 135 deletions

Please register or to comment