Merge OpenOLAT 10.3 to OpenOLAT default branch with 4c28e8a8eca1659de9e151b7e4bee1674676ba11 (36032300) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 36032300 authored 9 years ago by srosse

Browse files

Merge OpenOLAT 10.3 to OpenOLAT default branch with 4c28e8a8eca1659de9e151b7e4bee1674676ba11

parents 59bb4ac4 15dacab4

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/ims/qti/repository/handlers/QTIHandler.java 6 additions, 5 deletions

...java/org/olat/ims/qti/repository/handlers/QTIHandler.java
src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...java/org/olat/repository/_i18n/LocalStrings_de.properties
src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties 2 additions, 2 deletions

...java/org/olat/repository/_i18n/LocalStrings_en.properties
src/main/java/org/olat/repository/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...java/org/olat/repository/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/repository/_i18n/LocalStrings_it.properties 2 additions, 2 deletions

...java/org/olat/repository/_i18n/LocalStrings_it.properties
src/main/java/org/olat/repository/_i18n/LocalStrings_pt_PT.properties 2 additions, 2 deletions

...a/org/olat/repository/_i18n/LocalStrings_pt_PT.properties
src/main/java/org/olat/repository/handlers/BlogHandler.java 4 additions, 3 deletions

src/main/java/org/olat/repository/handlers/BlogHandler.java
src/main/java/org/olat/repository/handlers/CourseHandler.java 5 additions, 5 deletions

...main/java/org/olat/repository/handlers/CourseHandler.java
src/main/java/org/olat/repository/handlers/FileHandler.java 4 additions, 3 deletions

src/main/java/org/olat/repository/handlers/FileHandler.java
src/main/java/org/olat/repository/handlers/GlossaryHandler.java 4 additions, 3 deletions

...in/java/org/olat/repository/handlers/GlossaryHandler.java
src/main/java/org/olat/repository/handlers/PodcastHandler.java 4 additions, 3 deletions

...ain/java/org/olat/repository/handlers/PodcastHandler.java
src/main/java/org/olat/repository/handlers/PortfolioHandler.java 5 additions, 4 deletions

...n/java/org/olat/repository/handlers/PortfolioHandler.java
src/main/java/org/olat/repository/handlers/RepositoryHandler.java 1 addition, 1 deletion

.../java/org/olat/repository/handlers/RepositoryHandler.java
src/main/java/org/olat/repository/handlers/SharedFolderHandler.java 4 additions, 3 deletions

...ava/org/olat/repository/handlers/SharedFolderHandler.java
src/main/java/org/olat/repository/handlers/WikiHandler.java 3 additions, 3 deletions

src/main/java/org/olat/repository/handlers/WikiHandler.java
src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java 1 addition, 1 deletion

...va/org/olat/repository/manager/RepositoryServiceImpl.java
src/main/java/org/olat/repository/ui/author/ConfirmDeleteController.java 25 additions, 4 deletions

...rg/olat/repository/ui/author/ConfirmDeleteController.java
src/main/java/org/olat/repository/ui/author/ImportRepositoryEntryController.java 16 additions, 0 deletions

...repository/ui/author/ImportRepositoryEntryController.java
src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java 21 additions, 4 deletions

.../repository/ui/list/RepositoryEntryDetailsController.java
src/main/java/org/olat/repository/ui/list/_content/details.html 6 additions, 2 deletions

...in/java/org/olat/repository/ui/list/_content/details.html

with 119 additions and 54 deletions

Please register or to comment