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

Commit 1d61b58c authored 5 years ago by aboeckle

Browse files

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

parents 2a26d01f bd2c28e4

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/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java 2 additions, 0 deletions

...m/flexible/impl/elements/table/FlexiTableElementImpl.java
src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java 1 addition, 1 deletion

...core/gui/control/generic/iframe/IFrameDeliveryMapper.java
src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java 20 additions, 2 deletions

...t/course/nodes/iq/IQIdentityListCourseNodeController.java
src/main/java/org/olat/ims/qti21/ui/components/_content/matchInteraction_kprim.html 3 additions, 3 deletions

.../qti21/ui/components/_content/matchInteraction_kprim.html
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/grading/GradingAssignment.java 4 additions, 0 deletions

...main/java/org/olat/modules/grading/GradingAssignment.java
src/main/java/org/olat/modules/grading/GradingService.java 8 additions, 0 deletions

src/main/java/org/olat/modules/grading/GradingService.java
src/main/java/org/olat/modules/grading/manager/GraderReminderJob.java 1 addition, 0 deletions

...a/org/olat/modules/grading/manager/GraderReminderJob.java
src/main/java/org/olat/modules/grading/manager/GradingAssignmentDAO.java 38 additions, 0 deletions

...rg/olat/modules/grading/manager/GradingAssignmentDAO.java
src/main/java/org/olat/modules/grading/manager/GradingServiceImpl.java 52 additions, 5 deletions

.../org/olat/modules/grading/manager/GradingServiceImpl.java
src/main/java/org/olat/modules/grading/model/GradingAssignmentImpl.java 14 additions, 1 deletion

...org/olat/modules/grading/model/GradingAssignmentImpl.java
src/main/java/org/olat/modules/grading/ui/GradingAssignmentsListController.java 62 additions, 4 deletions

.../modules/grading/ui/GradingAssignmentsListController.java
src/main/java/org/olat/modules/qpool/manager/QItemQueriesDAO.java 5 additions, 1 deletion

.../java/org/olat/modules/qpool/manager/QItemQueriesDAO.java
src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataEditController.java 1 addition, 0 deletions

...les/qpool/ui/metadata/QuestionMetadataEditController.java
src/main/java/org/olat/repository/ui/author/AuthorListController.java 25 additions, 18 deletions

...a/org/olat/repository/ui/author/AuthorListController.java
src/main/resources/database/mysql/alter_15_pre_0_to_15_pre_4.sql 1 addition, 0 deletions

...n/resources/database/mysql/alter_15_pre_0_to_15_pre_4.sql
src/main/resources/database/mysql/setupDatabase.sql 1 addition, 0 deletions

src/main/resources/database/mysql/setupDatabase.sql
src/main/resources/database/oracle/alter_15_pre_0_to_15_pre_4.sql 1 addition, 0 deletions

.../resources/database/oracle/alter_15_pre_0_to_15_pre_4.sql
src/main/resources/database/oracle/setupDatabase.sql 1 addition, 0 deletions

src/main/resources/database/oracle/setupDatabase.sql

with 242 additions and 37 deletions

Please register or to comment