Merge OpenOLAT default branch to OpenOLAT video with b7ec8bed32c2a0ba951eff3c104e0185de447e5a (28b0aaf1) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 28b0aaf1 authored 9 years ago by hg

Browse files

Merge OpenOLAT default branch to OpenOLAT video with b7ec8bed32c2a0ba951eff3c104e0185de447e5a

parents 8dada360 910484b9

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/commons/controllers/resume/ResumeController.java 2 additions, 1 deletion

...lat/core/commons/controllers/resume/ResumeController.java
src/main/java/org/olat/core/commons/modules/glossary/GlossaryMainController.java 2 additions, 1 deletion

...core/commons/modules/glossary/GlossaryMainController.java
src/main/java/org/olat/course/ICourse.java 5 additions, 4 deletions

src/main/java/org/olat/course/ICourse.java
src/main/java/org/olat/course/MergedCourseContainer.java 18 additions, 10 deletions

src/main/java/org/olat/course/MergedCourseContainer.java
src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java 3 additions, 1 deletion

.../java/org/olat/course/archiver/ScoreAccountingHelper.java
src/main/java/org/olat/course/assessment/AssessmentMainController.java 2 additions, 2 deletions

.../org/olat/course/assessment/AssessmentMainController.java
src/main/java/org/olat/course/assessment/IdentityAssessmentEditController.java 2 additions, 1 deletion

...t/course/assessment/IdentityAssessmentEditController.java
src/main/java/org/olat/course/assessment/manager/AssessmentModeCoordinationServiceImpl.java 3 additions, 1 deletion

...ssment/manager/AssessmentModeCoordinationServiceImpl.java
src/main/java/org/olat/course/assessment/manager/UserCourseInformationsManager.java 12 additions, 9 deletions

...rse/assessment/manager/UserCourseInformationsManager.java
src/main/java/org/olat/course/assessment/manager/UserCourseInformationsManagerImpl.java 45 additions, 39 deletions

...assessment/manager/UserCourseInformationsManagerImpl.java
src/main/java/org/olat/course/condition/interpreter/GetInitialCourseLaunchDateFunction.java 1 addition, 1 deletion

...ition/interpreter/GetInitialCourseLaunchDateFunction.java
src/main/java/org/olat/course/condition/interpreter/GetRecentCourseLaunchDateFunction.java 1 addition, 1 deletion

...dition/interpreter/GetRecentCourseLaunchDateFunction.java
src/main/java/org/olat/course/nodes/gta/ui/GTAAbstractController.java 1 addition, 1 deletion

...a/org/olat/course/nodes/gta/ui/GTAAbstractController.java
src/main/java/org/olat/group/ui/main/AbstractMemberListController.java 21 additions, 8 deletions

.../org/olat/group/ui/main/AbstractMemberListController.java
src/main/java/org/olat/group/ui/main/MemberInfoController.java 1 addition, 1 deletion

...ain/java/org/olat/group/ui/main/MemberInfoController.java
src/main/java/org/olat/ims/qti/repository/handlers/QTISurveyHandler.java 3 additions, 0 deletions

...rg/olat/ims/qti/repository/handlers/QTISurveyHandler.java
src/main/java/org/olat/ims/qti/repository/handlers/QTITestHandler.java 3 additions, 0 deletions

.../org/olat/ims/qti/repository/handlers/QTITestHandler.java
src/main/java/org/olat/modules/cp/CPDisplayController.java 1 addition, 1 deletion

src/main/java/org/olat/modules/cp/CPDisplayController.java
src/main/java/org/olat/modules/reminder/rule/InitialCourseLaunchRuleSPI.java 1 addition, 2 deletions

...lat/modules/reminder/rule/InitialCourseLaunchRuleSPI.java
src/main/java/org/olat/modules/reminder/rule/RecentCourseLaunchRuleSPI.java 1 addition, 2 deletions

...olat/modules/reminder/rule/RecentCourseLaunchRuleSPI.java

with 128 additions and 86 deletions

Please register or to comment