Merge OpenOLAT 9.3 to OpenOLAT default branch with 362449a4d1b9865aca2a948590ae178a0f50b425 (64841f6a) · 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

64841f6a

Commit 64841f6a authored 11 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 9.3 to OpenOLAT default branch with 362449a4d1b9865aca2a948590ae178a0f50b425

parents aa3bf193 c7896421

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 3 additions, 3 deletions

pom.xml
src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java 14 additions, 14 deletions

...core/gui/control/generic/iframe/IFrameDeliveryMapper.java
src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDisplayController.java 0 additions, 1 deletion

...e/gui/control/generic/iframe/IFrameDisplayController.java
src/main/java/org/olat/core/gui/media/HttpRequestMediaResource.java 11 additions, 3 deletions

...ava/org/olat/core/gui/media/HttpRequestMediaResource.java
src/main/java/org/olat/modules/tu/TunnelMapper.java 3 additions, 1 deletion

src/main/java/org/olat/modules/tu/TunnelMapper.java
src/main/java/org/olat/search/ui/AdvancedSearchInputController.java 9 additions, 2 deletions

...ava/org/olat/search/ui/AdvancedSearchInputController.java
src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java 13 additions, 9 deletions

src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java
src/test/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapperTest.java 43 additions, 0 deletions

.../gui/control/generic/iframe/IFrameDeliveryMapperTest.java
src/test/java/org/olat/test/AllTestsJunit4.java 1 addition, 0 deletions

src/test/java/org/olat/test/AllTestsJunit4.java

with 97 additions and 33 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