Merge branch 'master' into fix-vendors

package.json

@@ -46,17 +46,18 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.18",
+    "nodebb-plugin-composer-default": "3.0.19",
     "nodebb-plugin-dbsearch": "1.0.1",
-    "nodebb-plugin-emoji-extended": "1.0.3",
+    "nodebb-plugin-emoji-apple": "1.0.3",
+    "nodebb-plugin-emoji-extended": "1.0.5",
     "nodebb-plugin-markdown": "5.0.1",
     "nodebb-plugin-mentions": "1.0.21",
     "nodebb-plugin-soundpack-default": "0.1.6",
     "nodebb-plugin-spam-be-gone": "0.4.6",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.115",
-    "nodebb-theme-vanilla": "5.0.61",
+    "nodebb-theme-persona": "4.0.117",
+    "nodebb-theme-vanilla": "5.0.62",
     "nodebb-widget-essentials": "2.0.9",
     "nodemailer": "2.0.0",
     "nodemailer-sendmail-transport": "1.0.0",

public/language/en_GB/error.json

@@ -109,6 +109,7 @@
 	"cant-remove-last-user": "You can't remove the last user",
 	"cant-delete-chat-message": "You are not allowed to delete this message",
 
+	"already-voting-for-this-post": "You have already voted for this post.",
 	"reputation-system-disabled": "Reputation system is disabled.",
 	"downvoting-disabled": "Downvoting is disabled",
 	"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",

public/language/nl/global.json

@@ -52,7 +52,7 @@
     "best": "Beste",
     "upvoted": "Omhoog gestemd",
     "downvoted": "Omlaag gestemd",
-    "views": "Gezien",
+    "views": "Weergaven",
     "reputation": "Reputatie",
     "read_more": "Lees meer",
     "more": "Meer",

public/language/nl/topic.json

@@ -104,9 +104,9 @@
     "stale.title": "Een nieuw onderwerp maken in de plaats?",
     "stale.warning": "Het onderwerp waar je op antwoord is vrij oud. Zou je graag een nieuw onderwerp maken met een referentie naar dit onderwerp in je antwoord?",
     "stale.create": "Maak een nieuw onderwerp",
-    "stale.reply_anyway": "Antwoord toch op dit onderwerp",
+    "stale.reply_anyway": "Reageer toch op dit onderwerp",
     "link_back": "Re: [%1](%2)",
     "spam": "Spam",
-    "offensive": "Onbeleefd",
+    "offensive": "Aanstootgevend",
     "custom-flag-reason": "Geef een reden voor de melding."
 }

public/src/client/topic/posts.js

@@ -304,7 +304,7 @@ define('forum/topic/posts', [
 				});
 
 				image.attr('src', image.attr('data-src'));
-				if (image.parent().attr('href')) {
+				if (image.parent().attr('href') === 'about:blank') {
 					image.parent().attr('href', image.attr('data-src'));
 				}
 				image.removeAttr('data-src');

src/install.js

@@ -440,7 +440,8 @@ function enableDefaultPlugins(next) {
 			'nodebb-widget-essentials',
 			'nodebb-rewards-essentials',
 			'nodebb-plugin-soundpack-default',
-			'nodebb-plugin-emoji-extended'
+			'nodebb-plugin-emoji-extended',
+			'nodebb-plugin-emoji-apple'
 		],
 		customDefaults = nconf.get('defaultPlugins');