Merge branch 'master' of
ssh://aboeckle@office.frentix.com/home/aboeckle/repositories/OpenOLAT.git Conflicts: src/main/java/org/olat/repository/ui/catalog/CatalogNodeController.java src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
No related branches found
No related tags found
Showing
- pom.xml 6 additions, 6 deletionspom.xml
- src/main/java/de/bps/course/nodes/cl/_i18n/LocalStrings_fr.properties 3 additions, 1 deletion...a/de/bps/course/nodes/cl/_i18n/LocalStrings_fr.properties
- src/main/java/de/bps/course/nodes/ll/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion...a/de/bps/course/nodes/ll/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_fr.properties 9 additions, 1 deletion...a/org/olat/admin/sysinfo/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/user/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion...java/org/olat/admin/user/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep01.java 1 addition, 2 deletions.../org/olat/admin/user/bulkChange/UserBulkChangeStep01.java
- src/main/java/org/olat/admin/user/course/CourseOverviewController.java 23 additions, 1 deletion.../org/olat/admin/user/course/CourseOverviewController.java
- src/main/java/org/olat/admin/user/course/_i18n/LocalStrings_de.properties 2 additions, 0 deletions...g/olat/admin/user/course/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/admin/user/course/_i18n/LocalStrings_en.properties 3 additions, 1 deletion...g/olat/admin/user/course/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/admin/user/course/_i18n/LocalStrings_fr.properties 2 additions, 0 deletions...g/olat/admin/user/course/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/collaboration/CollaborationTools.java 2 additions, 1 deletionsrc/main/java/org/olat/collaboration/CollaborationTools.java
- src/main/java/org/olat/collaboration/_i18n/LocalStrings_fr.properties 3 additions, 1 deletion...a/org/olat/collaboration/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/commons/calendar/CalendarUtils.java 8 additions, 0 deletionssrc/main/java/org/olat/commons/calendar/CalendarUtils.java
- src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_ru.properties 4 additions, 0 deletions...ommons/info/notification/_i18n/LocalStrings_ru.properties
- src/main/java/org/olat/commons/info/ui/_i18n/LocalStrings_ru.properties 4 additions, 1 deletion...org/olat/commons/info/ui/_i18n/LocalStrings_ru.properties
- src/main/java/org/olat/commons/memberlist/ui/_i18n/LocalStrings_ru.properties 14 additions, 0 deletions...at/commons/memberlist/ui/_i18n/LocalStrings_ru.properties
- src/main/java/org/olat/core/_i18n/LocalStrings_ru.properties 36 additions, 1 deletionsrc/main/java/org/olat/core/_i18n/LocalStrings_ru.properties
- src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_ru.properties 28 additions, 1 deletion...commons/chiefcontrollers/_i18n/LocalStrings_ru.properties
- src/main/java/org/olat/core/commons/controllers/filechooser/_i18n/LocalStrings_ru.properties 23 additions, 1 deletion.../controllers/filechooser/_i18n/LocalStrings_ru.properties
- src/main/java/org/olat/core/commons/controllers/impressum/_i18n/LocalStrings_ru.properties 15 additions, 3 deletions...ns/controllers/impressum/_i18n/LocalStrings_ru.properties
Loading
Please register or sign in to comment