Merge OpenOLAT default branch to OpenOLAT 10 with bdbe7f55e55cb5be38ab0919df28044963200de2 (14b70706) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 14b70706 authored 11 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT 10 with bdbe7f55e55cb5be38ab0919df28044963200de2

parents 1055dd27 452237b4

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/NewControllerFactory.java 17 additions, 5 deletions

src/main/java/org/olat/NewControllerFactory.java
src/main/java/org/olat/admin/user/UserAdminContextEntryControllerCreator.java 7 additions, 0 deletions

...at/admin/user/UserAdminContextEntryControllerCreator.java
src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java 6 additions, 15 deletions

...g/olat/admin/user/delete/service/UserDeletionManager.java
src/main/java/org/olat/admin/user/imp/ImportStep00.java 6 additions, 7 deletions

src/main/java/org/olat/admin/user/imp/ImportStep00.java
src/main/java/org/olat/admin/user/imp/ImportStep01.java 21 additions, 7 deletions

src/main/java/org/olat/admin/user/imp/ImportStep01.java
src/main/java/org/olat/admin/user/imp/UpdateIdentity.java 178 additions, 3 deletions

src/main/java/org/olat/admin/user/imp/UpdateIdentity.java
src/main/java/org/olat/admin/user/imp/UserImportController.java 17 additions, 8 deletions

...in/java/org/olat/admin/user/imp/UserImportController.java
src/main/java/org/olat/admin/user/imp/_content/step1.html 7 additions, 1 deletion

src/main/java/org/olat/admin/user/imp/_content/step1.html
src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

.../org/olat/admin/user/imp/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

.../org/olat/admin/user/imp/_i18n/LocalStrings_en.properties
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 10 additions, 0 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/commons/calendar/ICalFileCalendarManager.java 6 additions, 11 deletions

...va/org/olat/commons/calendar/ICalFileCalendarManager.java
src/main/java/org/olat/commons/lifecycle/LifeCycleManager.java 51 additions, 23 deletions

...ain/java/org/olat/commons/lifecycle/LifeCycleManager.java
src/main/java/org/olat/core/commons/modules/bc/components/CrumbRenderer.java 1 addition, 2 deletions

...lat/core/commons/modules/bc/components/CrumbRenderer.java
src/main/java/org/olat/core/commons/persistence/_spring/core_persistence.xml 4 additions, 2 deletions

...lat/core/commons/persistence/_spring/core_persistence.xml
src/main/java/org/olat/core/dispatcher/mapper/manager/MapperDAO.java 13 additions, 15 deletions

...va/org/olat/core/dispatcher/mapper/manager/MapperDAO.java
src/main/java/org/olat/core/dispatcher/mapper/model/PersistedMapper.java 2 additions, 2 deletions

...rg/olat/core/dispatcher/mapper/model/PersistedMapper.java
src/main/java/org/olat/core/gui/media/FileMediaResource.java 2 additions, 2 deletions

src/main/java/org/olat/core/gui/media/FileMediaResource.java
src/main/java/org/olat/core/gui/media/NamedFileMediaResource.java 2 additions, 2 deletions

.../java/org/olat/core/gui/media/NamedFileMediaResource.java
src/main/java/org/olat/core/gui/render/URLBuilder.java 30 additions, 12 deletions

src/main/java/org/olat/core/gui/render/URLBuilder.java

with 382 additions and 117 deletions

Please register or to comment