From 2644ac5b396011aee4cd6a6b2835001e6ecac4bf Mon Sep 17 00:00:00 2001 From: Lucas Bartholemy Date: Wed, 14 Jul 2021 14:23:45 +0200 Subject: [PATCH 1/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5464b2a434..b4fa8a5d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ HumHub Changelog ================ -1.8.3 (Unreleased) +1.8.3 (July 14, 2021) ---------------------- - Fix #29: Fix login form view on browser back button after footer link - Fix #5066: Fix pin and archive global content without container From 9b47fee4d25f418995b901ecb08cf2192eddb2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Farr=C3=A9?= <23310825+funkycram@users.noreply.github.com> Date: Wed, 21 Jul 2021 11:16:09 +0200 Subject: [PATCH 2/4] Develop (#5180) * Enh #5169: Enable more than 50 groups to a user * - Enh #5049: Required profile field should not be required in administration (Fix for checkbox field type) --- CHANGELOG_DEV.md | 1 + .../modules/user/models/fieldtype/Checkbox.php | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG_DEV.md b/CHANGELOG_DEV.md index 40933f76e3..a41d8074ce 100644 --- a/CHANGELOG_DEV.md +++ b/CHANGELOG_DEV.md @@ -4,6 +4,7 @@ - Fix #5174: Tour module crashes with enabled tags field - Fix #5176: Closing the action confirmation modal window on top close icon - Fix #5177: Move directory widgets +- Enh #5049: Required profile field should not be required in administration (Fix for checkbox field type) 1.9.0-beta.2 (July 14, 2021) diff --git a/protected/humhub/modules/user/models/fieldtype/Checkbox.php b/protected/humhub/modules/user/models/fieldtype/Checkbox.php index 055a440c3e..069f3f2cbb 100644 --- a/protected/humhub/modules/user/models/fieldtype/Checkbox.php +++ b/protected/humhub/modules/user/models/fieldtype/Checkbox.php @@ -8,6 +8,7 @@ namespace humhub\modules\user\models\fieldtype; +use humhub\modules\user\models\Profile; use Yii; /** @@ -29,7 +30,7 @@ class Checkbox extends BaseType /** * Rules for validating the Field Type Settings Form * - * @return type + * @return array */ public function rules() { @@ -41,7 +42,7 @@ class Checkbox extends BaseType /** * Returns Form Definition for edit/create this field. * - * @return Array Form Definition + * @return array Form Definition */ public function getFormDefinition($definition = []) { @@ -81,8 +82,8 @@ class Checkbox extends BaseType /** * Returns the Field Rules, to validate users input * - * @param type $rules - * @return type + * @param array $rules + * @return array rules */ public function getFieldRules($rules = []) { @@ -92,7 +93,7 @@ class Checkbox extends BaseType if (!$this->$attribute) { $this->addError($attribute, Yii::t('UserModule.profile', '{attribute} is required!', ['{attribute}' => $profileField->title])); } - }]; + }, 'except' => Profile::SCENARIO_EDIT_ADMIN]; } else { $rules[] = [$profileField->internal_name, 'in', 'range' => [0, 1]]; } @@ -126,4 +127,4 @@ class Checkbox extends BaseType return $value; } -} \ No newline at end of file +} From 18375ab321a092ba1f774d040ff89f9a435a49aa Mon Sep 17 00:00:00 2001 From: Lucas Bartholemy Date: Wed, 21 Jul 2021 11:30:25 +0200 Subject: [PATCH 3/4] Update common.php --- 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 737866d629..9164f3d9d3 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.9.0-beta.2', + 'version' => '1.9.0', 'basePath' => dirname(__DIR__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR, 'bootstrap' => ['log', 'humhub\components\bootstrap\ModuleAutoLoader', 'queue', 'humhub\modules\ui\view\bootstrap\ThemeLoader'], 'sourceLanguage' => 'en', From 1852a106f15bcf153fcd7315d9f5c3cedeaacf5c Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Wed, 21 Jul 2021 18:41:12 +0300 Subject: [PATCH 4/4] Fix video thumbnail on Safari browser (#5184) --- CHANGELOG_DEV.md | 1 + protected/humhub/modules/file/widgets/views/showFiles.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG_DEV.md b/CHANGELOG_DEV.md index a41d8074ce..9a6a9fa0c9 100644 --- a/CHANGELOG_DEV.md +++ b/CHANGELOG_DEV.md @@ -5,6 +5,7 @@ - Fix #5176: Closing the action confirmation modal window on top close icon - Fix #5177: Move directory widgets - Enh #5049: Required profile field should not be required in administration (Fix for checkbox field type) +- Fix #5009: Fix video thumbnail on Safari browser 1.9.0-beta.2 (July 14, 2021) diff --git a/protected/humhub/modules/file/widgets/views/showFiles.php b/protected/humhub/modules/file/widgets/views/showFiles.php index 8e9d7f2ac3..90b1d36bb8 100644 --- a/protected/humhub/modules/file/widgets/views/showFiles.php +++ b/protected/humhub/modules/file/widgets/views/showFiles.php @@ -52,25 +52,25 @@ $galleryColumnClass = ThemeHelper::isFluid() ? $fluidColumnClass : $nonFluidCol file_name) === 'webm'): ?>
- +
file_name) === 'mp4'): ?>
- +
file_name) === 'ogv'): ?>
- +
file_name) === 'mov'): ?>
- +