Merge remote-tracking branch 'origin/OpenOLAT_15.2' (6b17b1cd) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 6b17b1cd authored 4 years ago by srosse

Browse files

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

parents 53fe9aad b7cdfda9

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/core/commons/services/webdav/WebDAVModule.java 25 additions, 14 deletions

...a/org/olat/core/commons/services/webdav/WebDAVModule.java
src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java 3 additions, 3 deletions

...re/commons/services/webdav/manager/WebDAVManagerImpl.java
src/main/java/org/olat/core/commons/services/webdav/servlets/WebDAVDispatcherImpl.java 1 addition, 1 deletion

...ommons/services/webdav/servlets/WebDAVDispatcherImpl.java
src/main/java/org/olat/core/commons/services/webdav/ui/WebDAVAdminController.java 3 additions, 3 deletions

...ore/commons/services/webdav/ui/WebDAVAdminController.java
src/main/java/org/olat/core/util/vfs/filters/VFSContainerFilter.java 1 addition, 0 deletions

...va/org/olat/core/util/vfs/filters/VFSContainerFilter.java
src/main/java/org/olat/course/export/CourseExportMediaResource.java 1 addition, 2 deletions

...ava/org/olat/course/export/CourseExportMediaResource.java
src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml 4 additions, 0 deletions

.../java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
src/main/java/org/olat/user/UserImpl.java 4 additions, 0 deletions

src/main/java/org/olat/user/UserImpl.java
src/main/java/org/olat/user/propertyhandlers/LinkedinPropertyHandler.java 95 additions, 0 deletions

...g/olat/user/propertyhandlers/LinkedinPropertyHandler.java
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_de.properties
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_en.properties 3 additions, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_en.properties
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/user/propertyhandlers/_spring/userPropertiesContext.xml 12 additions, 0 deletions

...t/user/propertyhandlers/_spring/userPropertiesContext.xml
src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml 5 additions, 0 deletions

...opertyhandlers/_spring/userPropertriesHandlersContext.xml
src/main/resources/database/mysql/alter_15_2_x_to_15_2_6.sql 3 additions, 0 deletions

src/main/resources/database/mysql/alter_15_2_x_to_15_2_6.sql
src/main/resources/database/mysql/setupDatabase.sql 1 addition, 0 deletions

src/main/resources/database/mysql/setupDatabase.sql
src/main/resources/database/oracle/alter_15_2_x_to_15_2_6.sql 3 additions, 0 deletions

...main/resources/database/oracle/alter_15_2_x_to_15_2_6.sql
src/main/resources/database/oracle/setupDatabase.sql 1 addition, 0 deletions

src/main/resources/database/oracle/setupDatabase.sql
src/main/resources/database/postgresql/alter_15_2_x_to_15_2_6.sql 2 additions, 0 deletions

.../resources/database/postgresql/alter_15_2_x_to_15_2_6.sql
src/main/resources/database/postgresql/setupDatabase.sql 1 addition, 0 deletions

src/main/resources/database/postgresql/setupDatabase.sql

with 172 additions and 23 deletions

Please register or to comment