Merge remote-tracking branch 'origin/OpenOLAT_13.1' (5406dbaa) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

5406dbaa

Commit 5406dbaa authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_13.1'

parents ece2e16a 6aa9d4e3

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

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/restapi/CalendarWSHelper.java 2 additions, 0 deletions

...a/org/olat/commons/calendar/restapi/CalendarWSHelper.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/editor/AssessmentTestComposerController.java 2 additions, 0 deletions

...ims/qti21/ui/editor/AssessmentTestComposerController.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/curriculum/ui/EditCurriculumController.java 17 additions, 7 deletions

.../olat/modules/curriculum/ui/EditCurriculumController.java
src/main/java/org/olat/user/ui/organisation/ConfirmOrganisationDeleteController.java 1 addition, 1 deletion

.../ui/organisation/ConfirmOrganisationDeleteController.java
src/main/java/org/olat/user/ui/organisation/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...lat/user/ui/organisation/_i18n/LocalStrings_de.properties
src/main/java/org/olat/user/ui/organisation/_i18n/LocalStrings_en.properties 5 additions, 4 deletions

...lat/user/ui/organisation/_i18n/LocalStrings_en.properties
src/main/java/org/olat/user/ui/organisation/_i18n/LocalStrings_fr.properties 6 additions, 2 deletions

...lat/user/ui/organisation/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/user/ui/organisation/_i18n/LocalStrings_pt_BR.properties 5 additions, 1 deletion

.../user/ui/organisation/_i18n/LocalStrings_pt_BR.properties

with 43 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment