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

js/main.js

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

object/Item.php

@@ -287,22 +287,24 @@ class Item extends BaseObject {
 		}
 
 		// 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"]);
 			$tagger = '';
 		}
 
-		if (($item["item_network"] == "feed") AND isset($buttons["like"]))
+		if (($item["item_network"] == NETWORK_FEED) AND isset($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"]);
 
-		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"]);
 
 		// 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"]);
 
 

view/theme/frost-mobile/templates/head.tpl

@@ -4,6 +4,7 @@
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
 <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" />