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

64d67cca

Commit 64d67cca authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 9ab58c1b 46815873

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java 1 addition, 1 deletion

...rg/olat/course/nodes/iq/QTI21AssessmentRunController.java
src/main/java/org/olat/ims/qti21/ui/ResourcesMapper.java 6 additions, 4 deletions

src/main/java/org/olat/ims/qti21/ui/ResourcesMapper.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectVelocityRenderDecorator.java 1 addition, 1 deletion

...i/components/AssessmentObjectVelocityRenderDecorator.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentRenderFunctions.java 2 additions, 3 deletions

...at/ims/qti21/ui/components/AssessmentRenderFunctions.java
src/main/java/org/olat/modules/curriculum/CurriculumService.java 2 additions, 1 deletion

...n/java/org/olat/modules/curriculum/CurriculumService.java
src/main/java/org/olat/modules/curriculum/manager/CurriculumElementDAO.java 8 additions, 7 deletions

...olat/modules/curriculum/manager/CurriculumElementDAO.java
src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java 12 additions, 7 deletions

...lat/modules/curriculum/manager/CurriculumServiceImpl.java
src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java 4 additions, 3 deletions

...ules/curriculum/restapi/CurriculumElementsWebService.java
src/main/java/org/olat/modules/curriculum/ui/MoveCurriculumElementController.java 1 addition, 1 deletion

...odules/curriculum/ui/MoveCurriculumElementController.java
src/test/java/org/olat/modules/curriculum/manager/CurriculumElementDAOTest.java 133 additions, 6 deletions

.../modules/curriculum/manager/CurriculumElementDAOTest.java

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