Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk (c9e45b53) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit c9e45b53 authored 5 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk

parents 8bf05a77 66ed8b2a

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/core/gui/components/form/flexible/FormUIFactory.java 3 additions, 3 deletions

...olat/core/gui/components/form/flexible/FormUIFactory.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java 6 additions, 2 deletions

...lexible/impl/elements/richText/RichTextConfiguration.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/TinyConfig.java 7 additions, 0 deletions

...ents/form/flexible/impl/elements/richText/TinyConfig.java
src/main/java/org/olat/core/gui/components/link/Link.java 15 additions, 0 deletions

src/main/java/org/olat/core/gui/components/link/Link.java
src/main/java/org/olat/core/gui/components/link/LinkRenderer.java 5 additions, 1 deletion

.../java/org/olat/core/gui/components/link/LinkRenderer.java
src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java 4 additions, 0 deletions

...lat/core/gui/render/velocity/VelocityRenderDecorator.java
src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseController.java 6 additions, 3 deletions

...ssessment/ui/tool/AssessmentIdentityCourseController.java
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...ourse/assessment/ui/tool/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...ourse/assessment/ui/tool/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties 2 additions, 0 deletions

...ourse/assessment/ui/tool/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/highscore/manager/HighScoreManager.java 7 additions, 11 deletions

...a/org/olat/course/highscore/manager/HighScoreManager.java
src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java 1 addition, 2 deletions

...a/org/olat/course/nodes/ms/MSCourseNodeRunController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java 1 addition, 1 deletion

...s/qti21/ui/editor/interactions/MatchEditorController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/TrueFalseEditorController.java 1 addition, 1 deletion

...i21/ui/editor/interactions/TrueFalseEditorController.java
src/main/java/org/olat/modules/lecture/ui/coach/AbsenceNoticesListController.java 7 additions, 2 deletions

...odules/lecture/ui/coach/AbsenceNoticesListController.java
src/main/java/org/olat/modules/lecture/ui/coach/AbsencesController.java 1 addition, 1 deletion

...org/olat/modules/lecture/ui/coach/AbsencesController.java
src/main/java/org/olat/modules/lecture/ui/coach/DailyAbsencesController.java 1 addition, 1 deletion

...lat/modules/lecture/ui/coach/DailyAbsencesController.java
src/main/java/org/olat/modules/lecture/ui/coach/DispensationsController.java 30 additions, 1 deletion

...lat/modules/lecture/ui/coach/DispensationsController.java
src/main/java/org/olat/modules/lecture/ui/profile/IdentityProfileController.java 1 addition, 1 deletion

...modules/lecture/ui/profile/IdentityProfileController.java
src/main/java/org/olat/modules/taxonomy/ui/TaxonomyLevelRow.java 4 additions, 0 deletions

...n/java/org/olat/modules/taxonomy/ui/TaxonomyLevelRow.java

with 106 additions and 30 deletions

Please register or to comment