Merge remote-tracking branch 'origin/OpenOLAT_14.1' (7ffd340d) · 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

7ffd340d

Commit 7ffd340d authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents b6cbd9d7 01468337

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

.../core/commons/modules/bc/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

.../core/commons/modules/bc/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

.../core/commons/modules/bc/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/modules/bc/commands/CmdEditMeta.java 14 additions, 3 deletions

...rg/olat/core/commons/modules/bc/commands/CmdEditMeta.java
src/main/java/org/olat/course/condition/additionalconditions/PasswordCondition.java 3 additions, 1 deletion

...rse/condition/additionalconditions/PasswordCondition.java
src/main/java/org/olat/modules/forms/ui/RubricEditorController.java 9 additions, 7 deletions

...ava/org/olat/modules/forms/ui/RubricEditorController.java

with 29 additions and 11 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