Merge OpenOLAT 8.3 to OpenOLAT default branch with 18e72b90f0333d61243ce3dcb5fd3d3194fc68a6 (019fba39) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 019fba39 authored 12 years ago by srosse

Browse files

Merge OpenOLAT 8.3 to OpenOLAT default branch with 18e72b90f0333d61243ce3dcb5fd3d3194fc68a6

parents 49d07559 a91c4c23

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/bps/course/nodes/ll/LLRunController.java 1 addition, 1 deletion

src/main/java/de/bps/course/nodes/ll/LLRunController.java
src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java 18 additions, 1 deletion

...lat/core/commons/fullWebApp/BaseFullWebappController.java
src/main/java/org/olat/core/commons/fullWebApp/_content/nav.html 3 additions, 1 deletion

...n/java/org/olat/core/commons/fullWebApp/_content/nav.html
src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java 1 addition, 21 deletions

...core/commons/modules/singlepage/SinglePageController.java
src/main/java/org/olat/core/commons/modules/singlepage/SinglePageMediaMapper.java 38 additions, 0 deletions

...ore/commons/modules/singlepage/SinglePageMediaMapper.java
src/main/java/org/olat/core/dispatcher/mapper/MapperDispatcher.java 4 additions, 1 deletion

...ava/org/olat/core/dispatcher/mapper/MapperDispatcher.java
src/main/java/org/olat/core/dispatcher/mapper/MapperService.java 2 additions, 2 deletions

...n/java/org/olat/core/dispatcher/mapper/MapperService.java
src/main/java/org/olat/core/dispatcher/mapper/manager/MapperKey.java 90 additions, 0 deletions

...va/org/olat/core/dispatcher/mapper/manager/MapperKey.java
src/main/java/org/olat/core/dispatcher/mapper/manager/MapperServiceImpl.java 33 additions, 30 deletions

...lat/core/dispatcher/mapper/manager/MapperServiceImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java 2 additions, 17 deletions

...lexible/impl/elements/richText/RichTextConfiguration.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextMediaMapper.java 58 additions, 0 deletions

.../flexible/impl/elements/richText/RichTextMediaMapper.java
src/main/java/org/olat/core/gui/components/htmlheader/jscss/CustomCSS.java 1 addition, 1 deletion

.../olat/core/gui/components/htmlheader/jscss/CustomCSS.java
src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticMapper.java 68 additions, 0 deletions

...g/olat/core/gui/components/htmlsite/HtmlStaticMapper.java
src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponent.java 2 additions, 26 deletions

...core/gui/components/htmlsite/HtmlStaticPageComponent.java
src/main/java/org/olat/core/gui/control/controller/BasicController.java 1 addition, 1 deletion

...org/olat/core/gui/control/controller/BasicController.java
src/main/java/org/olat/modules/wiki/WikiMainController.java 4 additions, 3 deletions

src/main/java/org/olat/modules/wiki/WikiMainController.java
src/main/java/org/olat/modules/wiki/gui/components/wikiToHtml/FilterUtil.java 3 additions, 3 deletions

...at/modules/wiki/gui/components/wikiToHtml/FilterUtil.java
src/main/java/org/olat/modules/wiki/gui/components/wikiToHtml/WikiImageMapper.java 59 additions, 0 deletions

...dules/wiki/gui/components/wikiToHtml/WikiImageMapper.java
src/main/java/org/olat/modules/wiki/gui/components/wikiToHtml/WikiMarkupComponent.java 15 additions, 20 deletions

...s/wiki/gui/components/wikiToHtml/WikiMarkupComponent.java
src/test/java/org/olat/core/dispatcher/mapper/MapperServiceTest.java 39 additions, 8 deletions

...va/org/olat/core/dispatcher/mapper/MapperServiceTest.java

with 442 additions and 136 deletions

Please register or to comment