Merge remote-tracking branch 'origin/OpenOLAT_13.0' (a6314de3) · 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

a6314de3

Commit a6314de3 authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_13.0'

parents 4952b221 777431f0

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/search/SearchAdminController.java 14 additions, 20 deletions

...ain/java/org/olat/admin/search/SearchAdminController.java
src/main/java/org/olat/admin/search/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

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

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

...va/org/olat/admin/search/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/search/EmptySearchResults.java 13 additions, 2 deletions

src/main/java/org/olat/search/EmptySearchResults.java
src/main/java/org/olat/search/SearchResults.java 2 additions, 0 deletions

src/main/java/org/olat/search/SearchResults.java
src/main/java/org/olat/search/service/GetDocumentByCallable.java 15 additions, 0 deletions

...n/java/org/olat/search/service/GetDocumentByCallable.java
src/main/java/org/olat/search/service/SearchCallable.java 3 additions, 2 deletions

src/main/java/org/olat/search/service/SearchCallable.java
src/main/java/org/olat/search/service/SearchServiceImpl.java 21 additions, 9 deletions

src/main/java/org/olat/search/service/SearchServiceImpl.java
src/main/java/org/olat/search/service/indexer/Index.java 0 additions, 4 deletions

src/main/java/org/olat/search/service/indexer/Index.java
src/main/java/org/olat/search/service/indexer/OlatFullIndexer.java 2 additions, 11 deletions

...java/org/olat/search/service/indexer/OlatFullIndexer.java
src/main/java/org/olat/search/service/searcher/SearchResultsImpl.java 5 additions, 0 deletions

...a/org/olat/search/service/searcher/SearchResultsImpl.java
src/main/java/org/olat/search/ui/SearchInputController.java 4 additions, 2 deletions

src/main/java/org/olat/search/ui/SearchInputController.java

with 82 additions and 53 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