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

3 files changed, 15 insertions, 8 deletions

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 697b57b6a..a7b4f28e8 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -804,6 +804,8 @@ class Enotify {
 			'when' => relative_date($item['created']), 
 			'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'),
 			'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
+			'notify_id' => 'undefined',
+			'thread_top' => (($item['item_thread_top']) ? true : false),
 			'message' => strip_tags(bbcode($itemem_text))
 		);
 
diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php
index 296dab708..4d1cc4cda 100644
--- a/Zotlabs/Module/File_upload.php
+++ b/Zotlabs/Module/File_upload.php
@@ -10,7 +10,8 @@ class File_upload extends \Zotlabs\Web\Controller {
 
 	function post() {
 
-		// logger('file upload: ' . print_r($_REQUEST,true));
+		logger('file upload: ' . print_r($_REQUEST,true));
+		logger('file upload: ' . print_r($_FILES,true));
 	
 		$channel = (($_REQUEST['channick']) ? channelx_by_nick($_REQUEST['channick']) : null);
 	
@@ -56,13 +57,14 @@ class File_upload extends \Zotlabs\Web\Controller {
 			if(array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) {
 				$pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches);
 				if($pm) {
-					// logger('Content-Range: ' . print_r($matches,true));
+					logger('Content-Range: ' . print_r($matches,true));
 					$partial = true;
 				}
 			}
 
 			if($partial) {
 				$x = save_chunk($channel,$matches[1],$matches[2],$matches[3]);
+
 				if($x['partial']) {
 					header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
 					json_return_and_die($result);
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index 191f2afb6..450d3565e 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -20,8 +20,10 @@ class Notifications {
 					'label' => t('View your network activity')
 				],
 				'markall' => [
-					'url' => '#',
 					'label' => t('Mark all notifications read')
+				],
+				'filter' => [
+					'label' => t('Show new posts only')
 				]
 			];
 
@@ -36,8 +38,10 @@ class Notifications {
 					'label' => t('View your home activity')
 				],
 				'markall' => [
-					'url' => '#',
 					'label' => t('Mark all notifications seen')
+				],
+				'filter' => [
+					'label' => t('Show new posts only')
 				]
 			];
 
@@ -52,7 +56,6 @@ class Notifications {
 					'label' => t('View your private mails')
 				],
 				'markall' => [
-					'url' => '#',
 					'label' => t('Mark all messages seen')
 				]
 			];
@@ -68,7 +71,6 @@ class Notifications {
 					'label' => t('View events')
 				],
 				'markall' => [
-					'url' => '#',
 					'label' => t('Mark all events seen')
 				]
 			];
@@ -104,7 +106,6 @@ class Notifications {
 					'label' => t('View all notices')
 				],
 				'markall' => [
-					'url' => '#',
 					'label' => t('Mark all notices seen')
 				]
 			];
@@ -132,8 +133,10 @@ class Notifications {
 					'label' => t('View the public stream')
 				],
 				'markall' => [
-					'url' => '#',
 					'label' => t('Mark all notifications seen')
+				],
+				'filter' => [
+					'label' => t('Show new posts only')
 				]
 			];
 		}