Merge OpenOLAT 8.4 to OpenOLATpro 8.4 with e06e6d0bb62af09bc8cf740ee891d1a1f63084c4 (e52a8757) · 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

e52a8757

Commit e52a8757 authored 11 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 8.4 to OpenOLATpro 8.4 with e06e6d0bb62af09bc8cf740ee891d1a1f63084c4

parents 610e98fd 9752944d

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 2 additions, 2 deletions

pom.xml
src/main/java/org/olat/core/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

src/main/java/org/olat/core/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

src/main/java/org/olat/core/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/AbstractTextElement.java 1 addition, 1 deletion

...ents/form/flexible/impl/elements/AbstractTextElement.java
src/main/java/org/olat/core/logging/OLATRuntimeException.java 5 additions, 2 deletions

...main/java/org/olat/core/logging/OLATRuntimeException.java
src/main/java/org/olat/core/util/filter/FilterFactory.java 10 additions, 0 deletions

src/main/java/org/olat/core/util/filter/FilterFactory.java
src/main/java/org/olat/core/util/filter/impl/OWASPAntiSamyXSSFilter.java 10 additions, 3 deletions

...rg/olat/core/util/filter/impl/OWASPAntiSamyXSSFilter.java
src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-tinymce.xml 2 additions, 0 deletions

...lat/core/util/filter/impl/_resources/antisamy-tinymce.xml
src/main/java/org/olat/login/auth/OLATAuthentcationForm.java 8 additions, 2 deletions

src/main/java/org/olat/login/auth/OLATAuthentcationForm.java
src/test/java/org/olat/core/util/filter/impl/XSSFilterTest.java 17 additions, 2 deletions

...st/java/org/olat/core/util/filter/impl/XSSFilterTest.java

with 57 additions and 12 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