Merge OpenOLAT 10.3 to OpenOLAT default branch with 478749fb600ed6547c0dac7ed3e388cfdf3adc45 (b25db664) · 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

b25db664

Commit b25db664 authored 9 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 10.3 to OpenOLAT default branch with 478749fb600ed6547c0dac7ed3e388cfdf3adc45

parents 3dc6045c 0d0dda58

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/gui/demo/GUIDemoMainController.java 1 addition, 4 deletions

src/main/java/org/olat/gui/demo/GUIDemoMainController.java
src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java 5 additions, 0 deletions

...va/org/olat/repository/manager/RepositoryServiceImpl.java
src/main/java/org/olat/resource/accesscontrol/manager/ACReservationDAO.java 7 additions, 0 deletions

...olat/resource/accesscontrol/manager/ACReservationDAO.java
src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java 34 additions, 0 deletions

src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java
src/main/java/org/olat/shibboleth/ShibbolethModule.java 8 additions, 0 deletions

src/main/java/org/olat/shibboleth/ShibbolethModule.java
src/main/java/org/olat/shibboleth/ShibbolethRegistrationController.java 14 additions, 0 deletions

...org/olat/shibboleth/ShibbolethRegistrationController.java
src/main/java/org/olat/shibboleth/_spring/shibbolethContext.xml 1 addition, 0 deletions

...in/java/org/olat/shibboleth/_spring/shibbolethContext.xml
src/test/java/org/olat/resource/accesscontrol/ACReservationDAOTest.java 25 additions, 2 deletions

...org/olat/resource/accesscontrol/ACReservationDAOTest.java

with 95 additions and 6 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