Merge OpenOLAT 12.1 to OpenOLAT default branch with 244b08ba0885ea2cd4cc91e2f591a5392b256f94 (fe0e3460) · 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

fe0e3460

Commit fe0e3460 authored 7 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 12.1 to OpenOLAT default branch with 244b08ba0885ea2cd4cc91e2f591a5392b256f94

parents 53c74d4a 8fcfea72

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 2 additions, 0 deletions

.hgtags
src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html 22 additions, 21 deletions

...at/core/commons/fullWebApp/_content/fullwebapplayout.html
src/main/java/org/olat/core/commons/persistence/PersistenceHelper.java 14 additions, 0 deletions

.../org/olat/core/commons/persistence/PersistenceHelper.java
src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java 7 additions, 26 deletions

...core/gui/control/generic/iframe/IFrameDeliveryMapper.java
src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java 6 additions, 0 deletions

...lat/core/gui/render/velocity/VelocityRenderDecorator.java
src/main/java/org/olat/core/util/WebappHelper.java 9 additions, 0 deletions

src/main/java/org/olat/core/util/WebappHelper.java
src/main/java/org/olat/core/util/_spring/utilCorecontext.xml 1 addition, 0 deletions

src/main/java/org/olat/core/util/_spring/utilCorecontext.xml
src/main/java/org/olat/ims/qti21/resultexport/_content/qti21results.html 22 additions, 21 deletions

...rg/olat/ims/qti21/resultexport/_content/qti21results.html
src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java 18 additions, 1 deletion

...ava/org/olat/modules/webFeed/manager/FeedManagerImpl.java
src/main/java/org/olat/repository/ui/catalog/CatalogEntryEditController.java 25 additions, 2 deletions

...lat/repository/ui/catalog/CatalogEntryEditController.java
src/main/resources/serviceconfig/olat.properties 1 addition, 0 deletions

src/main/resources/serviceconfig/olat.properties

with 127 additions and 71 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