clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1607-new-probe

This commit is contained in:
Michael Vogel 2016-07-05 09:49:19 +02:00
parent 585c893456 6e7f7210a8
commit 1cc5d08def
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
View File

@ -1125,15 +1125,12 @@ class App {
$backend[] = "_well_known"; $backend[] = "_well_known";
$backend[] = "api"; $backend[] = "api";
$backend[] = "dfrn_notify"; $backend[] = "dfrn_notify";
$backend[] = "dfrn_poll";
$backend[] = "fetch"; $backend[] = "fetch";
$backend[] = "hcard"; $backend[] = "hcard";
$backend[] = "hostxrd"; $backend[] = "hostxrd";
$backend[] = "nodeinfo"; $backend[] = "nodeinfo";
$backend[] = "noscrape"; $backend[] = "noscrape";
$backend[] = "p"; $backend[] = "p";
$backend[] = "photo";
$backend[] = "photos";
$backend[] = "poco"; $backend[] = "poco";
$backend[] = "post"; $backend[] = "post";
$backend[] = "proxy"; $backend[] = "proxy";

2
view/theme/frio/templates/contact_template.tpl
View File

@ -149,7 +149,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
{{* The contact description (e.g. Name, Network, kind of connection and so on *}} {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
<div class="contact-entry-desc"> <div class="contact-entry-desc">
<div class="contact-entry-name" id="contact-entry-name-{$id}" > <div class="contact-entry-name" id="contact-entry-name-{$id}" >
<h4 class="media-heading"><a href="{url}">{$name}</a> <h4 class="media-heading"><a href="{$url}">{$name}</a>
{if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if} {if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if}
{if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if} {if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if}
{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}} {{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}