From 027ca7e54d57f03ae5c14c146e068292e36a1a21 Mon Sep 17 00:00:00 2001 From: Lucas Bartholemy Date: Mon, 10 Oct 2022 18:07:02 +0200 Subject: [PATCH 1/3] Enh #5891: Improve select2 width on people filters --- CHANGELOG.md | 2 +- protected/humhub/modules/user/widgets/PeopleFilters.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a046796ecc..871a89c326 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ HumHub Changelog - Fix #5875: LDAP user creation broken without email address - Fix #5877: Fix wrong empty profile stream message - Fix #5874: Fix adding licence key after removing it from marketplace - +- Enh #5891: Improve select2 width on people filters 1.12.1 (August 15, 2022) ------------------------ diff --git a/protected/humhub/modules/user/widgets/PeopleFilters.php b/protected/humhub/modules/user/widgets/PeopleFilters.php index 8575f4b006..5824215a35 100644 --- a/protected/humhub/modules/user/widgets/PeopleFilters.php +++ b/protected/humhub/modules/user/widgets/PeopleFilters.php @@ -112,6 +112,7 @@ class PeopleFilters extends DirectoryFilters case 'dropdownlist': $filterData['type'] = 'widget'; $filterData['widget'] = PeopleFilterPicker::class; + $filterData['inputOptions'] = ['data-dropdown-auto-width' => 'true']; $filterData['widgetOptions'] = [ 'itemKey' => $profileField->internal_name ]; From 8bafd707f59f5ae9d2a0758af11574a49f05f68d Mon Sep 17 00:00:00 2001 From: Lucas Bartholemy Date: Tue, 11 Oct 2022 18:06:42 +0200 Subject: [PATCH 2/3] Increase version 1.12.2 --- protected/humhub/config/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protected/humhub/config/common.php b/protected/humhub/config/common.php index a6baada88f..9081ab964d 100644 --- a/protected/humhub/config/common.php +++ b/protected/humhub/config/common.php @@ -24,7 +24,7 @@ if (!defined('PKCS7_DETACHED')) { $config = [ 'name' => 'HumHub', - 'version' => '1.12.1', + 'version' => '1.12.2', 'minRecommendedPhpVersion' => '7.4', 'minSupportedPhpVersion' => '7.4', 'basePath' => dirname(__DIR__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR, From d85be4d684a4c4ee91b7cbfdd9ee2be22e6de51c Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Thu, 3 Nov 2022 20:08:15 +0300 Subject: [PATCH 3/3] Fix optional parameter on ldap user searching (#5911) --- CHANGELOG.md | 1 + protected/humhub/modules/ldap/components/ZendLdap.php | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 871a89c326..85021c24ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ HumHub Changelog - Fix #5877: Fix wrong empty profile stream message - Fix #5874: Fix adding licence key after removing it from marketplace - Enh #5891: Improve select2 width on people filters +- Fix #5909: Fix optional parameter on ldap user searching 1.12.1 (August 15, 2022) ------------------------ diff --git a/protected/humhub/modules/ldap/components/ZendLdap.php b/protected/humhub/modules/ldap/components/ZendLdap.php index d819b92dac..405d3a6625 100644 --- a/protected/humhub/modules/ldap/components/ZendLdap.php +++ b/protected/humhub/modules/ldap/components/ZendLdap.php @@ -8,8 +8,6 @@ use Laminas\Ldap\Ldap; use Laminas\Ldap\Filter; use Laminas\Ldap\Dn; use Laminas\Ldap\Exception; -use Laminas\Ldap\Exception\LdapException; -use Traversable; use Laminas\Ldap\ErrorHandler; @@ -42,7 +40,7 @@ class ZendLdap extends Ldap * @throws Exception\LdapException */ public function multiPageSearch( - $filter, $basedn = null, $scope, array $attributes = array(), $sort = null, + $filter, $basedn, $scope, array $attributes = array(), $sort = null, $collectionClass = null, $timelimit = 0, $pageSize = 10000 ) {