From b1f4b9759b34249540d81aed724aa023153e2b53 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Mon, 30 Nov 2015 07:49:56 -0500 Subject: Abort addon update if repo does not exist --- util/update_addon_repo | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/update_addon_repo b/util/update_addon_repo index 5b531e6a5..ba1862f4b 100755 --- a/util/update_addon_repo +++ b/util/update_addon_repo @@ -7,7 +7,12 @@ if [ $# -ne 1 ]; then exit 1 fi -cd extend/addon/$1 +if [ -d extend/addon/$1 ] ; then + cd extend/addon/$1 +else + echo "$1 not found. Aborting..." + exit 1 +fi if [ -d .git ] ; then git pull -- cgit v1.2.3 From 706598313e10ed3ce6980c06454a21c03021dcd5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Dec 2015 13:18:08 +0100 Subject: make narrow navbar setting work again --- view/theme/redbasic/css/narrow_navbar.css | 2 +- view/theme/redbasic/css/style.css | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index f403fabbf..386218121 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -8,7 +8,7 @@ min-height:25px !important; } - nav img { + nav .navbar-header img { height: 30px; width: 30px; margin-top: 1px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e392f00d9..1c7e7579a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1991,8 +1991,6 @@ nav .badge.mail-update:hover { #tabs-collapse-1 { padding: 0px; margin-bottom: 25px; - border-top: none; - box-shadow: none; } .btn { -- cgit v1.2.3 From 78e18fcdcfaa879db1d7bf487c2e5de0e43e34b0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 1 Dec 2015 13:28:50 +0100 Subject: fix badge padding in narrow navbar --- view/theme/redbasic/css/narrow_navbar.css | 1 - view/theme/redbasic/css/style.css | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index 386218121..9d14beb33 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -49,7 +49,6 @@ top: -31px; float: right; font-size: 10px; - padding: 2px 6px; cursor: pointer; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1c7e7579a..d77262b8b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -786,6 +786,7 @@ a.rateme, div.rateme { #nav-search-text { font-size: 12px; + width: 200px; height: 20px; margin: 15px; padding: 0px 5px 0px 5px; -- cgit v1.2.3 From 1ba74d824bcf69dfb7f4fc5d61bdc4b07b6ec612 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 1 Dec 2015 15:51:15 -0800 Subject: usercache is no longer used --- include/api.php | 7 +++---- version.inc | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/api.php b/include/api.php index f279b2aa3..e60583a01 100644 --- a/include/api.php +++ b/include/api.php @@ -382,7 +382,6 @@ require_once('include/api_auth.php'); function api_item_get_user(&$a, $item) { - global $usercache; // The author is our direct contact, in a conversation with us. @@ -396,11 +395,11 @@ require_once('include/api_auth.php'); $name = $item['author']['xchan_name']; // Generating a random ID - if (is_null($usercache[$nick]) or !array_key_exists($nick, $usercache)) - $usercache[$nick] = mt_rand(2000000, 2100000); + if (! $nick) + $nick = mt_rand(2000000, 2100000); $ret = array( - 'id' => $usercache[$nick], + 'id' => $nick, 'name' => $name, 'screen_name' => $nick, 'location' => '', //$uinfo[0]['default-location'], diff --git a/version.inc b/version.inc index 936c9fe07..9819f1c95 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-30.1232 +2015-12-01.1233 -- cgit v1.2.3 From 25caeee8547df73a7162dc6de30a030fa0bceea8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 1 Dec 2015 20:21:44 -0800 Subject: issue #204 --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 46b396ad2..ef1867c14 100755 --- a/include/items.php +++ b/include/items.php @@ -3474,7 +3474,7 @@ function post_is_importable($item,$abook) { unobscure($item); $text = prepare_text($item['body'],$item['mimetype']); - $text = html2plain($text); + $text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text); $lang = null; -- cgit v1.2.3 From 593423434c0c0e8d1ebb43d97b2dda7e6b4d67bd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 2 Dec 2015 09:44:25 +0100 Subject: fix attachment rendering for mail --- include/message.php | 2 +- mod/mail.php | 3 ++- view/css/mod_mail.css | 4 ++++ view/tpl/mail_conv.tpl | 6 ++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/message.php b/include/message.php index 820d814b6..169f394d9 100644 --- a/include/message.php +++ b/include/message.php @@ -173,7 +173,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' 'revision' => $r['data']['revision'] ); } - $body = str_replace($match[1],'',$body); + $body = trim(str_replace($match[1],'',$body)); } } diff --git a/mod/mail.php b/mod/mail.php index 536149a28..44c4b479d 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -329,7 +329,8 @@ function mail_content(&$a) { 'to_url' => chanlink_hash($message['to_xchan']), 'to_photo' => $message['to']['xchan_photo_s'], 'subject' => $message['title'], - 'body' => smilies(bbcode($message['body']) . $s), + 'body' => smilies(bbcode($message['body'])), + 'attachments' => $s, 'delete' => t('Delete message'), 'dreport' => t('Delivery report'), 'recall' => t('Recall message'), diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css index 5fd646765..1346eecd5 100644 --- a/view/css/mod_mail.css +++ b/view/css/mod_mail.css @@ -24,3 +24,7 @@ #prvmail-rotator { margin: 15px; } + +.mail-conv-outside-wrapper { + margin-bottom: 20px; +} diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 4f54f1a6a..5e5d9808d 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -13,6 +13,12 @@ {{$mail.body}}
+ {{if $mail.attachments}} +
+ + +
+ {{/if}}