From 858feb5ac05f9a4dbee71b5fb094e0d8c46c1314 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 23 Sep 2015 08:10:01 +0930 Subject: [PATCH 1/4] Vendor prefix badge shadow --- less/lib/Badge.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/lib/Badge.less b/less/lib/Badge.less index 1864d80d6..7e96aabbd 100755 --- a/less/lib/Badge.less +++ b/less/lib/Badge.less @@ -6,7 +6,7 @@ display: inline-block; vertical-align: middle; text-align: center; - box-shadow: 0 2px 6px @shadow-color; + .box-shadow(0 2px 6px @shadow-color); .Badge-label { display: none; From 273461040c12f0a340e2ddb2ea4e31668e7c4b9f Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 23 Sep 2015 10:51:32 +0930 Subject: [PATCH 2/4] Update local copy of notification when marking as read --- src/Core/Notifications/Commands/ReadNotificationHandler.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Core/Notifications/Commands/ReadNotificationHandler.php b/src/Core/Notifications/Commands/ReadNotificationHandler.php index 1a84131aa..fe2ac8698 100644 --- a/src/Core/Notifications/Commands/ReadNotificationHandler.php +++ b/src/Core/Notifications/Commands/ReadNotificationHandler.php @@ -38,6 +38,8 @@ class ReadNotificationHandler ]) ->update(['is_read' => true]); + $notification->is_read = true; + return $notification; } } From 69a50565bb74191019ebd0e777fffc26f40f43fb Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 23 Sep 2015 10:51:49 +0930 Subject: [PATCH 3/4] Don't catch JS error in debug mode --- views/app.blade.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/views/app.blade.php b/views/app.blade.php index 7d3957170..0f566a9c0 100644 --- a/views/app.blade.php +++ b/views/app.blade.php @@ -27,7 +27,9 @@ @endforeach @endif From a0267d9515d995be3cdf393f00058be18cbb1337 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 23 Sep 2015 12:22:37 +0930 Subject: [PATCH 4/4] Add extra check to make sure post has been fully loaded Ref #295 --- js/forum/src/components/PostStream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/forum/src/components/PostStream.js b/js/forum/src/components/PostStream.js index ea0a97a72..394add1e7 100644 --- a/js/forum/src/components/PostStream.js +++ b/js/forum/src/components/PostStream.js @@ -181,7 +181,7 @@ class PostStream extends mixin(Component, evented) { .map(id => { const post = app.store.getById('posts', id); - return post && post.discussion() && post.user() !== false ? post : null; + return post && post.discussion() && post.user() !== false && post.canEdit() !== null ? post : null; }); }