Merge OpenOLAT default branch to OpenOLAT 9.0a with e95c47a5c41ee69a1eb4d309ea82a783e5c73985 (ec1d558f) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit ec1d558f authored 12 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT 9.0a with e95c47a5c41ee69a1eb4d309ea82a783e5c73985

parents 203f1040 60874dc7

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/tuchemnitz/wizard/helper/course/CourseExtensionHelper.java 4 additions, 4 deletions

...uchemnitz/wizard/helper/course/CourseExtensionHelper.java
src/main/java/de/tuchemnitz/wizard/workflows/coursecreation/CourseCreationHelper.java 1 addition, 1 deletion

...wizard/workflows/coursecreation/CourseCreationHelper.java
src/main/java/org/olat/admin/_i18n/LocalStrings_de.properties 10 additions, 10 deletions

...main/java/org/olat/admin/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/_i18n/LocalStrings_en.properties 9 additions, 9 deletions

...main/java/org/olat/admin/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/securitygroup/gui/GroupController.java 2 additions, 1 deletion

...ava/org/olat/admin/securitygroup/gui/GroupController.java
src/main/java/org/olat/catalog/ui/CatalogController.java 1 addition, 0 deletions

src/main/java/org/olat/catalog/ui/CatalogController.java
src/main/java/org/olat/collaboration/CollaborationToolsSettingsController.java 5 additions, 2 deletions

...t/collaboration/CollaborationToolsSettingsController.java
src/main/java/org/olat/commons/calendar/CalendarModule.java 8 additions, 0 deletions

src/main/java/org/olat/commons/calendar/CalendarModule.java
src/main/java/org/olat/commons/calendar/CalendarUtils.java 6 additions, 2 deletions

src/main/java/org/olat/commons/calendar/CalendarUtils.java
src/main/java/org/olat/commons/calendar/ICalFileCalendarManager.java 11 additions, 3 deletions

...va/org/olat/commons/calendar/ICalFileCalendarManager.java
src/main/java/org/olat/commons/coordinate/cluster/lock/ClusterLockManager.java 2 additions, 1 deletion

...t/commons/coordinate/cluster/lock/ClusterLockManager.java
src/main/java/org/olat/core/dispatcher/mapper/MapperService.java 1 addition, 1 deletion

...n/java/org/olat/core/dispatcher/mapper/MapperService.java
src/main/java/org/olat/core/dispatcher/mapper/manager/MapperServiceImpl.java 1 addition, 4 deletions

...lat/core/dispatcher/mapper/manager/MapperServiceImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java 1 addition, 1 deletion

...lexible/impl/elements/richText/RichTextConfiguration.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/HtmlStaticPageComponent.java 1 addition, 1 deletion

...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/core/util/StringHelper.java 4 additions, 5 deletions

src/main/java/org/olat/core/util/StringHelper.java
src/main/java/org/olat/core/util/event/EventAgency.java 1 addition, 1 deletion

src/main/java/org/olat/core/util/event/EventAgency.java
src/main/java/org/olat/course/assessment/NewCacheKey.java 78 additions, 0 deletions

src/main/java/org/olat/course/assessment/NewCacheKey.java

with 148 additions and 48 deletions

Please register or to comment