From 76d2e43948e5efd50bdd9a941738879564b6e09d Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 27 Jul 2017 19:50:44 +0000 Subject: [PATCH 1/6] Incremented version number - v1.5.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f384e74f7b..014bef3d31 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "1.5.2", + "version": "1.5.3", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From f646e08a6ef363dee53172b3aeb933e9117fe543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 27 Jul 2017 19:40:05 -0400 Subject: [PATCH 2/6] update tags/links for 1.5.4 --- src/meta/tags.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meta/tags.js b/src/meta/tags.js index 4224f85dee..3c8b97f3d7 100644 --- a/src/meta/tags.js +++ b/src/meta/tags.js @@ -50,7 +50,7 @@ Tags.parse = function (req, data, meta, link, callback) { }); } - plugins.fireHook('filter:meta.getMetaTags', { req: req, data: data, defaultTags: defaultTags }, next); + plugins.fireHook('filter:meta.getMetaTags', { req: req, data: data, tags: defaultTags }, next); }, links: function (next) { var defaultLinks = [{ @@ -101,7 +101,7 @@ Tags.parse = function (req, data, meta, link, callback) { href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-192.png', }); } - plugins.fireHook('filter:meta.getLinkTags', { req: req, data: data, defaultLinks: defaultLinks }, next); + plugins.fireHook('filter:meta.getLinkTags', { req: req, data: data, links: defaultLinks }, next); }, }, function (err, results) { if (err) { From 54f3009b4c103002944e1e8c37eb199c0f9f5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 27 Jul 2017 19:42:26 -0400 Subject: [PATCH 3/6] up composer default --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 014bef3d31..b3a1049762 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "morgan": "^1.3.2", "mousetrap": "^1.5.3", "nconf": "~0.8.2", - "nodebb-plugin-composer-default": "5.0.4", + "nodebb-plugin-composer-default": "5.0.5", "nodebb-plugin-dbsearch": "2.0.6", "nodebb-plugin-emoji-extended": "1.1.1", "nodebb-plugin-emoji-one": "1.2.1", From 3bcaedfe9dac81d329bf270497d291f268090625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 27 Jul 2017 19:43:40 -0400 Subject: [PATCH 4/6] up markdown --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3a1049762..b4304edef0 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "nodebb-plugin-dbsearch": "2.0.6", "nodebb-plugin-emoji-extended": "1.1.1", "nodebb-plugin-emoji-one": "1.2.1", - "nodebb-plugin-markdown": "8.0.2", + "nodebb-plugin-markdown": "8.0.3", "nodebb-plugin-mentions": "2.1.5", "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.5.0", From 911eb32e7038ed5f4d029f6bb69c755756a6412e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 27 Jul 2017 19:45:54 -0400 Subject: [PATCH 5/6] fix var names --- src/meta/tags.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meta/tags.js b/src/meta/tags.js index 3c8b97f3d7..c347b18d4e 100644 --- a/src/meta/tags.js +++ b/src/meta/tags.js @@ -108,7 +108,7 @@ Tags.parse = function (req, data, meta, link, callback) { return callback(err); } - meta = results.tags.defaultTags.concat(meta || []).map(function (tag) { + meta = results.tags.tags.concat(meta || []).map(function (tag) { if (!tag || typeof tag.content !== 'string') { winston.warn('Invalid meta tag. ', tag); return tag; @@ -139,7 +139,7 @@ Tags.parse = function (req, data, meta, link, callback) { addIfNotExists(meta, 'property', 'og:image:height', 200); } - link = results.links.defaultLinks.concat(link || []); + link = results.links.links.concat(link || []); callback(null, { meta: meta, From f6890cd971e5b66752d1073ac523b74af4cd9588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 27 Jul 2017 20:00:17 -0400 Subject: [PATCH 6/6] up themes --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b4304edef0..27f763623e 100644 --- a/package.json +++ b/package.json @@ -65,9 +65,9 @@ "nodebb-plugin-spam-be-gone": "0.5.0", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "4.0.5", - "nodebb-theme-persona": "5.0.15", + "nodebb-theme-persona": "5.0.16", "nodebb-theme-slick": "1.1.0", - "nodebb-theme-vanilla": "6.0.12", + "nodebb-theme-vanilla": "6.0.13", "nodebb-widget-essentials": "3.0.1", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0",