From a5b324cbc4f73fb59af1c883273f41f356a3aeae Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 16 Jul 2013 16:19:50 -0400 Subject: [PATCH 1/3] closes #86 --- src/topics.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/topics.js b/src/topics.js index a616df8bb3..1fb7ec7e97 100644 --- a/src/topics.js +++ b/src/topics.js @@ -173,7 +173,8 @@ marked.setOptions({ topicData.teaser_text = teaser.text || ''; topicData.teaser_username = teaser.username || ''; topicData.teaser_timestamp = teaser.timestamp ? utils.relativeTime(teaser.timestamp) : ''; - + topicData.teaser_userpicture = teaser.picture; + callback(topicData); }); } From dd4ee28d26dff3b0002fed4ca86046562187f083 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 16 Jul 2013 16:21:12 -0400 Subject: [PATCH 2/3] removed ajaxify.enable, closes #85 --- public/src/forum/category.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/src/forum/category.js b/public/src/forum/category.js index f8306f6063..380db05f18 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -56,8 +56,6 @@ container.insertBefore(topic, null); $(topic).hide().fadeIn('slow'); } - - ajaxify.enable(); }); From 62919894b49623f3712f793b7b04a480ab0d28c2 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 16 Jul 2013 16:33:18 -0400 Subject: [PATCH 3/3] removed the bcrypt question from install, changed default to 12 --- src/install.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/install.js b/src/install.js index 24709cb5ab..de7cb1e164 100644 --- a/src/install.js +++ b/src/install.js @@ -11,8 +11,7 @@ var async = require('async'), 'redis:host|Host IP or address of your Redis instance? (127.0.0.1)', 'redis:port|Host port of your Redis instance? (6379)', 'redis:password|Password of your Redis database? (no password)', - 'secret|Your NodeBB secret? (keyboard mash for a bit here)', - 'bcrypt_rounds|The number of rounds to use for bcrypt.genSalt? (10)' + 'secret|Your NodeBB secret? (keyboard mash for a bit here)' ], defaults: { "base_url": 'http://localhost', @@ -22,7 +21,7 @@ var async = require('async'), "redis:port": 6379, "redis:password": '', "secret": utils.generateUUID(), - "bcrypt_rounds": 10, + "bcrypt_rounds": 12, "upload_path": '/public/uploads' }, ask: function(question, callback) {