Merge OpenOLAT 10 to OpenOLAT 10 with 1e075eae7a5b6d07f36636528e085f213a2421fe (110a3d54) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 110a3d54 authored 10 years ago by srosse

Browse files

Merge OpenOLAT 10 to OpenOLAT 10 with 1e075eae7a5b6d07f36636528e085f213a2421fe

parents 51f92139 fc510e24

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/InfoMessageControllerSingleVM.java 2 additions, 1 deletion

...org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java
src/main/java/org/olat/admin/user/UserSearchController.java 2 additions, 1 deletion

src/main/java/org/olat/admin/user/UserSearchController.java
src/main/java/org/olat/catalog/CatalogEntry.java 2 additions, 1 deletion

src/main/java/org/olat/catalog/CatalogEntry.java
src/main/java/org/olat/catalog/CatalogManager.java 11 additions, 9 deletions

src/main/java/org/olat/catalog/CatalogManager.java
src/main/java/org/olat/catalog/ui/CatalogSiteMainController.java 17 additions, 17 deletions

...n/java/org/olat/catalog/ui/CatalogSiteMainController.java
src/main/java/org/olat/commons/file/filechooser/FileChooseCreateEditController.java 2 additions, 1 deletion

...mons/file/filechooser/FileChooseCreateEditController.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeThumbnailResource.java 1 addition, 1 deletion

...ommons/modules/bc/commands/CmdServeThumbnailResource.java
src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfo.java 10 additions, 1 deletion

.../java/org/olat/core/commons/modules/bc/meta/MetaInfo.java
src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfoFileImpl.java 16 additions, 5 deletions

...g/olat/core/commons/modules/bc/meta/MetaInfoFileImpl.java
src/main/java/org/olat/core/commons/persistence/_spring/core_persistence.xml 1 addition, 0 deletions

...lat/core/commons/persistence/_spring/core_persistence.xml
src/main/java/org/olat/core/commons/services/thumbnail/ThumbnailSPI.java 2 additions, 1 deletion

...rg/olat/core/commons/services/thumbnail/ThumbnailSPI.java
src/main/java/org/olat/core/commons/services/thumbnail/ThumbnailService.java 2 additions, 1 deletion

...lat/core/commons/services/thumbnail/ThumbnailService.java
src/main/java/org/olat/core/commons/services/thumbnail/impl/ImageToThumbnail.java 2 additions, 2 deletions

...ore/commons/services/thumbnail/impl/ImageToThumbnail.java
src/main/java/org/olat/core/commons/services/thumbnail/impl/PDFToThumbnail.java 3 additions, 2 deletions

.../core/commons/services/thumbnail/impl/PDFToThumbnail.java
src/main/java/org/olat/core/commons/services/thumbnail/impl/ThumbnailServiceImpl.java 3 additions, 2 deletions

...commons/services/thumbnail/impl/ThumbnailServiceImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FormLinkImpl.java 4 additions, 4 deletions

.../components/form/flexible/impl/elements/FormLinkImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableCustomRenderer.java 2 additions, 2 deletions

...lexible/impl/elements/table/FlexiTableCustomRenderer.java
src/main/java/org/olat/core/gui/components/image/ImageComponent.java 2 additions, 2 deletions

...va/org/olat/core/gui/components/image/ImageComponent.java
src/main/java/org/olat/core/gui/components/link/Link.java 3 additions, 3 deletions

src/main/java/org/olat/core/gui/components/link/Link.java
src/main/java/org/olat/core/gui/components/link/LinkFactory.java 25 additions, 25 deletions

...n/java/org/olat/core/gui/components/link/LinkFactory.java

with 112 additions and 81 deletions

Please register or to comment