Merge OpenOLAT 9.4 to OpenOLAT default branch with db4ae62a21f7868fc1fe457bebad1460e5106c55 (06d625c7) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 06d625c7 authored 10 years ago by srosse

Browse files

Merge OpenOLAT 9.4 to OpenOLAT default branch with db4ae62a21f7868fc1fe457bebad1460e5106c55

parents 2cd00df4 472aad48

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 1 addition, 0 deletions

.hgtags
TESTING.README.LATEST 1 addition, 1 deletion

TESTING.README.LATEST
src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...g/olat/admin/user/imp/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...olat/commons/calendar/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/commons/calendar/ui/components/FullCalendarMapper.java 14 additions, 3 deletions

...at/commons/calendar/ui/components/FullCalendarMapper.java
src/main/java/org/olat/core/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...in/java/org/olat/core/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java 1 addition, 1 deletion

...core/commons/modules/singlepage/SinglePageController.java
src/main/java/org/olat/core/commons/services/image/spi/ImageMagickHelper.java 1 addition, 0 deletions

...at/core/commons/services/image/spi/ImageMagickHelper.java
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...ices/notifications/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/util/StringHelper.java 9 additions, 2 deletions

src/main/java/org/olat/core/util/StringHelper.java
src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-tinymce.xml 3 additions, 1 deletion

...lat/core/util/filter/impl/_resources/antisamy-tinymce.xml
src/main/java/org/olat/course/archiver/_i18n/LocalStrings_pt_BR.properties 4 additions, 2 deletions

.../olat/course/archiver/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...va/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_pt_BR.properties 6 additions, 5 deletions

...rg/olat/course/editor/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/_i18n/LocalStrings_pt_BR.properties 2 additions, 2 deletions

...org/olat/course/nodes/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_pt_BR.properties 139 additions, 11 deletions

...at/course/nodes/cl/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/cl/ui/wizard/_i18n/LocalStrings_pt_BR.properties 14 additions, 0 deletions

...se/nodes/cl/ui/wizard/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/iq/IQEditController.java 7 additions, 6 deletions

src/main/java/org/olat/course/nodes/iq/IQEditController.java
src/main/java/org/olat/course/nodes/openmeetings/_i18n/LocalStrings_de.properties 2 additions, 1 deletion

...ourse/nodes/openmeetings/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...e/nodes/projectbroker/_i18n/LocalStrings_pt_BR.properties

with 211 additions and 41 deletions

Please register or to comment