Merge remote-tracking branch 'origin/OpenOLAT_13.2' (27a5a9a8) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 27a5a9a8 authored 5 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_13.2'

parents 454967bf 82e9e159

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/modules/curriculum/ui/CurriculumElementWithViewsDataModel.java 1 addition, 2 deletions

...es/curriculum/ui/CurriculumElementWithViewsDataModel.java
src/main/java/org/olat/modules/curriculum/ui/CurriculumElementWithViewsRow.java 12 additions, 0 deletions

.../modules/curriculum/ui/CurriculumElementWithViewsRow.java
src/main/java/org/olat/modules/curriculum/ui/component/CurriculumElementViewsRowComparator.java 28 additions, 22 deletions

...lum/ui/component/CurriculumElementViewsRowComparator.java
src/main/java/org/olat/modules/lecture/restapi/LectureBlocksWebService.java 1 addition, 1 deletion

...olat/modules/lecture/restapi/LectureBlocksWebService.java
src/main/java/org/olat/modules/reminder/manager/ReminderRulesXStream.java 67 additions, 0 deletions

...g/olat/modules/reminder/manager/ReminderRulesXStream.java
src/main/java/org/olat/modules/reminder/manager/ReminderServiceImpl.java 4 additions, 14 deletions

...rg/olat/modules/reminder/manager/ReminderServiceImpl.java
src/main/java/org/olat/modules/reminder/restapi/Examples.java 40 additions, 0 deletions

...main/java/org/olat/modules/reminder/restapi/Examples.java
src/main/java/org/olat/modules/reminder/restapi/ReminderRuleVO.java 101 additions, 0 deletions

...ava/org/olat/modules/reminder/restapi/ReminderRuleVO.java
src/main/java/org/olat/modules/reminder/restapi/ReminderVO.java 126 additions, 0 deletions

...in/java/org/olat/modules/reminder/restapi/ReminderVO.java
src/main/java/org/olat/modules/reminder/restapi/RemindersWebService.java 196 additions, 0 deletions

...rg/olat/modules/reminder/restapi/RemindersWebService.java
src/main/java/org/olat/restapi/repository/RepositoryEntryWebService.java 14 additions, 0 deletions

...rg/olat/restapi/repository/RepositoryEntryWebService.java
src/main/java/org/olat/restapi/repository/course/CourseWebService.java 15 additions, 0 deletions

.../org/olat/restapi/repository/course/CourseWebService.java
src/main/java/org/olat/user/ui/data/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...va/org/olat/user/ui/data/_i18n/LocalStrings_de.properties
src/test/java/org/olat/modules/curriculum/ui/component/CurriculumElementViewsRowComparatorTest.java 249 additions, 0 deletions

...ui/component/CurriculumElementViewsRowComparatorTest.java
src/test/java/org/olat/modules/reminder/manager/ReminderRulesXStreamTest.java 67 additions, 0 deletions

...at/modules/reminder/manager/ReminderRulesXStreamTest.java
src/test/java/org/olat/modules/reminder/manager/import_reminders.xml 28 additions, 0 deletions

...va/org/olat/modules/reminder/manager/import_reminders.xml
src/test/java/org/olat/modules/reminder/manager/reminder_rules_1.xml 20 additions, 0 deletions

...va/org/olat/modules/reminder/manager/reminder_rules_1.xml
src/test/java/org/olat/restapi/RemindersWebServiceTest.java 338 additions, 0 deletions

src/test/java/org/olat/restapi/RemindersWebServiceTest.java
src/test/java/org/olat/test/AllTestsJunit4.java 2 additions, 0 deletions

src/test/java/org/olat/test/AllTestsJunit4.java

with 1310 additions and 40 deletions

Please register or to comment