From 5480b45368978d49c4e79cbe8d13c2e3b8a035ec Mon Sep 17 00:00:00 2001 From: NodeBB Misty Date: Sat, 2 Apr 2016 09:02:22 -0400 Subject: [PATCH 1/7] Latest translations and fallbacks --- public/language/nl/global.json | 2 +- public/language/nl/topic.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/nl/global.json b/public/language/nl/global.json index d1dc94a360..dfa27b416f 100644 --- a/public/language/nl/global.json +++ b/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", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index 90f6f2be90..5bff87a78c 100644 --- a/public/language/nl/topic.json +++ b/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." } \ No newline at end of file From cdbe535e13557d57b37b84ad59c449e4fbbada04 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 4 Apr 2016 11:58:55 -0400 Subject: [PATCH 2/7] closes #4491 --- public/language/en_GB/error.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index e9a4cbea7d..65e2c584df 100644 --- a/public/language/en_GB/error.json +++ b/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", From 50ae2305b09f2c88290999cc781bd747c5178c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 5 Apr 2016 19:51:39 +0300 Subject: [PATCH 3/7] up emoji add apple --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b1a5794ac..6956893567 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,8 @@ "nconf": "~0.8.2", "nodebb-plugin-composer-default": "3.0.18", "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", From 04fb7d5acc5872ad9e5ec54a2ccda9262ab33583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 5 Apr 2016 21:01:13 +0300 Subject: [PATCH 4/7] enable emoji-apple on install --- src/install.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/install.js b/src/install.js index 846f6f9050..aae92e5c23 100644 --- a/src/install.js +++ b/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'); From f406119fa1dd60a3fdbdea4630f2f05b961b77d9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 5 Apr 2016 16:20:16 -0400 Subject: [PATCH 5/7] upped composer version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6956893567..53958971bd 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "mongodb": "~2.1.3", "morgan": "^1.3.2", "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-apple": "1.0.3", "nodebb-plugin-emoji-extended": "1.0.5", From 053bbc06fa0c0df3726905feddc69f3ce629f04c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 5 Apr 2016 20:07:55 -0400 Subject: [PATCH 6/7] fixes apapadimoulis/what-bugs#84 closes #4496 --- public/src/client/topic/posts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 696b2f51ec..b79067ec3b 100644 --- a/public/src/client/topic/posts.js +++ b/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'); From bf73c0de5f028f04882e8522045cb3f8ef5d4c94 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 5 Apr 2016 21:34:53 -0400 Subject: [PATCH 7/7] closes #3286 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 53958971bd..f00ed4dcac 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,8 @@ "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",