Merge remote-tracking branch 'upstream/OpenOLAT_15.1' into OpenOLAT_15.1.uibk (778c4b35) · 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

778c4b35

Commit 778c4b35 authored 4 years ago by User expired

Downloads
- Plain Diff

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

parents a0aa8962 be521691

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/util/filter/impl/HtmlFilter.java 1 addition, 1 deletion

src/main/java/org/olat/core/util/filter/impl/HtmlFilter.java
src/main/java/org/olat/dispatcher/AuthenticatedDispatcher.java 7 additions, 0 deletions

...ain/java/org/olat/dispatcher/AuthenticatedDispatcher.java
src/main/java/org/olat/modules/quality/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

.../olat/modules/quality/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/search/service/indexer/FolderIndexerWorker.java 11 additions, 10 deletions

.../org/olat/search/service/indexer/FolderIndexerWorker.java
src/main/java/org/olat/search/service/indexer/repository/ImsCPRepositoryIndexer.java 2 additions, 5 deletions

...ch/service/indexer/repository/ImsCPRepositoryIndexer.java
src/main/java/org/olat/search/service/indexer/repository/ScormRepositoryIndexer.java 11 additions, 36 deletions

...ch/service/indexer/repository/ScormRepositoryIndexer.java
src/main/java/org/olat/search/service/indexer/repository/course/ScormCourseNodeIndexer.java 2 additions, 2 deletions

...ice/indexer/repository/course/ScormCourseNodeIndexer.java
src/main/resources/serviceconfig/olat.properties 2 additions, 2 deletions

src/main/resources/serviceconfig/olat.properties
src/test/java/org/olat/selenium/page/LoginPage.java 1 addition, 5 deletions

src/test/java/org/olat/selenium/page/LoginPage.java

with 39 additions and 63 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