Merge remote-tracking branch 'upstream/master'
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- pom.xml 3 additions, 3 deletionspom.xml
- src/main/java/de/bps/course/nodes/den/_spring/buildingblockContext.xml 6 additions, 0 deletions.../de/bps/course/nodes/den/_spring/buildingblockContext.xml
- src/main/java/org/olat/admin/_i18n/LocalStrings_fr.properties 5 additions, 1 deletion...main/java/org/olat/admin/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/cache/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion...ava/org/olat/admin/cache/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/help/ui/HelpAdminController.java 15 additions, 0 deletions...main/java/org/olat/admin/help/ui/HelpAdminController.java
- src/main/java/org/olat/admin/help/ui/HelpAdminEditController.java 8 additions, 0 deletions.../java/org/olat/admin/help/ui/HelpAdminEditController.java
- src/main/java/org/olat/admin/help/ui/_i18n/LocalStrings_de.properties 3 additions, 0 deletions...a/org/olat/admin/help/ui/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/admin/help/ui/_i18n/LocalStrings_en.properties 3 additions, 0 deletions...a/org/olat/admin/help/ui/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/admin/help/ui/_i18n/LocalStrings_fr.properties 52 additions, 0 deletions...a/org/olat/admin/help/ui/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/site/AdminSite.java 8 additions, 4 deletionssrc/main/java/org/olat/admin/site/AdminSite.java
- src/main/java/org/olat/admin/site/UserAdminSite.java 8 additions, 4 deletionssrc/main/java/org/olat/admin/site/UserAdminSite.java
- src/main/java/org/olat/admin/user/_i18n/LocalStrings_fr.properties 3 additions, 1 deletion...java/org/olat/admin/user/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/basesecurity/manager/GroupDAO.java 11 additions, 0 deletionssrc/main/java/org/olat/basesecurity/manager/GroupDAO.java
- src/main/java/org/olat/basesecurity/model/GroupMembershipImpl.java 1 addition, 0 deletions...java/org/olat/basesecurity/model/GroupMembershipImpl.java
- src/main/java/org/olat/commons/coordinate/cluster/_spring/coordinateContext.xml 0 additions, 3 deletions.../commons/coordinate/cluster/_spring/coordinateContext.xml
- src/main/java/org/olat/commons/coordinate/cluster/lock/ClusterLockManager.java 23 additions, 22 deletions...t/commons/coordinate/cluster/lock/ClusterLockManager.java
- src/main/java/org/olat/commons/coordinate/cluster/lock/ClusterLocker.java 29 additions, 61 deletions...g/olat/commons/coordinate/cluster/lock/ClusterLocker.java
- src/main/java/org/olat/commons/coordinate/cluster/lock/LockImpl.hbm.xml 4 additions, 1 deletion...org/olat/commons/coordinate/cluster/lock/LockImpl.hbm.xml
- src/main/java/org/olat/commons/coordinate/cluster/lock/LockImpl.java 11 additions, 1 deletion...va/org/olat/commons/coordinate/cluster/lock/LockImpl.java
Loading
Please register or sign in to comment