mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 01:15:13 +00:00
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
This commit is contained in:
commit
538845cbf5
7 changed files with 1590 additions and 1460 deletions
2
boot.php
2
boot.php
|
@ -50,7 +50,7 @@ require_once('include/hubloc.php');
|
|||
require_once('include/attach.php');
|
||||
|
||||
define ( 'PLATFORM_NAME', 'hubzilla' );
|
||||
define ( 'STD_VERSION', '2.9.4' );
|
||||
define ( 'STD_VERSION', '3.1' );
|
||||
define ( 'ZOT_REVISION', '1.3' );
|
||||
|
||||
define ( 'DB_UPDATE_VERSION', 1198 );
|
||||
|
|
|
@ -755,8 +755,8 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
|
|||
'forged' => $forged,
|
||||
'txt_cats' => t('Categories:'),
|
||||
'txt_folders' => t('Filed under:'),
|
||||
'has_cats' => ((count($body['categories'])) ? 'true' : ''),
|
||||
'has_folders' => ((count($body['folders'])) ? 'true' : ''),
|
||||
'has_cats' => (($body['categories']) ? 'true' : ''),
|
||||
'has_folders' => (($body['folders']) ? 'true' : ''),
|
||||
'text' => strip_tags($body['html']),
|
||||
'ago' => relative_date($item['created']),
|
||||
'app' => $item['app'],
|
||||
|
|
|
@ -176,13 +176,15 @@ EOT;
|
|||
|
||||
}
|
||||
|
||||
|
||||
$homelink = get_my_url();
|
||||
if(! $homelink) {
|
||||
$my_url = get_my_url();
|
||||
if(! $my_url) {
|
||||
$observer = App::get_observer();
|
||||
$homelink = (($observer) ? $observer['xchan_url'] : '');
|
||||
$my_url = (($observer) ? $observer['xchan_url'] : '');
|
||||
}
|
||||
|
||||
$homelink_arr = parse_url($my_url);
|
||||
$homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host'];
|
||||
|
||||
if(! $is_owner) {
|
||||
$nav['rusermenu'] = array(
|
||||
$homelink,
|
||||
|
|
3010
util/hmessages.po
3010
util/hmessages.po
File diff suppressed because it is too large
Load diff
|
@ -21,6 +21,10 @@
|
|||
padding: 7px 3px 7px 10px;
|
||||
}
|
||||
|
||||
#cloud-index td:nth-child(2){
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
#cloud-index th:nth-child(8),
|
||||
#cloud-index td:nth-child(8){
|
||||
padding: 7px 3px;
|
||||
|
|
|
@ -1802,16 +1802,6 @@ dl.bb-dl > dd > li {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
#cloud-index {
|
||||
width: 100%;
|
||||
table-layout: fixed;
|
||||
}
|
||||
|
||||
#cloud-index td {
|
||||
width: auto;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.caption-visible {
|
||||
max-height: 75%;
|
||||
}
|
||||
|
|
|
@ -39,12 +39,12 @@
|
|||
{{else}}
|
||||
<table id="cloud-index">
|
||||
<tr>
|
||||
<th width="4%"></th>
|
||||
<th width="47%">{{$name}}</th>
|
||||
<th width="4%"></th><th width="4%"></th><th width="4%"></th><th width="4%"></th>
|
||||
<th width="1%"></th>
|
||||
<th width="92%">{{$name}}</th>
|
||||
<th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th>
|
||||
<th width="1%">{{*{{$type}}*}}</th>
|
||||
<th width="10%" class="d-none d-md-table-cell">{{$size}}</th>
|
||||
<th width="22%" class="d-none d-md-table-cell">{{$lastmod}}</th>
|
||||
<th width="1%" class="d-none d-md-table-cell">{{$size}}</th>
|
||||
<th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th>
|
||||
</tr>
|
||||
{{if $parentpath}}
|
||||
<tr>
|
||||
|
|
Loading…
Reference in a new issue