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

b51e1ab8

Commit b51e1ab8 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents e4b69976 f322ca66

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/util/filter/impl/OWASPAntiSamyXSSFilter.java 103 additions, 3 deletions

...rg/olat/core/util/filter/impl/OWASPAntiSamyXSSFilter.java
src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java 6 additions, 2 deletions

...g/olat/course/nodes/en/ENEditGroupAreaFormController.java
src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java 17 additions, 11 deletions

...java/org/olat/group/manager/BusinessGroupServiceImpl.java
src/main/java/org/olat/ims/qti/container/ItemContext.java 3 additions, 3 deletions

src/main/java/org/olat/ims/qti/container/ItemContext.java
src/test/java/org/olat/core/util/filter/impl/XSSFilterTest.java 10 additions, 0 deletions

...st/java/org/olat/core/util/filter/impl/XSSFilterTest.java
src/test/java/org/olat/group/test/BusinessGroupServiceTest.java 48 additions, 0 deletions

...st/java/org/olat/group/test/BusinessGroupServiceTest.java

with 187 additions and 19 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