Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

9 files changed, 28 insertions, 18 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 472dad3e6..62645b2b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
-Hubzilla 3.4 (????-??-??)
+Hubzilla 3.4 (2018-05-04)
+	- Provide warnings about profile photo and cover photo permissions
+	- Don't duplicate addressbook entries on repeated channel imports
+	- Where possible strip zid parameter from links that get pasted into posts so that they will get a correct zid when rendered
 	- Rename boxy schema to Focus-Boxy
 	- Rename BS-Default schema to Focus-Light
 	- Mark simple_* schemas unmaintained and deprecated - they will be removed in next release if nobody steps up to maintain them.
@@ -54,6 +57,7 @@ Hubzilla 3.4 (????-??-??)
 	- Fix pending registrations visible in admin accounts
 
 	Addons
+	Pubcrawl: fix issues with "private" messages
 	Pubcrawl: fix issues with postgresql
 	Fuzzloc: new addon to blur your browser location
 	Pubcrawl: implement follow by webfinger
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 7dc8eb1bc..322a3933c 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -95,7 +95,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 						$owner['channel_deny_gid'])
 						? 'lock' : 'unlock'
 					),
-					'acl' => populate_acl($owner_acl),
+					'acl' => populate_acl($owner_acl, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_wiki')),
 					'allow_cid' => acl2json($owner_acl['allow_cid']),
 					'allow_gid' => acl2json($owner_acl['allow_gid']),
 					'deny_cid'  => acl2json($owner_acl['deny_cid']),
diff --git a/boot.php b/boot.php
index 40b38985b..e493ef34b 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.5.2' );
+define ( 'STD_VERSION',             '3.5.3' );
 define ( 'ZOT_REVISION',            '6.0a' );
 
 
@@ -81,7 +81,7 @@ define ( 'DIRECTORY_MODE_STANDALONE',  0x0100); // A detached (off the grid) hub
 // point to go out and find the rest of the world.
 
 define ( 'DIRECTORY_REALM',            'RED_GLOBAL');
-define ( 'DIRECTORY_FALLBACK_MASTER',  'https://gravizot.de');
+define ( 'DIRECTORY_FALLBACK_MASTER',  'https://zotadel.net');
 
 $DIRECTORY_FALLBACK_SERVERS = array(
 	'https://hubzilla.zottel.net',
diff --git a/include/network.php b/include/network.php
index 8b7490a8a..26ed24de2 100644
--- a/include/network.php
+++ b/include/network.php
@@ -2052,4 +2052,4 @@ function jsonld_document_loader($url) {
 	}
 
 	return [];
-}
\ No newline at end of file
+}
diff --git a/include/text.php b/include/text.php
index c7417a19b..5be44c3cb 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2559,6 +2559,8 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i
 				$basetag = substr($tag,7);
 				$basetag = substr($basetag,0,-6);
 			}
+			else
+				$basetag = substr($tag,1);
 
 			//create text for link
 
@@ -2587,6 +2589,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i
 			'url'      => $url,
 			'contact'  => $r[0]
 		];
+
 	}
 
 	//is it a person tag?
@@ -3334,4 +3337,4 @@ function unique_multidim_array($array, $key) {
         $i++;
     }
     return $temp_array;
-} 
\ No newline at end of file
+} 
diff --git a/install/sample-nginx.conf b/install/sample-nginx.conf
index 4121ff2ec..839f208ae 100644
--- a/install/sample-nginx.conf
+++ b/install/sample-nginx.conf
@@ -73,29 +73,32 @@ server {
   client_max_body_size 20m;
   client_body_buffer_size 128k;
 
+  include mime.types;
+
   # rewrite to front controller as default rule
   location / {
-    if ($is_args != "") {
-        rewrite ^/(.*) /index.php?q=$uri&$args last;
+    if (!-e $request_filename) {
+      rewrite ^(.*)$ /index.php?q=$1;
     }
-    rewrite ^/(.*) /index.php?q=$uri last;
   }
 
   # make sure webfinger and other well known services aren't blocked
   # by denying dot files and rewrite request to the front controller
   location ^~ /.well-known/ {
     allow all;
-    rewrite ^/(.*) /index.php?q=$uri&$args last;
+    if (!-e $request_filename) {
+      rewrite ^(.*)$ /index.php?q=$1;
+    }
   }
 
   # statically serve these file types when possible
   # otherwise fall back to front controller
   # allow browser to cache them
   # added .htm for advanced source code editor library
-  location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ {
-    expires 30d;
-    try_files $uri /index.php?q=$uri&$args;
-  }
+  # location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ {
+  #  expires 30d;
+  #  try_files $uri /index.php?q=$uri&$args;
+  # }
 
   # block these file types
   location ~* \.(tpl|md|tgz|log|out)$ {
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css
index e0b02b414..998b932db 100644
--- a/view/css/mod_wiki.css
+++ b/view/css/mod_wiki.css
@@ -33,7 +33,7 @@
 	width: 100%;
 }
 
-td i {
+td > i {
 	padding: 7px 5px;
 	cursor: pointer;
 }
@@ -68,4 +68,4 @@ code {
 
 #wiki-content-container code {
 	background: #F5F5F5;
-}
\ No newline at end of file
+}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index f954e1d7c..f72737d82 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -31,7 +31,7 @@
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
 							<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}"  data-toggle="dropdown" />
 							{{if $item.thread_author_menu}}
-							<i class="fa fa-caret-down wall-item-photo-caret" data-toggle="dropdown"></i>
+							<i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i>
 							<div class="dropdown-menu">
 								{{foreach $item.thread_author_menu as $mitem}}
 								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index f94a2f24f..c6da3d8a4 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -31,7 +31,7 @@
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
 							<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /></a>
 							{{if $item.thread_author_menu}}
-							<i class="fa fa-caret-down wall-item-photo-caret"></i>
+							<i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i>
 							<div class="dropdown-menu">
 								{{foreach $item.thread_author_menu as $mitem}}
 								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>