Merge remote-tracking branch 'upstream/develop' into 1701-performance

boot.php

@@ -245,6 +245,7 @@ define ( 'NETWORK_STATUSNET',        'stac');    // Statusnet connector
 define ( 'NETWORK_APPNET',           'apdn');    // app.net
 define ( 'NETWORK_NEWS',             'nntp');    // Network News Transfer Protocol
 define ( 'NETWORK_ICALENDAR',        'ical');    // iCalendar
+define ( 'NETWORK_PNUT',             'pnut');    // pnut.io
 define ( 'NETWORK_PHANTOM',          'unkn');    // Place holder
 /** @}*/
 
@@ -274,6 +275,7 @@ $netgroup_ids = array(
 	NETWORK_APPNET    => (-17),
 	NETWORK_NEWS      => (-18),
 	NETWORK_ICALENDAR => (-19),
+	NETWORK_PNUT      => (-20),
 
 	NETWORK_PHANTOM  => (-127),
 );

htconfig.php

@@ -26,6 +26,10 @@ $a->config['system']['db_charset'] = "utf8mb4";
 
 $default_timezone = 'America/Los_Angeles';
 
+// Default system language
+
+$a->config['system']['language'] = 'en';
+
 // What is your site name?
 
 $a->config['sitename'] = "Friendica Social Network";
@@ -60,9 +64,16 @@ $a->config['php_path'] = 'php';
 
 $a->config['system']['huburl'] = '[internal]';
 
+// Server-to-server private message encryption (RINO) is allowed by default.
+// Encryption will only be provided if this setting is set to a non zero
+// value and the PHP mcrypt extension is installed on both systems
+// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt
+
+$a->config['system']['rino_encrypt'] = 2;
+
 // allowed themes (change this from admin panel after installation)
 
-$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero';
+$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly';
 
 // default system theme
 

include/contact_selectors.php

@@ -89,6 +89,7 @@ function network_to_name($s, $profile = "") {
 		NETWORK_TWITTER  => t('Twitter'),
 		NETWORK_DIASPORA2 => t('Diaspora Connector'),
 		NETWORK_STATUSNET => t('GNU Social'),
+		NETWORK_PNUT      => t('pnut'),
 		NETWORK_APPNET => t('App.net')
 	);
 

include/contact_widgets.php

@@ -66,6 +66,9 @@ function unavailable_networks() {
 	if (!get_config("system","diaspora_enabled"))
 		$networks[] = NETWORK_DIASPORA;
 
+	if (!plugin_enabled("pnut"))
+		$networks[] = NETWORK_PNUT;
+
 	if (!sizeof($networks))
 		return "";
 

view/templates/htconfig.tpl

@@ -80,8 +80,9 @@ $a->config['system']['maximagesize'] = 800000;
 $a->config['system']['huburl'] = '[internal]';
 
 // Server-to-server private message encryption (RINO) is allowed by default.
-// Encryption will only be provided if this setting is true and the
+// Encryption will only be provided if this setting is set to a non zero
-// PHP mcrypt extension is installed on both systems
+// value and the PHP mcrypt extension is installed on both systems
+// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt
 
 $a->config['system']['rino_encrypt'] = {{$rino}};
 

view/theme/frio/css/style.css

@@ -1719,6 +1719,12 @@ img.acpopup-img {
 
 }
 /* Menubar Tabs */
+section > ul.tabbar {
+/* The tabbar shouldn't' be visibile inside
+the section element. Only after we have
+moved it to the nav through js */
+    display: none !important;
+}
 #tabmenu,
 .tabbar,
 .tabbar > li {

view/theme/frio/js/theme.js

@@ -40,9 +40,7 @@ $(document).ready(function(){
 	$(".field.select > select, .field.custom > select").addClass("form-control");
 
 	// move the tabbar to the second nav bar
-	if( $("ul.tabbar").length ) {
+	$("section ul.tabbar").first().appendTo("#topbar-second > .container > #tabmenu");
-		$("ul.tabbar").appendTo("#topbar-second > .container > #tabmenu");
-	}
 
 	// add mask css url to the logo-img container
 	//

view/theme/frio/templates/contacts-template.tpl

@@ -1,8 +1,8 @@
 
+{{$tabs}}
+
 <div id="contacts" class="generic-page-wrapper">
 
-	{{$tabs}}
-
 	{{* The page heading with it's contacts counter *}}
 	<h2 class="heading">{{$header}} {{if $total}} ({{$total}}) {{/if}}</h2>
 

view/theme/vier/dark.css

@@ -8,6 +8,9 @@ hr { background-color: #343434 !important; }
 a, .wall-item-name, .fakelink { 
 	color: #989898 !important; 
 }
+.wall-item-content a {
+	        font-weight: bold;
+}
 .btn, .btn:hover{
 	color: #989898;
 	border: 2px solid #0C1116;