Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk
Conflicts: src/main/java/org/olat/core/servlets/HeadersFilter.java src/main/java/org/olat/course/nodes/livestream/paella/PaellaFactory.java src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java src/main/java/org/olat/modules/bigbluebutton/ui/_content/guest_join.html src/main/java/org/olat/repository/ui/author/AuthorListController.java src/main/webapp/static/js/js.plugins.min.js src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.js src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.min.js src/main/webapp/static/themes/light/content.css src/main/webapp/static/themes/light/content.css.map src/main/webapp/static/themes/light/email.css.map src/main/webapp/static/themes/light/theme.css src/main/webapp/static/themes/light/theme.css.map src/main/webapp/static/themes/openolat/content.css src/main/webapp/static/themes/openolat/content.css.map src/main/webapp/static/themes/openolat/email.css.map src/main/webapp/static/themes/openolat/theme.css src/main/webapp/static/themes/openolat/theme.css.map Interface change: src/main/java/at/ac/uibk/course/CreateCourseContentStepForm.java src/main/java/de/bps/course/nodewizard/controller/RepositoryEntrySelectionController.java
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- pom.xml 40 additions, 30 deletionspom.xml
- scripts/version-rules.xml 1 addition, 1 deletionscripts/version-rules.xml
- src/main/java/at/ac/uibk/course/CreateCourseContentStepForm.java 1 addition, 1 deletion...n/java/at/ac/uibk/course/CreateCourseContentStepForm.java
- src/main/java/de/bps/course/nodes/cl/_i18n/LocalStrings_de.properties 0 additions, 4 deletions...a/de/bps/course/nodes/cl/_i18n/LocalStrings_de.properties
- src/main/java/de/bps/course/nodes/ll/LLEditForm.java 16 additions, 21 deletionssrc/main/java/de/bps/course/nodes/ll/LLEditForm.java
- src/main/java/de/bps/course/nodes/ll/_i18n/LocalStrings_de.properties 0 additions, 2 deletions...a/de/bps/course/nodes/ll/_i18n/LocalStrings_de.properties
- src/main/java/de/bps/course/nodes/ll/_i18n/LocalStrings_fr.properties 0 additions, 2 deletions...a/de/bps/course/nodes/ll/_i18n/LocalStrings_fr.properties
- src/main/java/de/bps/course/nodes/ll/_i18n/LocalStrings_pt_BR.properties 0 additions, 2 deletions...e/bps/course/nodes/ll/_i18n/LocalStrings_pt_BR.properties
- src/main/java/de/bps/course/nodewizard/controller/RepositoryEntrySelectionController.java 2 additions, 2 deletions...wizard/controller/RepositoryEntrySelectionController.java
- src/main/java/de/bps/olat/portal/links/LinksPortlet.java 5 additions, 5 deletionssrc/main/java/de/bps/olat/portal/links/LinksPortlet.java
- src/main/java/org/olat/NewControllerFactory.java 6 additions, 1 deletionsrc/main/java/org/olat/NewControllerFactory.java
- src/main/java/org/olat/_spring/extensionContext.xml 7 additions, 26 deletionssrc/main/java/org/olat/_spring/extensionContext.xml
- src/main/java/org/olat/admin/_i18n/LocalStrings_de.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_el.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_el.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_en.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_fr.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_it.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_it.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_jp.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_jp.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_nl_NL.properties 0 additions, 2 deletions...n/java/org/olat/admin/_i18n/LocalStrings_nl_NL.properties
Loading
Please register or sign in to comment