Merge branch 'master' into develop

This commit is contained in:
Lucas Bartholemy 2024-09-26 22:43:04 +02:00
commit 31c5c2ffda
8 changed files with 38 additions and 9 deletions

View File

@ -39,6 +39,13 @@ HumHub Changelog
1.16.3 (Unreleased)
--------------------------
- Fix #7212: Fix horizontal scroll bar on space stream on small screen
- Fix #7210: Small style fix for top account menu (temp fix for Mac Safari browser)
- Fix #7218: Fix visibility of wall stream content creating form
- Fix #7219: Renamed deprecated meta tag
- Fix #7174: In lists, when an item text is displayed on multiple lines, the lines below are not lining up with the first one
- Fix #7222: Fix rendering of checkbox on MacOS and iOS
- Fix #7225: Fix module JS config initialisation on AJAX request
- Fix #7227: Fix search reindexing after create new content
1.16.2 (September 5, 2024)
--------------------------

View File

@ -338,13 +338,12 @@ class ContentContainerModuleManager extends Component
/**
* This method is called to determine classes of Content models which can be posted on wall.
*
* @param ContentContainerActiveRecord|null $contentContainer
* @return ContentActiveRecord[]
* @since 1.13
*/
public function getContentClasses(): array
{
return Yii::$app->runtimeCache->getOrSet(__METHOD__ . $this->contentContainer->id, function () {
return Yii::$app->runtimeCache->getOrSet(__METHOD__ . $this->contentContainer->contentcontainer_id, function () {
$contentClasses = [];
foreach ($this->getEnabled() as $moduleId) {
$module = Yii::$app->getModule($moduleId);

View File

@ -82,6 +82,10 @@ class ContentSearchService
public function isIndexable(): bool
{
if (empty($this->content->id)) {
return false;
}
if ($this->content->stream_channel !== Content::STREAM_CHANNEL_DEFAULT) {
return false;
}

View File

@ -521,7 +521,15 @@ class View extends \yii\web\View
protected function flushJsConfig($key = null)
{
if (!empty($this->jsConfig)) {
$this->registerJs("humhub.config.set(" . json_encode($this->jsConfig) . ");", View::POS_BEGIN, $key);
$jsConfig = 'humhub.config.set(' . json_encode($this->jsConfig) . ')';
if (Yii::$app->request->isAjax) {
// This fix is required only on AJAX request!
// Put JS config code into the "jsFiles" array, in order to call it before
// the module JS file where the config must be already initialised.
$this->jsFiles[self::POS_HEAD][$key ?: md5($jsConfig)] = Html::script($jsConfig);
} else {
$this->registerJs($jsConfig, self::POS_BEGIN, $key);
}
$this->jsConfig = [];
}
}

View File

@ -36,7 +36,7 @@ class LayoutHeader extends Widget
// Apple/IOS headers
// https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html
$view->registerMetaTag(['name' => 'apple-mobile-web-app-title', 'content' => Yii::$app->name]);
$view->registerMetaTag(['name' => 'apple-mobile-web-app-capable', 'content' => 'yes']);
$view->registerMetaTag(['name' => 'mobile-web-app-capable', 'content' => 'yes']);
$view->registerMetaTag(['name' => 'apple-mobile-web-app-status-bar-style', 'content' => Yii::$app->view->theme->variable('primary')]);
$view->registerLinkTag(['rel' => 'manifest', 'href' => Url::to(['/web/pwa-manifest/index'])]);

View File

@ -186,22 +186,29 @@ input[type=checkbox] {
border: 2px solid @text-color-highlight !important;
outline: none;
}
&:checked {
border: 2px solid @info;
background: @info;
color: white;
&::after {
content: '\2714';
font-size: 14px;
content: '\f00c'; /* FontAwesome checkmark */
font-family: 'FontAwesome'; /* FontAwesome Font */
font-size: 12px;
position: absolute;
top: -3px;
top: 0;
left: 1px;
color: white;
}
}
}
/* Chromium */
@supports (-webkit-appearance: none) {
input[type=checkbox]:checked::after {
top: 1px;
left: 1px;
}
}
input[type=radio] {
border-radius: 50%;

View File

@ -92,6 +92,10 @@
#user-account-image {
margin-bottom: 0;
+ .caret { // Temp fix for Mac Safari browser
float: right;
margin: 12px 0 0 6px;
}
}
}
}

View File

@ -6389,7 +6389,7 @@ ul.tag_input li img {
* Define or overwrite your theme variables here.
*
* Check for @humhub/static/less/variables.less file for all available variables.
*
*
* You can also access your variables within your view files by calling Yii::$app->view->theme->variable('myVariable');
*
* You can disable the import of humhub theme components by using variables of the format @prev-{component} e.g.: