Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk
Conflicts: src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java src/main/webapp/static/themes/light/theme.css src/main/webapp/static/themes/light/theme.css.map src/main/webapp/static/themes/openolat/theme.css src/main/webapp/static/themes/openolat/theme.css.map
Showing
- src/main/java/org/olat/admin/sysinfo/LargeFilesController.java 3 additions, 2 deletions...ain/java/org/olat/admin/sysinfo/LargeFilesController.java
- src/main/java/org/olat/admin/user/SendTokenToUserForm.java 3 additions, 1 deletionsrc/main/java/org/olat/admin/user/SendTokenToUserForm.java
- src/main/java/org/olat/basesecurity/AuthHelper.java 1 addition, 1 deletionsrc/main/java/org/olat/basesecurity/AuthHelper.java
- src/main/java/org/olat/commons/calendar/ui/CalendarEntryForm.java 5 additions, 9 deletions.../java/org/olat/commons/calendar/ui/CalendarEntryForm.java
- src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html 1 addition, 1 deletion...at/core/commons/fullWebApp/_content/fullwebapplayout.html
- src/main/java/org/olat/core/commons/fullWebApp/_content/message.html 1 addition, 1 deletion...va/org/olat/core/commons/fullWebApp/_content/message.html
- src/main/java/org/olat/core/commons/services/doceditor/manager/DocEditorServiceImpl.java 5 additions, 0 deletions...mons/services/doceditor/manager/DocEditorServiceImpl.java
- src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/OnlyOfficeModule.java 30 additions, 0 deletions...mmons/services/doceditor/onlyoffice/OnlyOfficeModule.java
- src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/manager/OnlyOfficeConversionServiceImpl.java 4 additions, 4 deletions...r/onlyoffice/manager/OnlyOfficeConversionServiceImpl.java
- src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/manager/OnlyOfficeHttpClientCreator.java 47 additions, 0 deletions...ditor/onlyoffice/manager/OnlyOfficeHttpClientCreator.java
- src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/manager/OnlyOfficeServiceImpl.java 3 additions, 2 deletions...s/doceditor/onlyoffice/manager/OnlyOfficeServiceImpl.java
- src/main/java/org/olat/core/commons/services/help/HelpModule.java 1 addition, 1 deletion.../java/org/olat/core/commons/services/help/HelpModule.java
- src/main/java/org/olat/core/dispatcher/DispatcherModule.java 12 additions, 6 deletionssrc/main/java/org/olat/core/dispatcher/DispatcherModule.java
- src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml 4 additions, 0 deletions...va/org/olat/core/dispatcher/_spring/dispatcherContext.xml
- src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java 12 additions, 0 deletions...lat/core/gui/render/velocity/VelocityRenderDecorator.java
- src/main/java/org/olat/core/helpers/Settings.java 10 additions, 0 deletionssrc/main/java/org/olat/core/helpers/Settings.java
- src/main/java/org/olat/core/servlets/OpenOLATServlet.java 5 additions, 2 deletionssrc/main/java/org/olat/core/servlets/OpenOLATServlet.java
- src/main/java/org/olat/core/util/StringHelper.java 4 additions, 0 deletionssrc/main/java/org/olat/core/util/StringHelper.java
- src/main/java/org/olat/core/util/_spring/utilCorecontext.xml 1 addition, 0 deletionssrc/main/java/org/olat/core/util/_spring/utilCorecontext.xml
- src/main/java/org/olat/course/assessment/ui/tool/AssessmentToolController.java 18 additions, 109 deletions...t/course/assessment/ui/tool/AssessmentToolController.java
Loading
Please register or sign in to comment