From f63be472be5c411978e99395a683b396e59075d8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 17 Jul 2013 11:33:37 -0400 Subject: [PATCH 1/5] updated link to roadmap and added new screenshots for readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dd9a34cefc..eb53c4d91b 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ Please support NodeBB development! Check out our IndieGoGo campaign and like, sh # NodeBB **NodeBB** is a robust Node.js driven forum built on a redis database. It is powered by web sockets, and is compatible down to IE8. -![NodeBB Screenshot](http://i.imgur.com/mxRmLAg.png) +![NodeBB Main Category Listing](http://i.imgur.com/u2zamT4.png) -![NodeBB Login Page (with Social Logins)](http://i.imgur.com/q5tUUHW.png) +![NodeBB Topic Page](http://i.imgur.com/KrvSoXV.png) ## How can I follow along/contribute? * Our [Indiegogo campaign](https://www.indiegogo.com/projects/nodebb-the-discussion-platform-of-the-future/) is accepting contributions until August 17th, 2013 -* Our feature roadmap is hosted on the [NodeBB Development/Roadmap Trello](https://trello.com/board/nodebb-development-roadmap/51c66b0d7c42d0a257002732) +* Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/designcreateplay/NodeBB/wiki/Version-History-%26-Roadmap) * If you are a developer, feel free to check out the source and submit pull requests. * If you are a designer, NodeBB needs themes! NodeBB will accept any LESS or CSS file and use it in place of the default Twitter Bootstrap theme. Consider extending Bootstrap themes by extending the base bootstrap LESS file. From 2f1ef4c2a13287f910b680421c246a08d030c018 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 17 Jul 2013 12:05:24 -0400 Subject: [PATCH 2/5] fixing regression introduced where the client-side config was incorrectly generated (resolves #94) --- src/install.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/install.js b/src/install.js index de7cb1e164..5954f7e30e 100644 --- a/src/install.js +++ b/src/install.js @@ -39,7 +39,17 @@ var async = require('async'), async.eachSeries(install.questions, function(question, next) { var question = question.split('|'); install.ask(question[1], function(value) { - if (value !== '') config[question[0]] = value; + switch(question[0]) { + case 'use_port': + value = value.toLowerCase(); + if (['y', 'yes', ''].indexOf(value) === -1) config[question[0]] = false; + break; + + default: + if (value !== '') config[question[0]] = value; + break; + } + next(); }); }, function() { From d3541da9ddc81900818b98b6e017dc614860d35c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 17 Jul 2013 12:15:40 -0400 Subject: [PATCH 3/5] resolving regression introduced by errant install script (again) - issue 94 --- src/install.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/install.js b/src/install.js index 5954f7e30e..9c64acdc28 100644 --- a/src/install.js +++ b/src/install.js @@ -43,7 +43,19 @@ var async = require('async'), case 'use_port': value = value.toLowerCase(); if (['y', 'yes', ''].indexOf(value) === -1) config[question[0]] = false; - break; + break; + case 'redis:host': + config.redis = config.redis || {}; + config.redis.host = value; + break; + case 'redis:port': + config.redis = config.redis || {}; + config.redis.port = value; + break; + case 'redis:password': + config.redis = config.redis || {}; + config.redis.password = value; + break; default: if (value !== '') config[question[0]] = value; From 1e4424d65603c237c4d25815219639dea0b091a8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 17 Jul 2013 12:17:52 -0400 Subject: [PATCH 4/5] issue #94 again --- src/install.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/install.js b/src/install.js index 9c64acdc28..92e155aecf 100644 --- a/src/install.js +++ b/src/install.js @@ -46,15 +46,15 @@ var async = require('async'), break; case 'redis:host': config.redis = config.redis || {}; - config.redis.host = value; + if (value !== '') config.redis.host = value; break; case 'redis:port': config.redis = config.redis || {}; - config.redis.port = value; + if (value !== '') config.redis.port = value; break; case 'redis:password': config.redis = config.redis || {}; - config.redis.password = value; + if (value !== '') config.redis.password = value; break; default: From a06123579bbdbfe8fb946a57e7bdcae52c6308d8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 17 Jul 2013 12:21:40 -0400 Subject: [PATCH 5/5] issue #94 --- src/install.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/install.js b/src/install.js index 92e155aecf..cfb5c63aae 100644 --- a/src/install.js +++ b/src/install.js @@ -17,9 +17,11 @@ var async = require('async'), "base_url": 'http://localhost', "port": 4567, "use_port": true, - "redis:host": '127.0.0.1', - "redis:port": 6379, - "redis:password": '', + "redis": { + "host": '127.0.0.1', + "port": 6379, + "password": '' + }, "secret": utils.generateUUID(), "bcrypt_rounds": 12, "upload_path": '/public/uploads'