Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
This commit is contained in:
commit
1cc5d08def
3
boot.php
3
boot.php
|
@ -1125,15 +1125,12 @@ class App {
|
|||
$backend[] = "_well_known";
|
||||
$backend[] = "api";
|
||||
$backend[] = "dfrn_notify";
|
||||
$backend[] = "dfrn_poll";
|
||||
$backend[] = "fetch";
|
||||
$backend[] = "hcard";
|
||||
$backend[] = "hostxrd";
|
||||
$backend[] = "nodeinfo";
|
||||
$backend[] = "noscrape";
|
||||
$backend[] = "p";
|
||||
$backend[] = "photo";
|
||||
$backend[] = "photos";
|
||||
$backend[] = "poco";
|
||||
$backend[] = "post";
|
||||
$backend[] = "proxy";
|
||||
|
|
|
@ -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 *}}
|
||||
<div class="contact-entry-desc">
|
||||
<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 == '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 *}}
|
||||
|
|
Loading…
Reference in New Issue
Block a user