Merge remote-tracking branch 'upstream/master'

include/api.php

@@ -742,6 +742,8 @@ require_once('include/api_auth.php');
 		}
 		$user_info = api_get_user($a);
 
+//		logger('status_with_media: ' . print_r($_REQUEST,true), LOGGER_DEBUG);
+
 		$_REQUEST['type'] = 'wall';
 		$_REQUEST['profile_uid'] = api_user();
 		$_REQUEST['api_source'] = true;

include/conversation.php

@@ -1025,7 +1025,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 		if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
 			$name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown'));
 			$url = (($item['author']['xchan_url'] && $item['author']['xchan_photo_s']) 
-				? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="response-photo" src="' . zid($item['author']['xchan_photo_s'])  . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>' 
+				? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="dropdown-menu-img-xs" src="' . zid($item['author']['xchan_photo_s'])  . '" alt="' . urlencode($name) . '" />' . $name . '</a>' 
 				: '<a href="#" class="disabled">' . $name . '</a>'
 			);
 

include/widgets.php

@@ -1229,6 +1229,10 @@ function widget_album($args) {
 	$owner_uid = get_app()->profile_uid;
 	$sql_extra = permissions_sql($owner_uid);
 
+
+	if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage'))
+		return '';
+
 	if($args['album'])
 		$album = $args['album'];
 	if($args['title'])

version.inc

@@ -1 +1 @@
-2015-11-16.1218
+2015-11-17.1219

view/css/bootstrap-red.css

@@ -61,13 +61,6 @@ aside .nav-pills > li > a {
 	padding: 6px 10px;
 }
 
-.dropdown-menu img {
-	float: left;
-	width: 36px;
-	height: 36px;
-	margin-right: 5px;
-}
-
 .dropdown-menu li a {
 	overflow: hidden;
 	text-overflow: ellipsis;

view/css/conversation.css

@@ -246,9 +246,3 @@ a.wall-item-name-link {
 	color: #FF0000;
 	font-size: 1em !important;
 }
-
-.response-photo {
-	height: 18px !important;
-	width: 18px !important;
-}
-

view/js/acl.js

@@ -31,7 +31,7 @@ function ACL(backend_url, preset) {
 			$("#acl-search").keypress(that.on_search);
 
 			/* startup! */
-			that.get(0,100);
+			that.get(0,1000);
 			that.on_submit();
 	});
 }
@@ -60,7 +60,7 @@ ACL.prototype.on_submit = function() {
 ACL.prototype.search = function() {
 	var srcstr = $("#acl-search").val();
 	that.list_content.html("");
-	that.get(0, 100, srcstr);
+	that.get(0, 1000, srcstr);
 };
 
 ACL.prototype.on_search = function(event) {

view/theme/redbasic/css/style.css

@@ -1856,7 +1856,18 @@ nav .dropdown-menu {
 	border-bottom-left-radius: $radiuspx;
 }
 
+.dropdown-menu-img-sm {
+	float: left;
+	width: 36px;
+	height: 36px;
+	margin-right: 5px;
+}
 
+.dropdown-menu-img-xs {
+	height: 18px;
+	width: 18px;
+	margin-right: 5px;
+}
 
 #usermenu-caret {
 	color: $nav_icon_colour;

view/tpl/hdr.tpl

@@ -1,5 +1,5 @@
 <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li>
+	<li class="{5}"><a href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li>
 </ul>

view/tpl/profile_vcard.tpl

@@ -6,7 +6,7 @@
 	<ul class="dropdown-menu" role="menu">
 		{{foreach $profile.menu.entries as $e}}
 		<li>
-			<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
+			<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
 		</li>
 		{{/foreach}}
 		<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>