diff options
| -rw-r--r-- | apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/SharesPlugin.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/Server.php | 1 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 1 | ||||
| -rw-r--r-- | apps/user_ldap/js/vendor/ui-multiselect/MIT-LICENSE (renamed from apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE) | 0 | ||||
| -rw-r--r-- | apps/user_ldap/js/vendor/ui-multiselect/jquery.multiselect.css (renamed from apps/user_ldap/vendor/ui-multiselect/jquery.multiselect.css) | 0 | ||||
| -rw-r--r-- | apps/user_ldap/js/vendor/ui-multiselect/src/jquery.multiselect.js (renamed from apps/user_ldap/vendor/ui-multiselect/src/jquery.multiselect.js) | 0 | ||||
| -rw-r--r-- | apps/user_ldap/templates/settings.php | 3 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 14 |
9 files changed, 2 insertions, 20 deletions
diff --git a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php index af3d7c1269a..5317dc1b169 100644 --- a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php +++ b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php @@ -84,7 +84,6 @@ class InvitationResponseServer { $acl->principalCollectionSet = [ 'principals/users', 'principals/groups' ]; - $acl->defaultUsernamePath = 'principals/users'; $this->server->addPlugin($acl); // calendar plugins diff --git a/apps/dav/lib/Connector/Sabre/SharesPlugin.php b/apps/dav/lib/Connector/Sabre/SharesPlugin.php index 503d10aece3..d482aa4b510 100644 --- a/apps/dav/lib/Connector/Sabre/SharesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/SharesPlugin.php @@ -98,7 +98,7 @@ class SharesPlugin extends \Sabre\DAV\ServerPlugin { * @param \Sabre\DAV\Server $server */ public function initialize(\Sabre\DAV\Server $server) { - $server->xml->namespacesMap[self::NS_OWNCLOUD] = 'oc'; + $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc'; $server->xml->elementMap[self::SHARETYPES_PROPERTYNAME] = ShareTypeList::class; $server->protectedProperties[] = self::SHARETYPES_PROPERTYNAME; $server->protectedProperties[] = self::SHAREES_PROPERTYNAME; diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 6ab591fcf6d..ef7aa73dfb5 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -155,7 +155,6 @@ class Server { 'principals/calendar-resources', 'principals/calendar-rooms', ]; - $acl->defaultUsernamePath = 'principals/users'; $this->server->addPlugin($acl); // calendar plugins diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index facbbf09e0e..4d65723bb3e 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1770,7 +1770,6 @@ fileData.extraData = fileData.extraData.substr(1); } nameSpan.addClass('extra-data').attr('title', fileData.extraData); - nameSpan.tooltip({placement: 'top'}); } // dirs can show the number of uploaded files if (mime === 'httpd/unix-directory') { diff --git a/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE b/apps/user_ldap/js/vendor/ui-multiselect/MIT-LICENSE index 2dc8e79e3ad..2dc8e79e3ad 100644 --- a/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE +++ b/apps/user_ldap/js/vendor/ui-multiselect/MIT-LICENSE diff --git a/apps/user_ldap/vendor/ui-multiselect/jquery.multiselect.css b/apps/user_ldap/js/vendor/ui-multiselect/jquery.multiselect.css index 9b81c3bdcfb..9b81c3bdcfb 100644 --- a/apps/user_ldap/vendor/ui-multiselect/jquery.multiselect.css +++ b/apps/user_ldap/js/vendor/ui-multiselect/jquery.multiselect.css diff --git a/apps/user_ldap/vendor/ui-multiselect/src/jquery.multiselect.js b/apps/user_ldap/js/vendor/ui-multiselect/src/jquery.multiselect.js index 16ae4264177..16ae4264177 100644 --- a/apps/user_ldap/vendor/ui-multiselect/src/jquery.multiselect.js +++ b/apps/user_ldap/js/vendor/ui-multiselect/src/jquery.multiselect.js diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index b6b90d993b9..b2b22c87891 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -1,10 +1,9 @@ <?php -vendor_script('user_ldap', 'ui-multiselect/src/jquery.multiselect'); - vendor_style('user_ldap', 'ui-multiselect/jquery.multiselect'); script('user_ldap', [ + 'vendor/ui-multiselect/src/jquery.multiselect', 'wizard/controller', 'wizard/configModel', 'wizard/view', diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index d5092282088..669be0a148a 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -243,11 +243,6 @@ <code>$principal</code> </ParamNameMismatch> </file> - <file src="apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php"> - <UndefinedPropertyAssignment occurrences="1"> - <code>$acl->defaultUsernamePath</code> - </UndefinedPropertyAssignment> - </file> <file src="apps/dav/lib/CalDAV/Plugin.php"> <ImplementedReturnTypeMismatch occurrences="1"> <code>string|null</code> @@ -755,12 +750,6 @@ <UndefinedFunction occurrences="1"> <code>\Sabre\Uri\split($sabreNode->getPath())</code> </UndefinedFunction> - <UndefinedPropertyAssignment occurrences="1"> - <code>$server->xml->namespacesMap</code> - </UndefinedPropertyAssignment> - <UndefinedPropertyFetch occurrences="1"> - <code>$server->xml->namespacesMap</code> - </UndefinedPropertyFetch> </file> <file src="apps/dav/lib/Connector/Sabre/TagsPlugin.php"> <NullableReturnStatement occurrences="1"> @@ -939,9 +928,6 @@ <code>dispatch</code> <code>dispatch</code> </TooManyArguments> - <UndefinedPropertyAssignment occurrences="1"> - <code>$acl->defaultUsernamePath</code> - </UndefinedPropertyAssignment> </file> <file src="apps/dav/lib/SystemTag/SystemTagsByIdCollection.php"> <InvalidNullableReturnType occurrences="1"> |