Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.1 (3da4673b) · 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

3da4673b

Commit 3da4673b authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.1

parents fb772067 2f80ae73

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java 2 additions, 1 deletion

...e/ui/CertificateAndEfficiencyStatementListController.java
src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListModel.java 12 additions, 1 deletion

...ficate/ui/CertificateAndEfficiencyStatementListModel.java
src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java 1 addition, 1 deletion

...t/course/nodes/iq/IQIdentityListCourseNodeController.java
src/main/java/org/olat/ims/qti21/ui/QTI21AssessedIdentityListController.java 0 additions, 5 deletions

...lat/ims/qti21/ui/QTI21AssessedIdentityListController.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/taxonomy/ui/MergeTaxonomyLevelController.java 2 additions, 2 deletions

...lat/modules/taxonomy/ui/MergeTaxonomyLevelController.java
src/main/java/org/olat/modules/taxonomy/ui/_content/confirm_delete_levels.html 3 additions, 1 deletion

...t/modules/taxonomy/ui/_content/confirm_delete_levels.html
src/main/java/org/olat/modules/taxonomy/ui/_content/merge_taxonomy_levels.html 8 additions, 6 deletions

...t/modules/taxonomy/ui/_content/merge_taxonomy_levels.html
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...t/modules/taxonomy/ui/_i18n/LocalStrings_pt_BR.properties

with 34 additions and 23 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