Merge remote-tracking branch 'upstream/OpenOLAT_12.5' (05440898) · 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

05440898

Commit 05440898 authored 6 years ago by User expired

Downloads
- Plain Diff

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

parents 353f9e32 f66effa0

No related branches found

No related tags found

Loading

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/util/nodes/GenericNode.java 16 additions, 0 deletions

src/main/java/org/olat/core/util/nodes/GenericNode.java
src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditForm.java 44 additions, 55 deletions

...n/java/org/olat/course/nodes/bc/BCCourseNodeEditForm.java
src/main/java/org/olat/ims/qti21/ui/assessment/components/ToReviewFlexiCellRenderer.java 2 additions, 0 deletions

...1/ui/assessment/components/ToReviewFlexiCellRenderer.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentItemComponentRenderer.java 2 additions, 2 deletions

.../qti21/ui/components/AssessmentItemComponentRenderer.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentTestComponentRenderer.java 3 additions, 3 deletions

.../qti21/ui/components/AssessmentTestComponentRenderer.java
src/main/java/org/olat/modules/portfolio/ui/shared/SharedBindersController.java 1 addition, 1 deletion

.../modules/portfolio/ui/shared/SharedBindersController.java
src/main/java/org/olat/modules/qpool/manager/PoolDAO.java 2 additions, 0 deletions

src/main/java/org/olat/modules/qpool/manager/PoolDAO.java
src/main/java/org/olat/modules/qpool/manager/QuestionItemDAO.java 11 additions, 3 deletions

.../java/org/olat/modules/qpool/manager/QuestionItemDAO.java
src/main/java/org/olat/user/DisplayPortraitManager.java 8 additions, 2 deletions

src/main/java/org/olat/user/DisplayPortraitManager.java
src/main/webapp/static/movie/mediaelementjs/hls/hls.js 163 additions, 163 deletions

src/main/webapp/static/movie/mediaelementjs/hls/hls.js
src/main/webapp/static/movie/mediaelementjs/hls/hls.min.js 1 addition, 3 deletions

src/main/webapp/static/movie/mediaelementjs/hls/hls.min.js

with 253 additions and 232 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