mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1503-load-issues

Browse source
This commit is contained in:
Michael Vogel 2015-04-09 19:48:10 +02:00
parent 5e2c93e80c e955f013ca
commit 12c034f4cb
9 changed files with 21952 additions and 21766 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/main.js
View file

@ -192,7 +192,7 @@
// TODO (yet unsupported by most browsers): // TODO (yet unsupported by most browsers):
// Implement notification.onclick() // Implement notification.onclick()
notifyMarkAll(); // notifyMarkAll();
} }
}); });

12
object/Item.php
View file

@ -287,22 +287,24 @@ class Item extends BaseObject {
} }
// Disable features that aren't available in several networks // Disable features that aren't available in several networks
if (($item["item_network"] != "dfrn") AND isset($buttons["dislike"])) { if (($item["item_network"] != NETWORK_DFRN) AND isset($buttons["dislike"])) {
unset($buttons["dislike"]); unset($buttons["dislike"]);
$tagger = ''; $tagger = '';
} }
if (($item["item_network"] == "feed") AND isset($buttons["like"])) if (($item["item_network"] == NETWORK_FEED) AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);
if (($item["item_network"] == "mail") AND isset($buttons["like"])) if (($item["item_network"] == NETWORK_MAIL) AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);
if (($item["item_network"] == "dspr") AND ($indent == 'comment') AND isset($buttons["like"])) // Diaspora isn't able to do likes on comments - but red does
if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND
!strstr($item["owner-link"], "/channel/") AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);
// Facebook can like comments - but it isn't programmed in the connector yet. // Facebook can like comments - but it isn't programmed in the connector yet.
if (($item["item_network"] == "face") AND ($indent == 'comment') AND isset($buttons["like"])) if (($item["item_network"] == NETWORK_FACEBOOK) AND ($indent == 'comment') AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);

11830
view/cs/messages.po
View file

File diff suppressed because it is too large Load diff

2755
view/cs/strings.php
View file

File diff suppressed because it is too large Load diff

11822
view/de/messages.po
View file

File diff suppressed because it is too large Load diff

2737
view/de/strings.php
View file

File diff suppressed because it is too large Load diff

11822
view/fr/messages.po
View file

File diff suppressed because it is too large Load diff

2737
view/fr/strings.php
View file

File diff suppressed because it is too large Load diff

1
view/theme/frost-mobile/templates/head.tpl
View file

@ -4,6 +4,7 @@
<base href="{{$baseurl}}/" /> <base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" /> <meta name="generator" content="{{$generator}}" />
<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
<script type="text/javascript" src="{{$baseurl}}/js/jquery.js"></script>
<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" /> <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />