mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:humhub/humhub into develop

Browse Source
This commit is contained in:
HumHub Translations 2021-07-21 18:16:26 +02:00
commit 7605d9d4dd
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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

2
CHANGELOG_DEV.md
View File

@ -4,6 +4,8 @@
- 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)
- Fix #5009: Fix video thumbnail on Safari browser
1.9.0-beta.2 (July 14, 2021)

2
protected/humhub/config/common.php
View File

@ -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',

8
protected/humhub/modules/file/widgets/views/showFiles.php
View File

@ -52,25 +52,25 @@ $galleryColumnClass = ThemeHelper::isFluid() ? $fluidColumnClass : $nonFluidCol
<?php if (FileHelper::getExtension($video->file_name) === 'webm'): ?>
<div class="<?= $fullWidthColumnClass ?>">
<a data-ui-gallery="<?= 'gallery-' . $object->getUniqueId() ?>" href="<?= $video->getUrl(); ?>#.webm" title="<?= Html::encode($video->file_name) ?>">
<video src="<?= $video->getUrl() ?>" type="video/webm" controls preload="metadata" height="130"></video>
<video src="<?= $video->getUrl() ?>#t=0.001" type="video/webm" controls preload="metadata" height="130"></video>
</a>
</div>
<?php elseif (FileHelper::getExtension($video->file_name) === 'mp4'): ?>
<div class="<?= $fullWidthColumnClass ?>">
<a data-ui-gallery="<?= 'gallery-' . $object->getUniqueId() ?>" href="<?= $video->getUrl(); ?>#.mp4" title="<?= Html::encode($video->file_name) ?>">
<video src="<?= $video->getUrl() ?>" type="video/mp4" controls preload="metadata" height="130"></video>
<video src="<?= $video->getUrl() ?>#t=0.001" type="video/mp4" controls preload="metadata" height="130"></video>
</a>
</div>
<?php elseif (FileHelper::getExtension($video->file_name) === 'ogv'): ?>
<div class="<?= $fullWidthColumnClass ?>">
<a data-ui-gallery="<?= 'gallery-' . $object->getUniqueId() ?>" href="<?= $video->getUrl(); ?>#.ogv" title="<?= Html::encode($video->file_name) ?>">
<video src="<?= $video->getUrl() ?>" type="video/ogg" controls preload="metadata" height="130"></video>
<video src="<?= $video->getUrl() ?>#t=0.001" type="video/ogg" controls preload="metadata" height="130"></video>
</a>
</div>
<?php elseif (FileHelper::getExtension($video->file_name) === 'mov'): ?>
<div class="<?= $fullWidthColumnClass ?>">
<a data-ui-gallery="<?= 'gallery-' . $object->getUniqueId() ?>" href="<?= $video->getUrl(); ?>#.mov" title="<?= Html::encode($video->file_name) ?>">
<video src="<?= $video->getUrl() ?>" type="video/quicktime" controls preload="metadata" height="130"></video>
<video src="<?= $video->getUrl() ?>#t=0.001" type="video/quicktime" controls preload="metadata" height="130"></video>
</a>
</div>
<?php endif; ?>

13
protected/humhub/modules/user/models/fieldtype/Checkbox.php
View File

@ -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;
}
}
}