Merge branch 'devel_141' (357a571b) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 357a571b authored 5 years ago by srosse

Browse files

Merge branch 'devel_141'

parents 7bc335ef 289e869e

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/commons/calendar/CalendarManager.java 2 additions, 0 deletions

src/main/java/org/olat/commons/calendar/CalendarManager.java
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_de.properties 13 additions, 0 deletions

...rg/olat/commons/calendar/_i18n/LocalStrings_de.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_en.properties 13 additions, 0 deletions

...rg/olat/commons/calendar/_i18n/LocalStrings_en.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...rg/olat/commons/calendar/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java 22 additions, 15 deletions

...lat/commons/calendar/manager/ICalFileCalendarManager.java
src/main/java/org/olat/commons/calendar/manager/ImportToCalendarManager.java 40 additions, 3 deletions

...lat/commons/calendar/manager/ImportToCalendarManager.java
src/main/java/org/olat/commons/calendar/restapi/CalendarWSHelper.java 3 additions, 11 deletions

...a/org/olat/commons/calendar/restapi/CalendarWSHelper.java
src/main/java/org/olat/commons/calendar/ui/CalendarPersonalConfigurationController.java 68 additions, 0 deletions

.../calendar/ui/CalendarPersonalConfigurationController.java
src/main/java/org/olat/commons/calendar/ui/CalendarToolsController.java 36 additions, 5 deletions

...org/olat/commons/calendar/ui/CalendarToolsController.java
src/main/java/org/olat/commons/calendar/ui/ConfirmCalendarResetController.java 101 additions, 0 deletions

...t/commons/calendar/ui/ConfirmCalendarResetController.java
src/main/java/org/olat/commons/calendar/ui/ConfirmDeleteImportedToCalendarController.java 134 additions, 0 deletions

...alendar/ui/ConfirmDeleteImportedToCalendarController.java
src/main/java/org/olat/commons/calendar/ui/WeeklyCalendarController.java 2 additions, 1 deletion

...rg/olat/commons/calendar/ui/WeeklyCalendarController.java
src/main/java/org/olat/commons/calendar/ui/_content/confirm_delete_import_to.html 4 additions, 0 deletions

...ommons/calendar/ui/_content/confirm_delete_import_to.html
src/main/java/org/olat/commons/calendar/ui/_content/confirm_reset.html 4 additions, 0 deletions

.../org/olat/commons/calendar/ui/_content/confirm_reset.html
src/main/java/org/olat/commons/calendar/ui/_content/tools.html 6 additions, 0 deletions

...ain/java/org/olat/commons/calendar/ui/_content/tools.html
src/main/java/org/olat/commons/calendar/ui/events/CalendarGUIEvent.java 2 additions, 0 deletions

...org/olat/commons/calendar/ui/events/CalendarGUIEvent.java
src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java 1 addition, 1 deletion

...ims/qti21/ui/editor/AssessmentTestComposerController.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 4 additions, 0 deletions

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

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/editor/overview/AssessmentTestOverviewConfigurationController.java 87 additions, 33 deletions

...erview/AssessmentTestOverviewConfigurationController.java

with 547 additions and 69 deletions

Please register or to comment