Merge remote-tracking branch 'upstream/OpenOLAT_12.5' (4ef2de60) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 4ef2de60 authored 6 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_12.5'

parents 01786192 966988fc

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/group/manager/BusinessGroupRelationDAO.java 1 addition, 0 deletions

...java/org/olat/group/manager/BusinessGroupRelationDAO.java
src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...org/olat/group/ui/run/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityInteractionsController.java 3 additions, 0 deletions

.../assessment/CorrectionIdentityInteractionsController.java
src/main/java/org/olat/ims/qti21/ui/assessment/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...s/qti21/ui/assessment/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java 12 additions, 4 deletions

...ims/qti21/ui/editor/AssessmentTestComposerController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBNumericalEntrySettingsController.java 2 additions, 2 deletions

...tor/interactions/FIBNumericalEntrySettingsController.java
src/main/java/org/olat/modules/edubase/ui/_i18n/LocalStrings_pt_BR.properties 3 additions, 1 deletion

...at/modules/edubase/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/gotomeeting/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...odules/gotomeeting/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...lat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...lat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_pt_BR.properties 4 additions, 1 deletion

.../modules/portfolio/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/portfolio/ui/shared/SharedPagesController.java 5 additions, 0 deletions

...at/modules/portfolio/ui/shared/SharedPagesController.java
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties 3 additions, 1 deletion

...olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/wiki/gui/components/wikiToHtml/OlatWikiDataHandler.java 18 additions, 10 deletions

...s/wiki/gui/components/wikiToHtml/OlatWikiDataHandler.java
src/main/java/org/olat/user/_i18n/LocalStrings_pt_BR.properties 3 additions, 1 deletion

...in/java/org/olat/user/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/user/manager/UserDataExportServiceImpl.java 1 addition, 1 deletion

...java/org/olat/user/manager/UserDataExportServiceImpl.java
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_de.properties
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_en.properties
src/main/java/org/olat/user/ui/data/_i18n/LocalStrings_pt_BR.properties 34 additions, 0 deletions

...org/olat/user/ui/data/_i18n/LocalStrings_pt_BR.properties
src/main/resources/database/mysql/alter_12_4_x_to_12_5_0.sql 1 addition, 1 deletion

src/main/resources/database/mysql/alter_12_4_x_to_12_5_0.sql

with 98 additions and 25 deletions

Please register or to comment