Merge OpenOLAT default branch to OpenOLAT with e65f5d628286121970ccf18cfea1700bf39231d4 (040a235e) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 040a235e authored 10 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT with e65f5d628286121970ccf18cfea1700bf39231d4

parents 6f702b02 821a272a

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/security/_i18n/LocalStrings_fr.properties 13 additions, 1 deletion

.../org/olat/admin/security/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/securitygroup/gui/GroupController.java 3 additions, 1 deletion

...ava/org/olat/admin/securitygroup/gui/GroupController.java
src/main/java/org/olat/admin/user/imp/ImportStep00.java 8 additions, 4 deletions

src/main/java/org/olat/admin/user/imp/ImportStep00.java
src/main/java/org/olat/admin/user/imp/UserImportController.java 133 additions, 17 deletions

...in/java/org/olat/admin/user/imp/UserImportController.java
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_fr.properties 2 additions, 1 deletion

.../org/olat/admin/user/imp/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/basesecurity/AuthHelper.java 21 additions, 2 deletions

src/main/java/org/olat/basesecurity/AuthHelper.java
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 1 addition, 1 deletion

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/core/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

src/main/java/org/olat/core/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/modules/bc/commands/CmdCreateFile.java 19 additions, 4 deletions

.../olat/core/commons/modules/bc/commands/CmdCreateFile.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdEditContent.java 21 additions, 3 deletions

...olat/core/commons/modules/bc/commands/CmdEditContent.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdEditMeta.java 20 additions, 2 deletions

...rg/olat/core/commons/modules/bc/commands/CmdEditMeta.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdMoveCopy.java 13 additions, 1 deletion

...rg/olat/core/commons/modules/bc/commands/CmdMoveCopy.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdUnzip.java 14 additions, 0 deletions

...a/org/olat/core/commons/modules/bc/commands/CmdUnzip.java
src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfoFormController.java 9 additions, 9 deletions

.../core/commons/modules/bc/meta/MetaInfoFormController.java
src/main/java/org/olat/core/commons/modules/glossary/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...commons/modules/glossary/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...ervices/notifications/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/services/webdav/manager/VFSResourceRoot.java 7 additions, 5 deletions

...core/commons/services/webdav/manager/VFSResourceRoot.java
src/main/java/org/olat/core/gui/components/chart/BarSeries.java 8 additions, 2 deletions

...in/java/org/olat/core/gui/components/chart/BarSeries.java
src/main/java/org/olat/core/gui/control/controller/BasicController.java 16 additions, 0 deletions

...org/olat/core/gui/control/controller/BasicController.java

with 312 additions and 56 deletions

Please register or to comment