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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Haakon Meland Eriksen 2015-12-05 11:26:07 +01:00
commit 7119976199
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot.php
View File

@ -48,7 +48,7 @@ require_once('include/AccessList.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'STD_VERSION', '0.11.1' ); define ( 'STD_VERSION', '1.0' );
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1160 ); define ( 'DB_UPDATE_VERSION', 1160 );
@ -84,8 +84,8 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://hubzilla.site', 'https://hubzilla.site',
'https://red.zottel.red', 'https://red.zottel.red',
'https://gravizot.de', 'https://gravizot.de',
'https://blablanet.com', 'https://my.federated.social',
'https://my.federated.social' 'https://hubzilla.nl'
); );

10
include/network.php
View File

@ -1764,12 +1764,14 @@ function get_site_info() {
$site_name = get_config('system','sitename'); $site_name = get_config('system','sitename');
if(! get_config('system','hidden_version_siteinfo')) { if(! get_config('system','hidden_version_siteinfo')) {
$version = RED_VERSION; $version = RED_VERSION;
$tag = get_std_version();
if(@is_dir('.git') && function_exists('shell_exec')) { if(@is_dir('.git') && function_exists('shell_exec')) {
$commit = trim( @shell_exec('git log -1 --format="%h"')); $commit = trim( @shell_exec('git log -1 --format="%h"'));
if(! get_config('system','hidden_tag_siteinfo')) // if(! get_config('system','hidden_tag_siteinfo'))
$tag = trim( @shell_exec('git describe --tags --abbrev=0')); // $tag = trim( @shell_exec('git describe --tags --abbrev=0'));
else // else
$tag = ''; // $tag = '';
} }
if(! isset($commit) || strlen($commit) > 16) if(! isset($commit) || strlen($commit) > 16)
$commit = ''; $commit = '';

2
include/widgets.php
View File

@ -1148,7 +1148,7 @@ function widget_forums($arr) {
foreach($r1 as $rr) { foreach($r1 as $rr) {
if($unseen && (! intval($rr['unseen']))) if($unseen && (! intval($rr['unseen'])))
continue; continue;
$o .= '<li><span class="pull-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><a href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><img src="' . $rr['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rr['xchan_name'] . '</a></li>'; $o .= '<li><a href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge pull-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img src="' . $rr['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rr['xchan_name'] . '</a></li>';
} }
$o .= '</ul></div>'; $o .= '</ul></div>';
} }

2
mod/invite.php
View File

@ -51,7 +51,7 @@ function invite_post(&$a) {
} }
if($invonly && ($x || is_site_admin())) { if($invonly && ($x || is_site_admin())) {
$code = autoname(8) . srand(1000,9999); $code = autoname(8) . rand(1000,9999);
$nmessage = str_replace('$invite_code',$code,$message); $nmessage = str_replace('$invite_code',$code,$message);
$r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ", $r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",

4
mod/siteinfo.php
View File

@ -1,8 +1,6 @@
<?php <?php
function siteinfo_init(&$a) { function siteinfo_init(&$a) {
if (argv(1) === 'json') { if (argv(1) === 'json') {
$data = get_site_info(); $data = get_site_info();
json_return_and_die($data); json_return_and_die($data);
@ -17,7 +15,7 @@ function siteinfo_content(&$a) {
$version = sprintf( t('Version %s'), RED_VERSION ); $version = sprintf( t('Version %s'), RED_VERSION );
if(@is_dir('.git') && function_exists('shell_exec')) { if(@is_dir('.git') && function_exists('shell_exec')) {
$commit = @shell_exec('git log -1 --format="%h"'); $commit = @shell_exec('git log -1 --format="%h"');
$tag = @shell_exec('git describe --tags --abbrev=0'); $tag = get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
} }
if(! isset($commit) || strlen($commit) > 16) if(! isset($commit) || strlen($commit) > 16)
$commit = ''; $commit = '';

2
version.inc
View File

@ -1 +1 @@
2015-12-02.1234 2015-12-03.1235

4
view/css/mod_mail.css
View File

@ -25,6 +25,10 @@
margin: 15px; margin: 15px;
} }
#prvmail-text {
height: 20.0em;
}
.mail-conv-outside-wrapper { .mail-conv-outside-wrapper {
margin-bottom: 20px; margin-bottom: 20px;
} }