Merge OpenOLAT default branch with OpenOLAT 10.2 with cd7a976743b096051ab3f12e404baa399c49887e (78c09b0c) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 78c09b0c authored 10 years ago by srosse

Browse files

Merge OpenOLAT default branch with OpenOLAT 10.2 with cd7a976743b096051ab3f12e404baa399c49887e

parents e9a127eb 0c14539c

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 1 addition, 0 deletions

.hgtags
src/main/java/de/bps/olat/user/ChangeEMailExecuteController.java 3 additions, 2 deletions

...n/java/de/bps/olat/user/ChangeEMailExecuteController.java
src/main/java/org/olat/NewControllerFactory.java 0 additions, 3 deletions

src/main/java/org/olat/NewControllerFactory.java
src/main/java/org/olat/admin/_i18n/LocalStrings_en.properties 3 additions, 2 deletions

...main/java/org/olat/admin/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/_i18n/LocalStrings_fr.properties 3 additions, 1 deletion

...main/java/org/olat/admin/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/landingpages/model/Rules.java 2 additions, 2 deletions

src/main/java/org/olat/admin/landingpages/model/Rules.java
src/main/java/org/olat/admin/landingpages/ui/_i18n/LocalStrings_en.properties 8 additions, 1 deletion

...at/admin/landingpages/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/layout/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

...va/org/olat/admin/layout/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/layout/_i18n/LocalStrings_fr.properties 5 additions, 1 deletion

...va/org/olat/admin/layout/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_fr.properties 4 additions, 2 deletions

...a/org/olat/admin/site/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_fr.properties 3 additions, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/user/_i18n/LocalStrings_fr.properties 3 additions, 2 deletions

...java/org/olat/admin/user/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/user/groups/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...g/olat/admin/user/groups/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/user/tools/UserToolImpl.java 3 additions, 1 deletion

src/main/java/org/olat/admin/user/tools/UserToolImpl.java
src/main/java/org/olat/admin/user/tools/ui/_i18n/LocalStrings_fr.properties 3 additions, 1 deletion

...olat/admin/user/tools/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_de.properties 10 additions, 10 deletions

...rg/olat/commons/calendar/_i18n/LocalStrings_de.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_en.properties 11 additions, 1 deletion

...rg/olat/commons/calendar/_i18n/LocalStrings_en.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties 12 additions, 1 deletion

...rg/olat/commons/calendar/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/commons/calendar/ui/CalendarAdminController.java 1 addition, 0 deletions

...org/olat/commons/calendar/ui/CalendarAdminController.java
src/main/java/org/olat/core/_i18n/LocalStrings_en.properties 10 additions, 7 deletions

src/main/java/org/olat/core/_i18n/LocalStrings_en.properties

with 88 additions and 40 deletions

Please register or to comment