Merge OpenOLAT 10.5 to OpenOLAT default branch with 209bec7cf31d73ece9f18be59d8cc6d84af4dc8b (f63d7d9f) · 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

f63d7d9f

Commit f63d7d9f authored 8 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 10.5 to OpenOLAT default branch with 209bec7cf31d73ece9f18be59d8cc6d84af4dc8b

parents 38237ec9 8bdb8495

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/modules/bc/FileUploadController.java 2 additions, 2 deletions

...rg/olat/core/commons/modules/bc/FileUploadController.java
src/main/java/org/olat/core/util/filter/impl/NekoHTMLFilter.java 3 additions, 2 deletions

...n/java/org/olat/core/util/filter/impl/NekoHTMLFilter.java
src/main/java/org/olat/core/util/filter/impl/SimpleHTMLTagsFilter.java 88 additions, 25 deletions

.../org/olat/core/util/filter/impl/SimpleHTMLTagsFilter.java
src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java 1 addition, 1 deletion

...lat/search/service/document/file/FileDocumentFactory.java
src/test/java/org/olat/core/util/filter/impl/NekoHTMLFilterTest.java 6 additions, 0 deletions

...va/org/olat/core/util/filter/impl/NekoHTMLFilterTest.java
src/test/java/org/olat/core/util/filter/impl/SimpleHTMLTagsFilterTest.java 17 additions, 12 deletions

.../olat/core/util/filter/impl/SimpleHTMLTagsFilterTest.java

with 117 additions and 42 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