Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (1e506984) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 1e506984 authored 5 years ago by srosse

Browse files

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents a6b91fb0 f19a1e75

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/bps/course/nodes/ChecklistCourseNode.java 6 additions, 1 deletion

src/main/java/de/bps/course/nodes/ChecklistCourseNode.java
src/main/java/de/bps/course/nodes/DENCourseNode.java 6 additions, 1 deletion

src/main/java/de/bps/course/nodes/DENCourseNode.java
src/main/java/de/bps/course/nodes/LLCourseNode.java 7 additions, 5 deletions

src/main/java/de/bps/course/nodes/LLCourseNode.java
src/main/java/de/bps/course/nodes/cl/ChecklistCourseNodeConfiguration.java 3 additions, 2 deletions

...bps/course/nodes/cl/ChecklistCourseNodeConfiguration.java
src/main/java/de/bps/course/nodes/den/DENCourseNodeConfiguration.java 3 additions, 2 deletions

...a/de/bps/course/nodes/den/DENCourseNodeConfiguration.java
src/main/java/de/bps/course/nodes/ll/LLCourseNodeConfiguration.java 3 additions, 2 deletions

...ava/de/bps/course/nodes/ll/LLCourseNodeConfiguration.java
src/main/java/de/tuchemnitz/wizard/helper/course/CourseExtensionHelper.java 6 additions, 4 deletions

...uchemnitz/wizard/helper/course/CourseExtensionHelper.java
src/main/java/org/olat/course/archiver/ArchiverMainController.java 1 addition, 1 deletion

...java/org/olat/course/archiver/ArchiverMainController.java
src/main/java/org/olat/course/editor/ChooseNodeController.java 15 additions, 14 deletions

...ain/java/org/olat/course/editor/ChooseNodeController.java
src/main/java/org/olat/course/editor/EditorMainController.java 8 additions, 4 deletions

...ain/java/org/olat/course/editor/EditorMainController.java
src/main/java/org/olat/course/editor/MultiSPController.java 4 additions, 4 deletions

src/main/java/org/olat/course/editor/MultiSPController.java
src/main/java/org/olat/course/folder/MergedCourseElementDataContainer.java 2 additions, 1 deletion

.../olat/course/folder/MergedCourseElementDataContainer.java
src/main/java/org/olat/course/learningpath/LearningPathConfigs.java 2 additions, 0 deletions

...ava/org/olat/course/learningpath/LearningPathConfigs.java
src/main/java/org/olat/course/learningpath/LearningPathService.java 2 additions, 0 deletions

...ava/org/olat/course/learningpath/LearningPathService.java
src/main/java/org/olat/course/learningpath/SequenceConfig.java 34 additions, 0 deletions

...ain/java/org/olat/course/learningpath/SequenceConfig.java
src/main/java/org/olat/course/learningpath/manager/LearningPathCourseTreeModelBuilder.java 10 additions, 1 deletion

...rningpath/manager/LearningPathCourseTreeModelBuilder.java
src/main/java/org/olat/course/learningpath/manager/LearningPathServiceImpl.java 35 additions, 0 deletions

.../course/learningpath/manager/LearningPathServiceImpl.java
src/main/java/org/olat/course/learningpath/model/ModuleLearningPathConfigs.java 5 additions, 0 deletions

.../course/learningpath/model/ModuleLearningPathConfigs.java
src/main/java/org/olat/course/learningpath/model/SequenceConfigImpl.java 50 additions, 0 deletions

...rg/olat/course/learningpath/model/SequenceConfigImpl.java
src/main/java/org/olat/course/learningpath/model/UnsupportedLearningPathConfigs.java 5 additions, 0 deletions

...se/learningpath/model/UnsupportedLearningPathConfigs.java

with 207 additions and 42 deletions

Please register or to comment