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

Commit a1884b81 authored 5 years ago by aboeckle

Browse files

Merge branch 'master' of ssh://office.frentix.com/home/aboeckle/repositories/OpenOLAT

parents dbb6a5f4 5ae0aad9

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/course/assessment/manager/CourseAssessmentServiceImpl.java 1 addition, 1 deletion

...ourse/assessment/manager/CourseAssessmentServiceImpl.java
src/main/java/org/olat/course/nodes/gta/GTAManager.java 2 additions, 2 deletions

src/main/java/org/olat/course/nodes/gta/GTAManager.java
src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java 22 additions, 27 deletions

...ava/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
src/main/java/org/olat/course/nodes/gta/ui/GTAAbstractController.java 5 additions, 0 deletions

...a/org/olat/course/nodes/gta/ui/GTAAbstractController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAAvailableTaskController.java 1 addition, 1 deletion

.../olat/course/nodes/gta/ui/GTAAvailableTaskController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java 3 additions, 1 deletion

...rg/olat/course/nodes/gta/ui/GTAParticipantController.java
src/main/java/org/olat/course/nodes/gta/ui/GTARunController.java 14 additions, 1 deletion

...n/java/org/olat/course/nodes/gta/ui/GTARunController.java
src/main/java/org/olat/course/nodes/ta/ConvertToGTACourseNode.java 1 addition, 1 deletion

...java/org/olat/course/nodes/ta/ConvertToGTACourseNode.java
src/main/java/org/olat/course/run/navigation/NavigationHandler.java 1 addition, 1 deletion

...ava/org/olat/course/run/navigation/NavigationHandler.java
src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnect9Provider.java 4 additions, 2 deletions

...t/modules/adobeconnect/manager/AdobeConnect9Provider.java
src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnectUtils.java 4 additions, 0 deletions

.../olat/modules/adobeconnect/manager/AdobeConnectUtils.java
src/main/java/org/olat/modules/adobeconnect/manager/DFNprovider.java 5 additions, 3 deletions

...va/org/olat/modules/adobeconnect/manager/DFNprovider.java
src/main/java/org/olat/modules/assessment/AssessmentService.java 0 additions, 22 deletions

...n/java/org/olat/modules/assessment/AssessmentService.java
src/main/java/org/olat/modules/assessment/manager/AssessmentServiceImpl.java 0 additions, 28 deletions

...lat/modules/assessment/manager/AssessmentServiceImpl.java
src/main/java/org/olat/modules/lecture/manager/LectureBlockDAO.java 4 additions, 4 deletions

...ava/org/olat/modules/lecture/manager/LectureBlockDAO.java
src/main/java/org/olat/modules/lecture/ui/LecturesMainController.java 2 additions, 1 deletion

...a/org/olat/modules/lecture/ui/LecturesMainController.java
src/main/java/org/olat/modules/lecture/ui/TeacherToolOverviewController.java 1 addition, 1 deletion

...lat/modules/lecture/ui/TeacherToolOverviewController.java
src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../olat/modules/lecture/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/qpool/manager/QItemQueriesDAO.java 17 additions, 0 deletions

.../java/org/olat/modules/qpool/manager/QItemQueriesDAO.java
src/main/java/org/olat/modules/qpool/manager/QuestionItemDAO.java 9 additions, 0 deletions

.../java/org/olat/modules/qpool/manager/QuestionItemDAO.java

with 97 additions and 97 deletions

Please register or to comment