Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk
Showing
- src/main/java/org/olat/NewControllerFactory.java 76 additions, 70 deletionssrc/main/java/org/olat/NewControllerFactory.java
- src/main/java/org/olat/commons/calendar/ICalServlet.java 1 addition, 1 deletionsrc/main/java/org/olat/commons/calendar/ICalServlet.java
- src/main/java/org/olat/commons/calendar/manager/ImportCalendarManager.java 2 additions, 2 deletions.../olat/commons/calendar/manager/ImportCalendarManager.java
- src/main/java/org/olat/core/gui/components/Window.java 2 additions, 0 deletionssrc/main/java/org/olat/core/gui/components/Window.java
- src/main/java/org/olat/core/servlets/HeadersFilter.java 6 additions, 4 deletionssrc/main/java/org/olat/core/servlets/HeadersFilter.java
- src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java 2 additions, 0 deletions...main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java
- src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonManagerImpl.java 2 additions, 1 deletion...dules/bigbluebutton/manager/BigBlueButtonManagerImpl.java
- src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java 7 additions, 2 deletions...ules/bigbluebutton/ui/BigBlueButtonMeetingController.java
- src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions...modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions...modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties 62 additions, 1 deletion...modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/modules/curriculum/ui/CurriculumComposerController.java 34 additions, 8 deletions...t/modules/curriculum/ui/CurriculumComposerController.java
- src/main/java/org/olat/modules/quality/analysis/ui/_i18n/LocalStrings_fr.properties 4 additions, 1 deletion...ules/quality/analysis/ui/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/modules/quality/analysis/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions...s/quality/analysis/ui/_i18n/LocalStrings_pt_BR.properties
- src/main/java/org/olat/modules/video/ui/_content/video_run.html 0 additions, 14 deletions...in/java/org/olat/modules/video/ui/_content/video_run.html
- src/main/java/org/olat/restapi/system/ProcSamplerJob.java 1 addition, 1 deletionsrc/main/java/org/olat/restapi/system/ProcSamplerJob.java
- src/main/webapp/static/js/functions.js 28 additions, 1 deletionsrc/main/webapp/static/js/functions.js
- src/main/webapp/static/js/jquery/openolat/jquery.paint.js 42 additions, 12 deletionssrc/main/webapp/static/js/jquery/openolat/jquery.paint.js
- src/main/webapp/static/js/js.plugins.min.js 1 addition, 1 deletionsrc/main/webapp/static/js/js.plugins.min.js
Loading
Please register or sign in to comment