From d9dbf2b79abfd05e21b4635045562676ffd90511 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Fri, 13 Oct 2017 21:29:53 -0600 Subject: [PATCH 1/6] Fix use of core string dependency --- .gitignore | 1 + library.js | 4 ++-- package.json | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 386c235..afb5f62 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ sftp-config.json *.sublime-workspace .idea .vscode +node_modules diff --git a/library.js b/library.js index 2a45c43..4455671 100644 --- a/library.js +++ b/library.js @@ -1,6 +1,6 @@ 'use strict'; -var S = require.main.require('string'); +var S = require('string'); var meta = module.parent.require('./meta'); var user = module.parent.require('./user'); @@ -108,7 +108,7 @@ library.addUserToTopic = function(data, callback) { if (err) { return callback(err); } - + data.templateData.loggedInUser = userdata; callback(null, data); }); diff --git a/package.json b/package.json index 557fed0..eeac291 100644 --- a/package.json +++ b/package.json @@ -37,5 +37,8 @@ "license": "BSD-2-Clause", "bugs": { "url": "https://github.com/psychobunny/nodebb-theme-persona/issues" + }, + "dependencies": { + "string": "^3.3.3" } } From 7ac91da84fd9275e344830f9bf90aeb5908ab6f5 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Fri, 13 Oct 2017 21:32:02 -0600 Subject: [PATCH 2/6] Fix compatibility --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eeac291..b42e830 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb-theme-persona", "version": "6.1.3", "nbbpm": { - "compatibility": "^1.4.4" + "compatibility": "^1.4.4 || ^1.5.0 || ^1.6.0" }, "description": "Persona theme for NodeBB", "main": "theme.less", From 2dd3a3e251e9aa5fa0c8c4e2871190ae8a70e87c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Oct 2017 10:27:41 -0400 Subject: [PATCH 3/6] closes https://github.com/NodeBB/NodeBB/issues/6009 --- templates/category.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/category.tpl b/templates/category.tpl index 6800957..6aeac6d 100644 --- a/templates/category.tpl +++ b/templates/category.tpl @@ -31,6 +31,7 @@ +
[[category:no_topics]]
From 8738015789faa27951066734b4a2b563e758c0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Oct 2017 10:28:39 -0400 Subject: [PATCH 4/6] 6.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b42e830..80b0974 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodebb-theme-persona", - "version": "6.1.3", + "version": "6.1.4", "nbbpm": { "compatibility": "^1.4.4 || ^1.5.0 || ^1.6.0" }, From 06e1c79ca521c58bb49df88519f83ec4b8fdc529 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Mon, 30 Oct 2017 15:15:36 -0400 Subject: [PATCH 5/6] https://github.com/NodeBB/NodeBB/issues/6005 --- templates/recent.tpl | 8 ++++---- templates/unread.tpl | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/recent.tpl b/templates/recent.tpl index 7a11a7c..52c4c9b 100644 --- a/templates/recent.tpl +++ b/templates/recent.tpl @@ -14,18 +14,18 @@ -
+
-
-
+
-