Merge remote-tracking branch 'upstream/develop' into 1704-mastodon
Conflicts: include/bbcode.php
This commit is contained in:
commit
3592f90910
83 changed files with 2859 additions and 2177 deletions
|
|
@ -138,7 +138,6 @@
|
|||
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
|
||||
|
||||
<h3>{{$performance}}</h3>
|
||||
<!-- {{include file="field_checkbox.tpl" field=$use_fulltext_engine}} -->
|
||||
{{include file="field_checkbox.tpl" field=$only_tag_search}}
|
||||
{{include file="field_input.tpl" field=$itemcache}}
|
||||
{{include file="field_input.tpl" field=$itemcache_duration}}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ $db_user = '{{$dbuser}}';
|
|||
$db_pass = '{{$dbpass}}';
|
||||
$db_data = '{{$dbdata}}';
|
||||
|
||||
// Set the database connection charset to UTF8.
|
||||
// Set the database connection charset to full Unicode (utf8mb4).
|
||||
// Changing this value will likely corrupt the special characters.
|
||||
// You have been warned.
|
||||
$a->config['system']['db_charset'] = "utf8mb4";
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
<?php return array (
|
||||
'components' =>
|
||||
array (
|
||||
'db' =>
|
||||
array (
|
||||
'class' => 'yii\\db\\Connection',
|
||||
'dsn' => 'mysql:host=127.0.0.1;dbname=installer',
|
||||
'username' => 'root',
|
||||
'password' => 'root',
|
||||
'charset' => 'utf8',
|
||||
),
|
||||
'user' =>
|
||||
array (
|
||||
),
|
||||
'mailer' =>
|
||||
array (
|
||||
'transport' =>
|
||||
array (
|
||||
'class' => 'Swift_MailTransport',
|
||||
),
|
||||
),
|
||||
'view' =>
|
||||
array (
|
||||
'theme' =>
|
||||
array (
|
||||
'name' => 'HumHub',
|
||||
),
|
||||
),
|
||||
'formatter' =>
|
||||
array (
|
||||
'defaultTimeZone' => 'Europe/Berlin',
|
||||
),
|
||||
'formatterApp' =>
|
||||
array (
|
||||
'defaultTimeZone' => 'Europe/Berlin',
|
||||
'timeZone' => 'Europe/Berlin',
|
||||
),
|
||||
),
|
||||
'params' =>
|
||||
array (
|
||||
'installer' =>
|
||||
array (
|
||||
'db' =>
|
||||
array (
|
||||
'installer_hostname' => '127.0.0.1',
|
||||
'installer_database' => 'installer',
|
||||
),
|
||||
),
|
||||
'config_created_at' => 1440430541,
|
||||
'installed' => true,
|
||||
),
|
||||
'name' => 'Installer',
|
||||
'language' => 'de',
|
||||
'timeZone' => 'Europe/Berlin',
|
||||
); ?>
|
||||
|
|
@ -30,6 +30,8 @@ function insertFormatting(BBcode,id) {
|
|||
}
|
||||
}
|
||||
|
||||
$(textarea).trigger('change');
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -275,7 +275,46 @@ $(document).ready(function(){
|
|||
|
||||
});
|
||||
|
||||
/*
|
||||
* This event handler hides all comment UI when the user clicks anywhere on the page
|
||||
* It ensures that we aren't closing the current comment box
|
||||
*
|
||||
* We are making an exception for buttons because of a race condition with the
|
||||
* comment opening button that results in an already closed comment UI.
|
||||
*/
|
||||
$(document).on('click', function(event) {
|
||||
if (event.target.type === 'button') {
|
||||
return true;
|
||||
}
|
||||
|
||||
var $dontclosethis = $(event.target).closest('.wall-item-comment-wrapper').find('.comment-edit-form');
|
||||
$('.wall-item-comment-wrapper .comment-edit-submit-wrapper:visible').each(function() {
|
||||
var $parent = $(this).parent('.comment-edit-form');
|
||||
var itemId = $parent.data('itemId');
|
||||
|
||||
if ($dontclosethis[0] != $parent[0]) {
|
||||
var textarea = $parent.find('textarea').get(0)
|
||||
|
||||
commentCloseUI(textarea, itemId);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Customize some elements when the app is used in standalone mode on Android
|
||||
if (window.matchMedia('(display-mode: standalone)').matches) {
|
||||
// Open links to source outside of the webview
|
||||
$('body').on('click', '.plink', function (e) {
|
||||
$(e.target).attr('target', '_blank');
|
||||
});
|
||||
}
|
||||
|
||||
/*
|
||||
* This event listeners ensures that the textarea size is updated event if the
|
||||
* value is changed externally (textcomplete, insertFormatting, fbrowser...)
|
||||
*/
|
||||
$(document).on('change', 'textarea', function(event) {
|
||||
autosize.update(event.target);
|
||||
});
|
||||
});
|
||||
|
||||
function openClose(theID) {
|
||||
|
|
|
|||
|
|
@ -28,6 +28,28 @@
|
|||
if(x($page,'htmlhead')) echo $page['htmlhead'];
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
// Add the theme color meta
|
||||
// It makes mobile Chrome UI match Frio's top bar color.
|
||||
$uid = $a->profile_uid;
|
||||
if (is_null($uid)) {
|
||||
$uid = get_theme_uid();
|
||||
}
|
||||
$schema = get_pconfig($uid, 'frio', 'schema');
|
||||
if (($schema) && ($schema != '---')) {
|
||||
if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
|
||||
$schemefile = 'view/theme/frio/schema/'.$schema.'.php';
|
||||
require_once($schemefile);
|
||||
}
|
||||
} else {
|
||||
$nav_bg = get_pconfig($uid, 'frio', 'nav_bg');
|
||||
}
|
||||
if (!$nav_bg) {
|
||||
$nav_bg = "#708fa0";
|
||||
}
|
||||
echo '<meta name="theme-color" content="'.$nav_bg.'" />';
|
||||
?>
|
||||
|
||||
</head>
|
||||
<?php
|
||||
if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login"))
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
{{else}}
|
||||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
|
||||
{{/if}}
|
||||
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
|
||||
<form class="comment-edit-form" style="display: block;" data-item-id="{{$id}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
|
||||
<input type="hidden" name="type" value="{{$type}}" />
|
||||
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
|
||||
<input type="hidden" name="parent" value="{{$parent}}" />
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
|
||||
|
||||
<div class="bb form-group">
|
||||
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});"></textarea>
|
||||
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" onFocus="commentOpenUI(this,{{$id}});"></textarea>
|
||||
</div>
|
||||
{{if $qcomment}}
|
||||
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@
|
|||
{{include file="field_input.tpl" field=$basepath}}
|
||||
|
||||
<h3>{{$performance}}</h3>
|
||||
{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
|
||||
{{include file="field_input.tpl" field=$itemcache}}
|
||||
{{include file="field_input.tpl" field=$itemcache_duration}}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue