Merge https://github.com/friendica/friendica into pull

boot.php

@@ -14,7 +14,7 @@ require_once('include/features.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.1.1619' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1162      );
+define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 

update.php

@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1162 );
+define( 'UPDATE_VERSION' , 1163 );
 
 /**
  *
@@ -1409,9 +1409,6 @@ function update_1159() {
 	if(!$r)
 		return UPDATE_FAILED;
 
-	require_once('include/tags.php');
-	update_items();
-
 	return UPDATE_SUCCESS;
 }
 
@@ -1439,3 +1436,8 @@ function update_1161() {
 
 	return UPDATE_SUCCESS;
 }
+
+function update_1162() {
+	require_once('include/tags.php');
+	update_items();
+}

view/theme/quattro/dark/style.css

@@ -648,26 +648,34 @@ ul.menu-popup .toolbar a:hover {
   background-color: #ffffff;
 }
 /* autocomplete popup */
+.autocomplete,
 .acpopup {
   max-height: 150px;
   background-color: #ffffff;
   color: #2d2d2d;
-  border: 1px solid #MenuBorder;
+  border: 1px solid #364e59;
   overflow: auto;
   z-index: 100000;
   -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
+.autocomplete > div,
 .acpopupitem {
   color: #2d2d2d;
   padding: 4px;
   clear: left;
+  overflow: auto;
+  height: auto;
 }
+.autocomplete > div img,
 .acpopupitem img {
   float: left;
   margin-right: 4px;
+  width: 16px !important;
+  height: 16px !important;
 }
+.autocomplete > div.selected,
 .acpopupitem.selected {
   background-color: #bdcdd4;
 }
@@ -983,7 +991,7 @@ section {
   word-wrap: break-word;
 }
 .wall-item-container .wall-item-content img {
-  max-width: 710px;
+  max-width: 700px;
 }
 .wall-item-container .wall-item-links,
 .wall-item-container .wall-item-actions {

view/theme/quattro/green/style.css

@@ -648,26 +648,34 @@ ul.menu-popup .toolbar a:hover {
   background-color: #ffffff;
 }
 /* autocomplete popup */
+.autocomplete,
 .acpopup {
   max-height: 150px;
   background-color: #ffffff;
   color: #2d2d2d;
-  border: 1px solid #MenuBorder;
+  border: 1px solid #364e59;
   overflow: auto;
   z-index: 100000;
   -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
+.autocomplete > div,
 .acpopupitem {
   color: #2d2d2d;
   padding: 4px;
   clear: left;
+  overflow: auto;
+  height: auto;
 }
+.autocomplete > div img,
 .acpopupitem img {
   float: left;
   margin-right: 4px;
+  width: 16px !important;
+  height: 16px !important;
 }
+.autocomplete > div.selected,
 .acpopupitem.selected {
   background-color: #ccff42;
 }
@@ -983,7 +991,7 @@ section {
   word-wrap: break-word;
 }
 .wall-item-container .wall-item-content img {
-  max-width: 710px;
+  max-width: 700px;
 }
 .wall-item-container .wall-item-links,
 .wall-item-container .wall-item-actions {

view/theme/quattro/lilac/style.css

@@ -648,26 +648,34 @@ ul.menu-popup .toolbar a:hover {
   background-color: #ffffff;
 }
 /* autocomplete popup */
+.autocomplete,
 .acpopup {
   max-height: 150px;
   background-color: #ffffff;
   color: #2d2d2d;
-  border: 1px solid #MenuBorder;
+  border: 1px solid #364e59;
   overflow: auto;
   z-index: 100000;
   -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
+.autocomplete > div,
 .acpopupitem {
   color: #2d2d2d;
   padding: 4px;
   clear: left;
+  overflow: auto;
+  height: auto;
 }
+.autocomplete > div img,
 .acpopupitem img {
   float: left;
   margin-right: 4px;
+  width: 16px !important;
+  height: 16px !important;
 }
+.autocomplete > div.selected,
 .acpopupitem.selected {
   background-color: #c0a3c7;
 }
@@ -983,7 +991,7 @@ section {
   word-wrap: break-word;
 }
 .wall-item-container .wall-item-content img {
-  max-width: 710px;
+  max-width: 700px;
 }
 .wall-item-container .wall-item-links,
 .wall-item-container .wall-item-actions {

view/theme/quattro/prv_message.tpl

@@ -7,7 +7,12 @@
 $parent
 
 <div id="prvmail-to-label">$to</div>
+{{ if $showinputs }}
+<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="$preid">
+{{ else }}
 $select
+{{ endif }}
 
 <div id="prvmail-subject-label">$subject</div>
 <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />

view/theme/quattro/quattro.less

@@ -254,21 +254,27 @@ ul.menu-popup {
 }
 
 /* autocomplete popup */
+.autocomplete,
 .acpopup {
 	max-height:150px;
 	background-color:@MenuBg;
 	color: @Menu;
-	border:1px solid #MenuBorder;
+	border:1px solid @MenuBorder;
 	overflow:auto;
 	z-index:100000;
 	.shadow();
 }
+.autocomplete > div, 
 .acpopupitem {
 	color: @MenuItem; padding: 4px;
 	clear:left;
+	overflow: auto;
+	height: auto;
 	img {
 		float: left;
 		margin-right: 4px;
+		width: 16px !important;
+		height: 16px !important;
 	}
 	&.selected{
 		background-color: @MenuItemHoverBg;
@@ -484,7 +490,7 @@ section {
 		max-width: 720px;
 		word-wrap: break-word;
 	}
-	.wall-item-content img { max-width: 710px; }
+	.wall-item-content img { max-width: 700px; }
 	.wall-item-links,
 	.wall-item-actions { 
 		display: table-cell;