From 90f3e1281d12ee313f4e7327a9c4eac2d65b55ef Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 21 Sep 2018 12:54:30 -0400 Subject: [PATCH 1/5] up markdown --- install/package.json | 2 +- public/language/en-GB/modules.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bfc91ecbd9..8e19ce29da 100644 --- a/install/package.json +++ b/install/package.json @@ -70,7 +70,7 @@ "nodebb-plugin-dbsearch": "2.0.21", "nodebb-plugin-emoji": "^2.2.5", "nodebb-plugin-emoji-android": "2.0.0", - "nodebb-plugin-markdown": "8.7.2", + "nodebb-plugin-markdown": "8.7.3", "nodebb-plugin-mentions": "2.2.8", "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.5.4", diff --git a/public/language/en-GB/modules.json b/public/language/en-GB/modules.json index df6ca5568a..44233692a2 100644 --- a/public/language/en-GB/modules.json +++ b/public/language/en-GB/modules.json @@ -48,6 +48,7 @@ "composer.formatting.italic": "Italic", "composer.formatting.list": "List", "composer.formatting.strikethrough": "Strikethrough", + "composer.formatting.code": "Code", "composer.formatting.link": "Link", "composer.formatting.picture": "Picture", "composer.upload-picture": "Upload Image", From 4d5e164fd2b702aa9e7378eb47e8deaaf14fda4c Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 21 Sep 2018 13:49:56 -0400 Subject: [PATCH 2/5] closes #6778 --- src/widgets/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widgets/index.js b/src/widgets/index.js index d950429ce5..d2440d20db 100644 --- a/src/widgets/index.js +++ b/src/widgets/index.js @@ -51,7 +51,9 @@ widgets.render = function (uid, options, callback) { if (err) { return done(err); } - returnData[location] = renderedWidgets.filter(Boolean); + renderedWidgets = renderedWidgets.filter(Boolean); + returnData[location] = renderedWidgets.length ? renderedWidgets : undefined; + done(); }); }, function (err) { From edefab1d6907757b39acf3cea3e3fe133555ffa2 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 21 Sep 2018 16:10:07 -0400 Subject: [PATCH 3/5] closes #6728 add option to disable a category on creation show disabled categories on manage privileges --- .../language/en-GB/admin/manage/categories.json | 3 ++- src/categories/create.js | 2 +- src/controllers/admin/privileges.js | 15 ++++++++++++++- src/views/admin/partials/categories/create.tpl | 7 +++++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/public/language/en-GB/admin/manage/categories.json b/public/language/en-GB/admin/manage/categories.json index 758785d689..af717ec2c9 100644 --- a/public/language/en-GB/admin/manage/categories.json +++ b/public/language/en-GB/admin/manage/categories.json @@ -68,5 +68,6 @@ "alert.find-group": "Find a Group", "alert.group-search": "Search for a group here...", "collapse-all": "Collapse All", - "expand-all": "Expand All" + "expand-all": "Expand All", + "disable-on-create": "Disable on create" } \ No newline at end of file diff --git a/src/categories/create.js b/src/categories/create.js index 55e434f1a0..835515c2b4 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -35,7 +35,7 @@ module.exports = function (Categories) { parentCid: parentCid, topic_count: 0, post_count: 0, - disabled: 0, + disabled: data.disabled ? 1 : 0, order: order, link: data.link || '', numRecentReplies: 1, diff --git a/src/controllers/admin/privileges.js b/src/controllers/admin/privileges.js index 92dbe27ef9..08bfe3183a 100644 --- a/src/controllers/admin/privileges.js +++ b/src/controllers/admin/privileges.js @@ -2,6 +2,7 @@ var async = require('async'); +var db = require('../../database'); var categories = require('../../categories'); var privileges = require('../../privileges'); @@ -19,7 +20,19 @@ privilegesController.get = function (req, res, callback) { privileges.categories.list(cid, next); } }, - allCategories: async.apply(categories.buildForSelect, req.uid, 'read'), + allCategories: function (next) { + async.waterfall([ + function (next) { + db.getSortedSetRange('cid:0:children', 0, -1, next); + }, + function (cids, next) { + categories.getCategories(cids, req.uid, next); + }, + function (categoriesData, next) { + categories.buildForSelectCategories(categoriesData, next); + }, + ], next); + }, }, next); }, function (data) { diff --git a/src/views/admin/partials/categories/create.tpl b/src/views/admin/partials/categories/create.tpl index 7fb0f2484b..c1daa78925 100644 --- a/src/views/admin/partials/categories/create.tpl +++ b/src/views/admin/partials/categories/create.tpl @@ -25,6 +25,13 @@ [[admin/manage/categories:clone-children]] + +
+
+ \ No newline at end of file From 24601694db455b6e578c70972ba495170f8e4f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 21 Sep 2018 23:13:44 -0400 Subject: [PATCH 4/5] fix wrong year on upgrade script --- src/upgrades/1.8.1/diffs_zset_to_listhash.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/upgrades/1.8.1/diffs_zset_to_listhash.js b/src/upgrades/1.8.1/diffs_zset_to_listhash.js index b7a2bba296..d5e065c698 100644 --- a/src/upgrades/1.8.1/diffs_zset_to_listhash.js +++ b/src/upgrades/1.8.1/diffs_zset_to_listhash.js @@ -7,7 +7,7 @@ var async = require('async'); module.exports = { name: 'Reformatting post diffs to be stored in lists and hash instead of single zset', - timestamp: Date.UTC(2017, 2, 15), + timestamp: Date.UTC(2018, 2, 15), method: function (callback) { var progress = this.progress; From 7787c9b4bbbdc40c636bd24fbeb5a8cf1a65e3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 21 Sep 2018 23:14:55 -0400 Subject: [PATCH 5/5] fix wrong year on upgrade script --- src/upgrades/1.7.6/update_min_pass_strength.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/upgrades/1.7.6/update_min_pass_strength.js b/src/upgrades/1.7.6/update_min_pass_strength.js index c051d1d72e..e12ed5d067 100644 --- a/src/upgrades/1.7.6/update_min_pass_strength.js +++ b/src/upgrades/1.7.6/update_min_pass_strength.js @@ -6,7 +6,7 @@ var async = require('async'); module.exports = { name: 'Revising minimum password strength to 1 (from 0)', - timestamp: Date.UTC(2017, 1, 21), + timestamp: Date.UTC(2018, 1, 21), method: function (callback) { async.waterfall([ async.apply(db.getObjectField.bind(db), 'config', 'minimumPasswordStrength'),