Merge remote-tracking branch 'origin/OpenOLAT_12.5' (8109f457) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 8109f457 authored 6 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_12.5'

parents aa9265e8 b3e22c66

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/search/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...va/org/olat/admin/search/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/sysinfo/SysinfoController.java 1 addition, 1 deletion

src/main/java/org/olat/admin/sysinfo/SysinfoController.java
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_it.properties 1 addition, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_it.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_pl.properties 1 addition, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_pl.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...rg/olat/admin/sysinfo/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_zh_CN.properties 1 addition, 1 deletion

...rg/olat/admin/sysinfo/_i18n/LocalStrings_zh_CN.properties
src/main/java/org/olat/modules/coach/ui/StudentCoursesController.java 2 additions, 1 deletion

...a/org/olat/modules/coach/ui/StudentCoursesController.java
src/main/java/org/olat/restapi/system/IndexerWebService.java 20 additions, 18 deletions

src/main/java/org/olat/restapi/system/IndexerWebService.java
src/main/java/org/olat/restapi/system/ProcSamplerJob.java 17 additions, 18 deletions

src/main/java/org/olat/restapi/system/ProcSamplerJob.java
src/main/java/org/olat/restapi/system/vo/IndexerStatus.java 1 addition, 3 deletions

src/main/java/org/olat/restapi/system/vo/IndexerStatus.java
src/main/java/org/olat/search/SearchServiceStatus.java 3 additions, 0 deletions

src/main/java/org/olat/search/SearchServiceStatus.java
src/main/java/org/olat/search/_spring/searchContext.xml 0 additions, 4 deletions

src/main/java/org/olat/search/_spring/searchContext.xml
src/main/java/org/olat/search/service/SearchServiceImpl.java 1 addition, 1 deletion

src/main/java/org/olat/search/service/SearchServiceImpl.java
src/main/java/org/olat/search/service/SearchServiceStatusImpl.java 31 additions, 3 deletions

...java/org/olat/search/service/SearchServiceStatusImpl.java
src/main/java/org/olat/search/service/indexer/FullIndexerStatus.java 16 additions, 16 deletions

...va/org/olat/search/service/indexer/FullIndexerStatus.java
src/main/java/org/olat/search/service/indexer/JmsIndexer.java 13 additions, 1 deletion

...main/java/org/olat/search/service/indexer/JmsIndexer.java
src/main/java/org/olat/search/service/indexer/LifeFullIndexer.java 2 additions, 0 deletions

...java/org/olat/search/service/indexer/LifeFullIndexer.java

with 116 additions and 75 deletions

Please register or to comment