harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
zotlabs 2017-12-14 13:32:58 -08:00
commit 684b572aa8
9 changed files with 1598 additions and 1459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Embedphotos.php
View File

@ -83,7 +83,7 @@ class Embedphotos extends \Zotlabs\Web\Controller {
return ''; return '';
if($args['album']) if($args['album'])
$album = $args['album']; $album = (($args['album'] === '/') ? '' : $args['album']);
if($args['title']) if($args['title'])
$title = $args['title']; $title = $args['title'];

2
boot.php
View File

@ -50,7 +50,7 @@ require_once('include/hubloc.php');
require_once('include/attach.php'); require_once('include/attach.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '2.9.4' ); define ( 'STD_VERSION', '3.1' );
define ( 'ZOT_REVISION', '1.3' ); define ( 'ZOT_REVISION', '1.3' );
define ( 'DB_UPDATE_VERSION', 1198 ); define ( 'DB_UPDATE_VERSION', 1198 );

5
include/attach.php
View File

@ -308,6 +308,11 @@ function attach_can_view_folder($uid,$ob_hash,$folder_hash) {
$hash = $folder_hash; $hash = $folder_hash;
$result = false; $result = false;
if(! $folder_hash) {
return perm_is_allowed($uid,$ob_hash,'view_storage');
}
do { do {
$r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra", $r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra",
dbesc($hash), dbesc($hash),

4
include/conversation.php
View File

@ -755,8 +755,8 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
'forged' => $forged, 'forged' => $forged,
'txt_cats' => t('Categories:'), 'txt_cats' => t('Categories:'),
'txt_folders' => t('Filed under:'), 'txt_folders' => t('Filed under:'),
'has_cats' => ((count($body['categories'])) ? 'true' : ''), 'has_cats' => (($body['categories']) ? 'true' : ''),
'has_folders' => ((count($body['folders'])) ? 'true' : ''), 'has_folders' => (($body['folders']) ? 'true' : ''),
'text' => strip_tags($body['html']), 'text' => strip_tags($body['html']),
'ago' => relative_date($item['created']), 'ago' => relative_date($item['created']),
'app' => $item['app'], 'app' => $item['app'],

10
include/nav.php
View File

@ -176,13 +176,15 @@ EOT;
} }
$my_url = get_my_url();
$homelink = get_my_url(); if(! $my_url) {
if(! $homelink) {
$observer = App::get_observer(); $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) { if(! $is_owner) {
$nav['rusermenu'] = array( $nav['rusermenu'] = array(
$homelink, $homelink,

3010
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff

4
view/css/mod_cloud.css
View File

@ -21,6 +21,10 @@
padding: 7px 3px 7px 10px; padding: 7px 3px 7px 10px;
} }
#cloud-index td:nth-child(2){
word-break: break-all;
}
#cloud-index th:nth-child(8), #cloud-index th:nth-child(8),
#cloud-index td:nth-child(8){ #cloud-index td:nth-child(8){
padding: 7px 3px; padding: 7px 3px;

10
view/theme/redbasic/css/style.css
View File

@ -1802,12 +1802,6 @@ dl.bb-dl > dd > li {
overflow: hidden; overflow: hidden;
} }
#cloud-index { .caption-visible {
width: 100%; max-height: 75%;
table-layout: fixed;
} }
#cloud-index td {
width: auto;
overflow: hidden;
}

10
view/tpl/cloud_directory.tpl
View File

@ -39,12 +39,12 @@
{{else}} {{else}}
<table id="cloud-index"> <table id="cloud-index">
<tr> <tr>
<th width="4%"></th> <th width="1%"></th>
<th width="47%">{{$name}}</th> <th width="92%">{{$name}}</th>
<th width="4%"></th><th width="4%"></th><th width="4%"></th><th width="4%"></th> <th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th>
<th width="1%">{{*{{$type}}*}}</th> <th width="1%">{{*{{$type}}*}}</th>
<th width="10%" class="d-none d-md-table-cell">{{$size}}</th> <th width="1%" 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">{{$lastmod}}</th>
</tr> </tr>
{{if $parentpath}} {{if $parentpath}}
<tr> <tr>