fixed 1 more

Conflicts:
	src/topics/posts.js

.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*.js, *.css, *.tpl]
+indent_style = tab

.gitignore

@@ -1,15 +1,28 @@
-#################  
-## npm
-#################
-
 npm-debug.log
 node_modules/
 sftp-config.json
 config.json
+public/src/nodebb.min.js
 public/config.json
 public/css/*.css
-public/themes/*
 *.sublime-project
 *.sublime-workspace
-plugins/*
-.project
+.project
+.idea
+*.swp
+Vagrantfile
+.vagrant
+provision.sh
+*.komodoproject
+.DS_Store
+feeds/recent.rss
+
+# winston?
+error.log
+events.log
+
+pidfile
+
+# templates
+/public/templates
+/public/sounds

.jsbeautifyrc

@@ -0,0 +1,17 @@
+{
+    "indent_size": 4,
+    "indent_char": " ",
+    "indent_level": 0,
+    "indent_with_tabs": true,
+    "preserve_newlines": true,
+    "max_preserve_newlines": 10,
+    "jslint_happy": true,
+    "brace_style": "collapse",
+    "keep_array_indentation": false,
+    "keep_function_indentation": false,
+    "space_before_conditional": true,
+    "break_chained_methods": false,
+    "eval_code": false,
+    "unescape_strings": false,
+    "wrap_line_length": 0
+}

.jshintrc

@@ -0,0 +1,86 @@
+{
+    // JSHint Default Configuration File (as on JSHint website)
+    // See http://jshint.com/docs/ for more details
+
+    "maxerr" : 50, // {int} Maximum error before stopping
+
+    // Enforcing
+    "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
+    "camelcase" : false, // true: Identifiers must be in camelCase
+    "curly" : true, // true: Require {} for every new block or scope
+    "eqeqeq" : true, // true: Require triple equals (===) for comparison
+    "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
+    "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
+    "indent" : 4, // {int} Number of spaces to use for indentation
+    "latedef" : false, // true: Require variables/functions to be defined before being used
+    "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
+    "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
+    "noempty" : true, // true: Prohibit use of empty blocks
+    "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
+    "plusplus" : false, // true: Prohibit use of `++` & `--`
+    "quotmark" : false, // Quotation mark consistency:
+                                // false : do nothing (default)
+                                // true : ensure whatever is used is consistent
+                                // "single" : require single quotes
+                                // "double" : require double quotes
+    "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
+    "unused" : false, // true: Require all defined variables be used TODO: Set this to true, update codebase.
+    "strict" : true, // true: Requires all functions run in ES5 Strict Mode
+    "trailing" : false, // true: Prohibit trailing whitespaces
+    "maxparams" : false, // {int} Max number of formal params allowed per function
+    "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
+    "maxstatements" : false, // {int} Max number statements per function
+    "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
+    "maxlen" : false, // {int} Max number of characters per line
+
+    // Relaxing
+    "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+    "boss" : false, // true: Tolerate assignments where comparisons would be expected
+    "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
+    "eqnull" : false, // true: Tolerate use of `== null`
+    "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
+    "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
+    "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+                                 // (ex: `for each`, multiple try/catch, function expression…)
+    "evil" : false, // true: Tolerate use of `eval` and `new Function()`
+    "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
+    "funcscope" : false, // true: Tolerate defining variables inside control statements"
+    "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
+    "iterator" : false, // true: Tolerate using the `__iterator__` property
+    "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
+    "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
+    "laxcomma" : false, // true: Tolerate comma-first style coding
+    "loopfunc" : false, // true: Tolerate functions being defined in loops
+    "multistr" : false, // true: Tolerate multi-line strings
+    "proto" : false, // true: Tolerate using the `__proto__` property
+    "scripturl" : false, // true: Tolerate script-targeted URLs
+    "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
+    "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
+    "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
+    "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
+    "validthis" : false, // true: Tolerate using this in a non-constructor function
+
+    // Environments
+    "browser" : true, // Web Browser (window, document, etc)
+    "couch" : false, // CouchDB
+    "devel" : true, // Development/debugging (alert, confirm, etc)
+    "dojo" : false, // Dojo Toolkit
+    "jquery" : true, // jQuery
+    "mootools" : false, // MooTools
+    "node" : true, // Node.js
+    "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
+    "prototypejs" : false, // Prototype and Scriptaculous
+    "rhino" : false, // Rhino
+    "worker" : false, // Web Workers
+    "wsh" : false, // Windows Scripting Host
+    "yui" : false, // Yahoo User Interface
+
+    // Legacy
+    "nomen" : false, // true: Prohibit dangling `_` in variables
+    "onevar" : false, // true: Allow only one `var` statement per function
+    "passfail" : false, // true: Stop on first error
+    "white" : false, // true: Check against strict whitespace and indentation rules
+
+    // Custom Globals
+    "globals" : {} // additional predefined global variables
+}

.travis.yml

@@ -0,0 +1,12 @@
+services:
+  - redis-server
+before_install:
+ - npm i --production
+ - node app --setup="{\"base_url\":\"http://127.0.0.1\",\"port\":4567,\"use_port\":false,\"secret\":\"abcdef\",\"bind_address\":\"0.0.0.0\",\"database\":\"redis\",\"redis:host\":\"127.0.0.1\",\"redis:port\":6379,\"redis:password\":\"\",\"redis:database\":0,\"admin:username\":\"admin\",\"admin:email\":\"test@example.org\",\"admin:password\":\"abcdef\",\"admin:password:confirm\":\"abcdef\"}" --ci="{\"host\":\"127.0.0.1\",\"port\":6379,\"database\":0}"
+language: node_js
+node_js:
+  - "0.11"
+  - "0.10"
+branches:
+  only:
+    - master

.tx/config

@@ -0,0 +1,548 @@
+[main]
+host = https://www.transifex.com
+
+[nodebb.category]
+file_filter = public/language/<lang>/category.json
+source_file = public/language/en_GB/category.json
+source_lang = en_GB
+trans.ar = public/language/ar/category.json
+trans.cs = public/language/cs/category.json
+trans.de = public/language/de/category.json
+trans.en_US = public/language/en_US/category.json
+trans.en@pirate = public/language/en@pirate/category.json
+trans.es = public/language/es/category.json
+trans.et = public/language/et/category.json
+trans.fa_IR = public/language/fa_IR/category.json
+trans.fi = public/language/fi/category.json
+trans.fr = public/language/fr/category.json
+trans.he = public/language/he/category.json
+trans.hu = public/language/hu/category.json
+trans.it = public/language/it/category.json
+trans.ja = public/language/ja/category.json
+trans.lt = public/language/lt/category.json
+trans.ms = public/language/ms/category.json
+trans.nb = public/language/nb/category.json
+trans.nl = public/language/nl/category.json
+trans.pl = public/language/pl/category.json
+trans.pt_BR = public/language/pt_BR/category.json
+trans.ru = public/language/ru/category.json
+trans.sc = public/language/sc/category.json
+trans.sk = public/language/sk/category.json
+trans.sv = public/language/sv/category.json
+trans.th = public/language/th/category.json
+trans.tr = public/language/tr/category.json
+trans.vi = public/language/vi/category.json
+trans.zh_CN = public/language/zh_CN/category.json
+trans.zh_TW = public/language/zh_TW/category.json
+type = KEYVALUEJSON
+
+[nodebb.login]
+file_filter = public/language/<lang>/login.json
+source_file = public/language/en_GB/login.json
+source_lang = en_GB
+trans.ar = public/language/ar/login.json
+trans.cs = public/language/cs/login.json
+trans.de = public/language/de/login.json
+trans.en_US = public/language/en_US/login.json
+trans.en@pirate = public/language/en@pirate/login.json
+trans.es = public/language/es/login.json
+trans.et = public/language/et/login.json
+trans.fa_IR = public/language/fa_IR/login.json
+trans.fi = public/language/fi/login.json
+trans.fr = public/language/fr/login.json
+trans.he = public/language/he/login.json
+trans.hu = public/language/hu/login.json
+trans.it = public/language/it/login.json
+trans.ja = public/language/ja/login.json
+trans.lt = public/language/lt/login.json
+trans.ms = public/language/ms/login.json
+trans.nb = public/language/nb/login.json
+trans.nl = public/language/nl/login.json
+trans.pl = public/language/pl/login.json
+trans.pt_BR = public/language/pt_BR/login.json
+trans.ru = public/language/ru/login.json
+trans.sc = public/language/sc/login.json
+trans.sk = public/language/sk/login.json
+trans.sv = public/language/sv/login.json
+trans.th = public/language/th/login.json
+trans.tr = public/language/tr/login.json
+trans.vi = public/language/vi/login.json
+trans.zh_CN = public/language/zh_CN/login.json
+trans.zh_TW = public/language/zh_TW/login.json
+type = KEYVALUEJSON
+
+[nodebb.recent]
+source_file = public/language/en_GB/recent.json
+source_lang = en_GB
+trans.ar = public/language/ar/recent.json
+trans.cs = public/language/cs/recent.json
+trans.de = public/language/de/recent.json
+trans.en_US = public/language/en_US/recent.json
+trans.en@pirate = public/language/en@pirate/recent.json
+trans.es = public/language/es/recent.json
+trans.et = public/language/et/recent.json
+trans.fa_IR = public/language/fa_IR/recent.json
+trans.fi = public/language/fi/recent.json
+trans.fr = public/language/fr/recent.json
+trans.he = public/language/he/recent.json
+trans.hu = public/language/hu/recent.json
+trans.it = public/language/it/recent.json
+trans.ja = public/language/ja/recent.json
+trans.lt = public/language/lt/recent.json
+trans.ms = public/language/ms/recent.json
+trans.nb = public/language/nb/recent.json
+trans.nl = public/language/nl/recent.json
+trans.pl = public/language/pl/recent.json
+trans.pt_BR = public/language/pt_BR/recent.json
+trans.ru = public/language/ru/recent.json
+trans.sc = public/language/sc/recent.json
+trans.sk = public/language/sk/recent.json
+trans.sv = public/language/sv/recent.json
+trans.th = public/language/th/recent.json
+trans.tr = public/language/tr/recent.json
+trans.vi = public/language/vi/recent.json
+trans.zh_CN = public/language/zh_CN/recent.json
+trans.zh_TW = public/language/zh_TW/recent.json
+type = KEYVALUEJSON
+
+[nodebb.unread]
+source_file = public/language/en_GB/unread.json
+source_lang = en_GB
+trans.ar = public/language/ar/unread.json
+trans.cs = public/language/cs/unread.json
+trans.de = public/language/de/unread.json
+trans.en_US = public/language/en_US/unread.json
+trans.en@pirate = public/language/en@pirate/unread.json
+trans.es = public/language/es/unread.json
+trans.et = public/language/et/unread.json
+trans.fa_IR = public/language/fa_IR/unread.json
+trans.fi = public/language/fi/unread.json
+trans.fr = public/language/fr/unread.json
+trans.he = public/language/he/unread.json
+trans.hu = public/language/hu/unread.json
+trans.it = public/language/it/unread.json
+trans.ja = public/language/ja/unread.json
+trans.lt = public/language/lt/unread.json
+trans.ms = public/language/ms/unread.json
+trans.nb = public/language/nb/unread.json
+trans.nl = public/language/nl/unread.json
+trans.pl = public/language/pl/unread.json
+trans.pt_BR = public/language/pt_BR/unread.json
+trans.ru = public/language/ru/unread.json
+trans.sc = public/language/sc/unread.json
+trans.sk = public/language/sk/unread.json
+trans.sv = public/language/sv/unread.json
+trans.th = public/language/th/unread.json
+trans.tr = public/language/tr/unread.json
+trans.vi = public/language/vi/unread.json
+trans.zh_CN = public/language/zh_CN/unread.json
+trans.zh_TW = public/language/zh_TW/unread.json
+type = KEYVALUEJSON
+
+[nodebb.modules]
+source_file = public/language/en_GB/modules.json
+source_lang = en_GB
+trans.ar = public/language/ar/modules.json
+trans.cs = public/language/cs/modules.json
+trans.de = public/language/de/modules.json
+trans.en_US = public/language/en_US/modules.json
+trans.en@pirate = public/language/en@pirate/modules.json
+trans.es = public/language/es/modules.json
+trans.et = public/language/et/modules.json
+trans.fa_IR = public/language/fa_IR/modules.json
+trans.fi = public/language/fi/modules.json
+trans.fr = public/language/fr/modules.json
+trans.he = public/language/he/modules.json
+trans.hu = public/language/hu/modules.json
+trans.it = public/language/it/modules.json
+trans.ja = public/language/ja/modules.json
+trans.lt = public/language/lt/modules.json
+trans.ms = public/language/ms/modules.json
+trans.nb = public/language/nb/modules.json
+trans.nl = public/language/nl/modules.json
+trans.pl = public/language/pl/modules.json
+trans.pt_BR = public/language/pt_BR/modules.json
+trans.ru = public/language/ru/modules.json
+trans.sc = public/language/sc/modules.json
+trans.sk = public/language/sk/modules.json
+trans.sv = public/language/sv/modules.json
+trans.th = public/language/th/modules.json
+trans.tr = public/language/tr/modules.json
+trans.vi = public/language/vi/modules.json
+trans.zh_CN = public/language/zh_CN/modules.json
+trans.zh_TW = public/language/zh_TW/modules.json
+type = KEYVALUEJSON
+
+[nodebb.register]
+source_file = public/language/en_GB/register.json
+source_lang = en_GB
+trans.ar = public/language/ar/register.json
+trans.cs = public/language/cs/register.json
+trans.de = public/language/de/register.json
+trans.en_US = public/language/en_US/register.json
+trans.en@pirate = public/language/en@pirate/register.json
+trans.es = public/language/es/register.json
+trans.et = public/language/et/register.json
+trans.fa_IR = public/language/fa_IR/register.json
+trans.fi = public/language/fi/register.json
+trans.fr = public/language/fr/register.json
+trans.he = public/language/he/register.json
+trans.hu = public/language/hu/register.json
+trans.it = public/language/it/register.json
+trans.ja = public/language/ja/register.json
+trans.lt = public/language/lt/register.json
+trans.ms = public/language/ms/register.json
+trans.nb = public/language/nb/register.json
+trans.nl = public/language/nl/register.json
+trans.pl = public/language/pl/register.json
+trans.pt_BR = public/language/pt_BR/register.json
+trans.ru = public/language/ru/register.json
+trans.sc = public/language/sc/register.json
+trans.sk = public/language/sk/register.json
+trans.sv = public/language/sv/register.json
+trans.th = public/language/th/register.json
+trans.tr = public/language/tr/register.json
+trans.vi = public/language/vi/register.json
+trans.zh_CN = public/language/zh_CN/register.json
+trans.zh_TW = public/language/zh_TW/register.json
+type = KEYVALUEJSON
+
+[nodebb.user]
+source_file = public/language/en_GB/user.json
+source_lang = en_GB
+trans.ar = public/language/ar/user.json
+trans.cs = public/language/cs/user.json
+trans.de = public/language/de/user.json
+trans.en_US = public/language/en_US/user.json
+trans.en@pirate = public/language/en@pirate/user.json
+trans.es = public/language/es/user.json
+trans.et = public/language/et/user.json
+trans.fa_IR = public/language/fa_IR/user.json
+trans.fi = public/language/fi/user.json
+trans.fr = public/language/fr/user.json
+trans.he = public/language/he/user.json
+trans.hu = public/language/hu/user.json
+trans.it = public/language/it/user.json
+trans.ja = public/language/ja/user.json
+trans.lt = public/language/lt/user.json
+trans.ms = public/language/ms/user.json
+trans.nb = public/language/nb/user.json
+trans.nl = public/language/nl/user.json
+trans.pl = public/language/pl/user.json
+trans.pt_BR = public/language/pt_BR/user.json
+trans.ru = public/language/ru/user.json
+trans.sc = public/language/sc/user.json
+trans.sk = public/language/sk/user.json
+trans.sv = public/language/sv/user.json
+trans.th = public/language/th/user.json
+trans.tr = public/language/tr/user.json
+trans.vi = public/language/vi/user.json
+trans.zh_CN = public/language/zh_CN/user.json
+trans.zh_TW = public/language/zh_TW/user.json
+type = KEYVALUEJSON
+
+[nodebb.global]
+source_file = public/language/en_GB/global.json
+source_lang = en_GB
+trans.ar = public/language/ar/global.json
+trans.cs = public/language/cs/global.json
+trans.de = public/language/de/global.json
+trans.en_US = public/language/en_US/global.json
+trans.en@pirate = public/language/en@pirate/global.json
+trans.es = public/language/es/global.json
+trans.et = public/language/et/global.json
+trans.fa_IR = public/language/fa_IR/global.json
+trans.fi = public/language/fi/global.json
+trans.fr = public/language/fr/global.json
+trans.he = public/language/he/global.json
+trans.hu = public/language/hu/global.json
+trans.it = public/language/it/global.json
+trans.ja = public/language/ja/global.json
+trans.lt = public/language/lt/global.json
+trans.ms = public/language/ms/global.json
+trans.nb = public/language/nb/global.json
+trans.nl = public/language/nl/global.json
+trans.pl = public/language/pl/global.json
+trans.pt_BR = public/language/pt_BR/global.json
+trans.ru = public/language/ru/global.json
+trans.sc = public/language/sc/global.json
+trans.sk = public/language/sk/global.json
+trans.sv = public/language/sv/global.json
+trans.th = public/language/th/global.json
+trans.tr = public/language/tr/global.json
+trans.vi = public/language/vi/global.json
+trans.zh_CN = public/language/zh_CN/global.json
+trans.zh_TW = public/language/zh_TW/global.json
+type = KEYVALUEJSON
+
+[nodebb.notifications]
+source_file = public/language/en_GB/notifications.json
+source_lang = en_GB
+trans.ar = public/language/ar/notifications.json
+trans.cs = public/language/cs/notifications.json
+trans.de = public/language/de/notifications.json
+trans.en_US = public/language/en_US/notifications.json
+trans.en@pirate = public/language/en@pirate/notifications.json
+trans.es = public/language/es/notifications.json
+trans.et = public/language/et/notifications.json
+trans.fa_IR = public/language/fa_IR/notifications.json
+trans.fi = public/language/fi/notifications.json
+trans.fr = public/language/fr/notifications.json
+trans.he = public/language/he/notifications.json
+trans.hu = public/language/hu/notifications.json
+trans.it = public/language/it/notifications.json
+trans.ja = public/language/ja/notifications.json
+trans.lt = public/language/lt/notifications.json
+trans.ms = public/language/ms/notifications.json
+trans.nb = public/language/nb/notifications.json
+trans.nl = public/language/nl/notifications.json
+trans.pl = public/language/pl/notifications.json
+trans.pt_BR = public/language/pt_BR/notifications.json
+trans.ru = public/language/ru/notifications.json
+trans.sc = public/language/sc/notifications.json
+trans.sk = public/language/sk/notifications.json
+trans.sv = public/language/sv/notifications.json
+trans.th = public/language/th/notifications.json
+trans.tr = public/language/tr/notifications.json
+trans.vi = public/language/vi/notifications.json
+trans.zh_CN = public/language/zh_CN/notifications.json
+trans.zh_TW = public/language/zh_TW/notifications.json
+type = KEYVALUEJSON
+
+[nodebb.reset_password]
+source_file = public/language/en_GB/reset_password.json
+source_lang = en_GB
+trans.ar = public/language/ar/reset_password.json
+trans.cs = public/language/cs/reset_password.json
+trans.de = public/language/de/reset_password.json
+trans.en_US = public/language/en_US/reset_password.json
+trans.en@pirate = public/language/en@pirate/reset_password.json
+trans.es = public/language/es/reset_password.json
+trans.et = public/language/et/reset_password.json
+trans.fa_IR = public/language/fa_IR/reset_password.json
+trans.fi = public/language/fi/reset_password.json
+trans.fr = public/language/fr/reset_password.json
+trans.he = public/language/he/reset_password.json
+trans.hu = public/language/hu/reset_password.json
+trans.it = public/language/it/reset_password.json
+trans.ja = public/language/ja/reset_password.json
+trans.lt = public/language/lt/reset_password.json
+trans.ms = public/language/ms/reset_password.json
+trans.nb = public/language/nb/reset_password.json
+trans.nl = public/language/nl/reset_password.json
+trans.pl = public/language/pl/reset_password.json
+trans.pt_BR = public/language/pt_BR/reset_password.json
+trans.ru = public/language/ru/reset_password.json
+trans.sc = public/language/sc/reset_password.json
+trans.sk = public/language/sk/reset_password.json
+trans.sv = public/language/sv/reset_password.json
+trans.th = public/language/th/reset_password.json
+trans.tr = public/language/tr/reset_password.json
+trans.vi = public/language/vi/reset_password.json
+trans.zh_CN = public/language/zh_CN/reset_password.json
+trans.zh_TW = public/language/zh_TW/reset_password.json
+type = KEYVALUEJSON
+
+[nodebb.users]
+source_file = public/language/en_GB/users.json
+source_lang = en_GB
+trans.ar = public/language/ar/users.json
+trans.cs = public/language/cs/users.json
+trans.de = public/language/de/users.json
+trans.en_US = public/language/en_US/users.json
+trans.en@pirate = public/language/en@pirate/users.json
+trans.es = public/language/es/users.json
+trans.et = public/language/et/users.json
+trans.fa_IR = public/language/fa_IR/users.json
+trans.fi = public/language/fi/users.json
+trans.fr = public/language/fr/users.json
+trans.he = public/language/he/users.json
+trans.hu = public/language/hu/users.json
+trans.it = public/language/it/users.json
+trans.ja = public/language/ja/users.json
+trans.lt = public/language/lt/users.json
+trans.ms = public/language/ms/users.json
+trans.nb = public/language/nb/users.json
+trans.nl = public/language/nl/users.json
+trans.pl = public/language/pl/users.json
+trans.pt_BR = public/language/pt_BR/users.json
+trans.ru = public/language/ru/users.json
+trans.sc = public/language/sc/users.json
+trans.sk = public/language/sk/users.json
+trans.sv = public/language/sv/users.json
+trans.th = public/language/th/users.json
+trans.tr = public/language/tr/users.json
+trans.vi = public/language/vi/users.json
+trans.zh_CN = public/language/zh_CN/users.json
+trans.zh_TW = public/language/zh_TW/users.json
+type = KEYVALUEJSON
+
+[nodebb.language]
+source_file = public/language/en_GB/language.json
+source_lang = en_GB
+trans.ar = public/language/ar/language.json
+trans.cs = public/language/cs/language.json
+trans.de = public/language/de/language.json
+trans.en_US = public/language/en_US/language.json
+trans.en@pirate = public/language/en@pirate/language.json
+trans.es = public/language/es/language.json
+trans.et = public/language/et/language.json
+trans.fa_IR = public/language/fa_IR/language.json
+trans.fi = public/language/fi/language.json
+trans.fr = public/language/fr/language.json
+trans.he = public/language/he/language.json
+trans.hu = public/language/hu/language.json
+trans.it = public/language/it/language.json
+trans.ja = public/language/ja/language.json
+trans.lt = public/language/lt/language.json
+trans.ms = public/language/ms/language.json
+trans.nb = public/language/nb/language.json
+trans.nl = public/language/nl/language.json
+trans.pl = public/language/pl/language.json
+trans.pt_BR = public/language/pt_BR/language.json
+trans.ru = public/language/ru/language.json
+trans.sc = public/language/sc/language.json
+trans.sk = public/language/sk/language.json
+trans.sv = public/language/sv/language.json
+trans.th = public/language/th/language.json
+trans.tr = public/language/tr/language.json
+trans.vi = public/language/vi/language.json
+trans.zh_CN = public/language/zh_CN/language.json
+trans.zh_TW = public/language/zh_TW/language.json
+type = KEYVALUEJSON
+
+[nodebb.pages]
+source_file = public/language/en_GB/pages.json
+source_lang = en_GB
+trans.ar = public/language/ar/pages.json
+trans.cs = public/language/cs/pages.json
+trans.de = public/language/de/pages.json
+trans.en_US = public/language/en_US/pages.json
+trans.en@pirate = public/language/en@pirate/pages.json
+trans.es = public/language/es/pages.json
+trans.et = public/language/et/pages.json
+trans.fa_IR = public/language/fa_IR/pages.json
+trans.fi = public/language/fi/pages.json
+trans.fr = public/language/fr/pages.json
+trans.he = public/language/he/pages.json
+trans.hu = public/language/hu/pages.json
+trans.it = public/language/it/pages.json
+trans.ja = public/language/ja/pages.json
+trans.lt = public/language/lt/pages.json
+trans.ms = public/language/ms/pages.json
+trans.nb = public/language/nb/pages.json
+trans.nl = public/language/nl/pages.json
+trans.pl = public/language/pl/pages.json
+trans.pt_BR = public/language/pt_BR/pages.json
+trans.ru = public/language/ru/pages.json
+trans.sc = public/language/sc/pages.json
+trans.sk = public/language/sk/pages.json
+trans.sv = public/language/sv/pages.json
+trans.th = public/language/th/pages.json
+trans.tr = public/language/tr/pages.json
+trans.vi = public/language/vi/pages.json
+trans.zh_CN = public/language/zh_CN/pages.json
+trans.zh_TW = public/language/zh_TW/pages.json
+type = KEYVALUEJSON
+
+[nodebb.topic]
+source_file = public/language/en_GB/topic.json
+source_lang = en_GB
+trans.ar = public/language/ar/topic.json
+trans.cs = public/language/cs/topic.json
+trans.de = public/language/de/topic.json
+trans.en_US = public/language/en_US/topic.json
+trans.en@pirate = public/language/en@pirate/topic.json
+trans.es = public/language/es/topic.json
+trans.et = public/language/et/topic.json
+trans.fa_IR = public/language/fa_IR/topic.json
+trans.fi = public/language/fi/topic.json
+trans.fr = public/language/fr/topic.json
+trans.he = public/language/he/topic.json
+trans.hu = public/language/hu/topic.json
+trans.it = public/language/it/topic.json
+trans.ja = public/language/ja/topic.json
+trans.lt = public/language/lt/topic.json
+trans.ms = public/language/ms/topic.json
+trans.nb = public/language/nb/topic.json
+trans.nl = public/language/nl/topic.json
+trans.pl = public/language/pl/topic.json
+trans.pt_BR = public/language/pt_BR/topic.json
+trans.ru = public/language/ru/topic.json
+trans.sc = public/language/sc/topic.json
+trans.sk = public/language/sk/topic.json
+trans.sv = public/language/sv/topic.json
+trans.th = public/language/th/topic.json
+trans.tr = public/language/tr/topic.json
+trans.vi = public/language/vi/topic.json
+trans.zh_CN = public/language/zh_CN/topic.json
+trans.zh_TW = public/language/zh_TW/topic.json
+type = KEYVALUEJSON
+
+[nodebb.success]
+source_file = public/language/en_GB/success.json
+source_lang = en_GB
+trans.ar = public/language/ar/success.json
+trans.cs = public/language/cs/success.json
+trans.de = public/language/de/success.json
+trans.en_US = public/language/en_US/success.json
+trans.en@pirate = public/language/en@pirate/success.json
+trans.es = public/language/es/success.json
+trans.et = public/language/et/success.json
+trans.fa_IR = public/language/fa_IR/success.json
+trans.fi = public/language/fi/success.json
+trans.fr = public/language/fr/success.json
+trans.he = public/language/he/success.json
+trans.hu = public/language/hu/success.json
+trans.it = public/language/it/success.json
+trans.ja = public/language/ja/success.json
+trans.lt = public/language/lt/success.json
+trans.ms = public/language/ms/success.json
+trans.nb = public/language/nb/success.json
+trans.nl = public/language/nl/success.json
+trans.pl = public/language/pl/success.json
+trans.pt_BR = public/language/pt_BR/success.json
+trans.ru = public/language/ru/success.json
+trans.sc = public/language/sc/success.json
+trans.sk = public/language/sk/success.json
+trans.sv = public/language/sv/success.json
+trans.th = public/language/th/success.json
+trans.tr = public/language/tr/success.json
+trans.vi = public/language/vi/success.json
+trans.zh_CN = public/language/zh_CN/success.json
+trans.zh_TW = public/language/zh_TW/success.json
+type = KEYVALUEJSON
+
+[nodebb.error]
+source_file = public/language/en_GB/error.json
+source_lang = en_GB
+trans.ar = public/language/ar/error.json
+trans.cs = public/language/cs/error.json
+trans.de = public/language/de/error.json
+trans.en_US = public/language/en_US/error.json
+trans.en@pirate = public/language/en@pirate/error.json
+trans.es = public/language/es/error.json
+trans.et = public/language/et/error.json
+trans.fa_IR = public/language/fa_IR/error.json
+trans.fi = public/language/fi/error.json
+trans.fr = public/language/fr/error.json
+trans.he = public/language/he/error.json
+trans.hu = public/language/hu/error.json
+trans.it = public/language/it/error.json
+trans.ja = public/language/ja/error.json
+trans.lt = public/language/lt/error.json
+trans.ms = public/language/ms/error.json
+trans.nb = public/language/nb/error.json
+trans.nl = public/language/nl/error.json
+trans.pl = public/language/pl/error.json
+trans.pt_BR = public/language/pt_BR/error.json
+trans.ru = public/language/ru/error.json
+trans.sc = public/language/sc/error.json
+trans.sk = public/language/sk/error.json
+trans.sv = public/language/sv/error.json
+trans.th = public/language/th/error.json
+trans.tr = public/language/tr/error.json
+trans.vi = public/language/vi/error.json
+trans.zh_CN = public/language/zh_CN/error.json
+trans.zh_TW = public/language/zh_TW/error.json
+type = KEYVALUEJSON

NOTES.md

@@ -0,0 +1,15 @@
+## 0.4x Refactor Notes
+
+Please remove this file after 0.4x (or perhaps organize it so that we can see the history of breaking changes)
+
+### Immediate Deprecation Notices
+
+* `action:ajaxifying` is no longer triggered on body but on window instead, in line with other similar hooks.
+* `filter:server.create_routes` and `filter:admin.create_routes` will have limited support (ajaxify works, but first-load will not). Please have a look at [this plugin](https://github.com/psychobunny/nodebb-plugin-kitchen-sink/blob/master/library.js#L16-L22) for an example on how to create routes in plugins from now on.
+
+### Upcoming Deprecation Warnings
+
+* `filter:footer.build` will be deprecated for 0.4x in favour of the widget system (WIP)
+* templates.setGlobal (server-side only) deprecated in favour of using res.locals
+* `plugins/fireHook` route will be deprecated for 0.4x
+* synchronous hooks will be deprecated for 0.4x - we're reducing complexity by removing the `callbacked: true` property in `plugin.json` - just use callbacks.

README.md

@@ -1,56 +1,59 @@
-Please support NodeBB development! Check out our IndieGoGo campaign and like, share, and follow us :)
-[NodeBB Homepage](http://www.nodebb.org/ "NodeBB") # [Follow on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter") # [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
+# <img alt="NodeBB" src="http://i.imgur.com/3yj1n6N.png" />
+[![Build Status](https://travis-ci.org/designcreateplay/NodeBB.svg?branch=master)](https://travis-ci.org/designcreateplay/NodeBB)
+[![Dependency Status](https://david-dm.org/designcreateplay/nodebb.png)](https://david-dm.org/designcreateplay/nodebb)
+[![Code Climate](https://codeclimate.com/github/designcreateplay/NodeBB.png)](https://codeclimate.com/github/designcreateplay/NodeBB)
 
-# 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 Forum Software** is powered by Node.js and built on a Redis database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB is compatible down to IE8 and has many modern features out of the box such as social network integration and streaming discussions.
 
-![NodeBB Main Category Listing](http://imgur.com/BdImzGs.png)
+* [Get NodeBB](http://www.nodebb.org/ "NodeBB")
+* [Demo & Meta Discussion](http://community.nodebb.org)
+* [NodeBB Blog](http://blog.nodebb.org)
+* [Documentation](http://docs.nodebb.org) - includes setup instructions for other platforms
+* [Join us on IRC](https://kiwiirc.com/client/irc.freenode.net/nodebb) - #nodebb on Freenode
+* [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
+* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
+* [Get Plugins](http://community.nodebb.org/category/7/nodebb-plugins "NodeBB Plugins")
+* [Get Themes](http://community.nodebb.org/category/10/nodebb-themes "NodeBB Themes")
+* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
+
+## Screenshots
+
+[<img src="http://i.imgur.com/FLOUuIqb.png" />](http://i.imgur.com/FLOUuIq.png)&nbsp;[<img src="http://i.imgur.com/Ud1LrfIb.png" />](http://i.imgur.com/Ud1LrfI.png)&nbsp;[<img src="http://i.imgur.com/ZC8W39ab.png" />](http://i.imgur.com/ZC8W39a.png)&nbsp;[<img src="http://i.imgur.com/o90kVPib.png" />](http://i.imgur.com/o90kVPi.png)&nbsp;[<img src="http://i.imgur.com/AaRRrU2b.png" />](http://i.imgur.com/AaRRrU2.png)&nbsp;[<img src="http://i.imgur.com/LmHtPhob.png" />](http://i.imgur.com/LmHtPho.png)&nbsp;[<img src="http://i.imgur.com/paiJPJkb.jpg" />](http://i.imgur.com/paiJPJk.jpg)&nbsp;[<img src="http://i.imgur.com/ZfavPHDb.png" />](http://i.imgur.com/ZfavPHD.png)&nbsp;[<img src="http://i.imgur.com/8vc1Ytc.png" />](http://i.imgur.com/8vc1Ytc.png)
+
+
+Credit: [Convoe](http://www.convoe.com), [Kano](http://www.kano.me), [Manchester United Forum](http://manutdforums.com/).
 
-![NodeBB Topic Page](http://imgur.com/Lk7E3KR.png)
 
 ## How can I follow along/contribute?
 
 * 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.
+* If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase.
+* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extention of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
+* Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://community.nodebb.org) to keep up to date with the latest NodeBB development.
 
 ## Requirements
 
-NodeBB requires a version of Node.js at least 0.8 or greater, and a Redis version 2.6 or greater.
+NodeBB requires the following software to be installed:
+
+* A version of Node.js at least 0.10 or greater
+* Redis, version 2.6 or greater **or** MongoDB, version 2.4 or greater
+* nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
 
 ## Installation
 
-First, we install our base software stack:
+[Please refer to platform-specific installation documentation](http://docs.nodebb.org/en/latest/installing/os.html)
 
-	# apt-get install git nodejs redis-server npm build-essential imagemagick
+## Securing NodeBB
 
-**If your package manager only installed a version of Node.js that is less than 0.8 (e.g. Ubuntu 12.10, 13.04):**
+It is important to ensure that your NodeBB and database servers are secured. Bear these points in mind:
 
-	# add-apt-repository ppa:chris-lea/node.js
-	# apt-get update && apt-get dist-upgrade
+1. While some distributions set up Redis with a more restrictive configuration, Redis by default listens to all interfaces, which is especially dangerous when a server is open to the public. Some suggestions:
+    * Set `bind_address` to `127.0.0.1` so as to restrict access  to the local machine only
+    * Use `requirepass` to secure Redis behind a password (preferably a long one)
+    * Familiarise yourself with [Redis Security](http://redis.io/topics/security)
+2. Use `iptables` to secure your server from unintended open ports. In Ubuntu, `ufw` provides a friendlier interface to working with `iptables`.
+    * e.g. If your NodeBB is proxied, no ports should be open except 80 (and possibly 22, for SSH access)
 
-Next, clone this repository:
+## Upgrading NodeBB
 
-	$ cd /path/to/nodebb/install/location
-	$ git clone git://github.com/designcreateplay/NodeBB.git nodebb
-
-Obtain all of the dependencies required by NodeBB:
-
-    $ cd nodebb
-    $ npm install
-
-Initiate the setup script by running the app with the `--setup` flag:
-
-    $ node app --setup
-
-The default settings are for a local server running on the default port, with a redis store on the same machine/port.
-
-Lastly, we run the forum.
-
-    $ node app
-
-NodeBB can also be started with helper programs, such as `supervisor` and `forever`. [Take a look at the options here](https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB).
-
-*(Optional)* Some server configurations may install the node binary as `nodejs` instead of `node`. You can re-map it (so as to not break compatibility with `node-supervisor`) by running the following command:
-
-    # update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10
+Detailed upgrade instructions are listed in [Upgrading NodeBB](https://github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB)

app.js

@@ -16,145 +16,302 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// Configuration setup
-nconf = require('nconf');
-nconf.argv().file({ file: __dirname + '/config.json'});
+
+"use strict";
+/*global require, global, process*/
+
+var nconf = require('nconf');
+nconf.argv().env();
 
 var fs = require('fs'),
+	os = require('os'),
+	semver = require('semver'),
 	winston = require('winston'),
+	path = require('path'),
 	pkg = require('./package.json'),
-	url = require('url'),
-	meta = require('./src/meta.js');
-
-// Runtime environment
-global.env = process.env.NODE_ENV || 'production',
+	utils = require('./public/src/utils.js');
 
 
+global.env = process.env.NODE_ENV || 'production';
 
 winston.remove(winston.transports.Console);
 winston.add(winston.transports.Console, {
-	colorize:true
+	colorize: true
 });
 
 winston.add(winston.transports.File, {
-	filename:'error.log',
-	level:'error'
-})
+	filename: 'logs/error.log',
+	level: 'error'
+});
 
 // TODO: remove once https://github.com/flatiron/winston/issues/280 is fixed
-winston.err = function(err) {
+winston.err = function (err) {
 	winston.error(err.stack);
 };
 
+if(os.platform() === 'linux') {
+	require('child_process').exec('/usr/bin/which convert', function(err, stdout, stderr) {
+		if(err || !stdout) {
+			winston.warn('Couldn\'t find convert. Did you install imagemagick?');
+		}
+	});
+}
+
 // Log GNU copyright info along with server info
-winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013 DesignCreatePlay Inc.');
+winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 DesignCreatePlay Inc.');
 winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
 winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
-winston.info('===');
+winston.info('');
 
+// Alternate configuration file support
+var	configFile = __dirname + '/config.json',
+	configExists;
+if (nconf.get('config')) {
+	configFile = path.resolve(__dirname, nconf.get('config'));
+}
+configExists = fs.existsSync(configFile);
 
-
-if(nconf.get('upgrade')) {
-	meta.configs.init(function() {
-		require('./src/upgrade').upgrade();
-	});
-} else if (!nconf.get('setup') && nconf.get('base_url')) {
-	nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path') + '/');
-	nconf.set('upload_url', nconf.get('url') + 'uploads/');
-
-	winston.info('Initializing NodeBB v' + pkg.version + ', on port ' + nconf.get('port') + ', using Redis store at ' + nconf.get('redis:host') + ':' + nconf.get('redis:port') + '.');
-	winston.info('Base Configuration OK.');
-
-	meta.configs.init(function() {
-		// Initial setup for Redis & Reds
-		var	reds = require('reds');
-		RDB = require('./src/redis.js');
-		reds.createClient = function() {
-			return reds.client || (reds.client = RDB);
-		}
-
-		var categories = require('./src/categories.js'),
-			templates = require('./public/src/templates.js'),
-			webserver = require('./src/webserver.js'),
-			websockets = require('./src/websockets.js'),
-			plugins = require('./src/plugins'),
-			admin = {
-				'categories': require('./src/admin/categories.js')
-			};
-
-		DEVELOPMENT = true;
-
-		global.configuration = {};
-		global.templates = {};
-
-		(function(config) {
-			config['ROOT_DIRECTORY'] = __dirname;
-
-			templates.init([
-				'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index',
-				'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext',
-				'emails/header', 'emails/footer',
-
-				'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic'
-			]);
-
-			templates.ready(webserver.init);
-
-			//setup scripts to be moved outside of the app in future.
-			function setup_categories() {
-				winston.info('Checking categories...');
-				categories.getAllCategories(function(data) {
-					if (data.categories.length === 0) {
-						winston.info('Setting up default categories...');
-
-						fs.readFile(config.ROOT_DIRECTORY + '/install/data/categories.json', function(err, default_categories) {
-							default_categories = JSON.parse(default_categories);
-
-							for (var category in default_categories) {
-								admin.categories.create(default_categories[category]);
-							}
-						});
-
-
-						winston.info('Hardcoding uid 1 as an admin');
-						var user = require('./src/user.js');
-						user.makeAdministrator(1);
-
-
-					} else {
-						winston.info('Categories OK. Found ' + data.categories.length + ' categories.');
-					}
-				});
-			}
-
-			setup_categories();
-		}(global.configuration));
-	});
-
+if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
+	start();
+} else if (nconf.get('setup') || nconf.get('install') || !configExists) {
+	setup();
+} else if (nconf.get('upgrade')) {
+	upgrade();
+} else if (nconf.get('reset')) {
+	reset();
 } else {
-	// New install, ask setup questions
-	if (nconf.get('setup')) winston.info('NodeBB Setup Triggered via Command Line');
-	else winston.info('Configuration not found, starting NodeBB setup');
+	displayHelp();
+}
 
-	var	install = require('./src/install');
+function loadConfig() {
+	nconf.file({
+		file: configFile
+	});
 
-	process.stdout.write(
-		"\nWelcome to NodeBB!\nThis looks like a new installation, so you'll have to answer a " +
-		"few questions about your environment before we can proceed.\n\n" +
-		"Press enter to accept the default setting (shown in brackets).\n\n\n"
-	);
+	nconf.defaults({
+		base_dir: __dirname,
+		themes_path: path.join(__dirname, 'node_modules'),
+		upload_url: '/uploads/',
+		views_dir: path.join(__dirname, 'public/templates')
+	});
 
-	install.setup(function(err) {
+	// Ensure themes_path is a full filepath
+	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
+	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
+}
+
+function start() {
+	loadConfig();
+
+	winston.info('Time: ' + new Date());
+	winston.info('Initializing NodeBB v' + pkg.version);
+	winston.info('* using configuration stored in: ' + configFile);
+	var host = nconf.get(nconf.get('database') + ':host'),
+		storeLocation = host ? 'at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : '') : '';
+
+	winston.info('* using ' + nconf.get('database') +' store ' + storeLocation);
+	winston.info('* using themes stored in: ' + nconf.get('themes_path'));
+
+	if (process.env.NODE_ENV === 'development') {
+		winston.info('Base Configuration OK.');
+	}
+
+	var meta = require('./src/meta');
+
+	require('./src/database').init(function(err) {
+		meta.configs.init(function () {
+			var templates = require('./public/src/templates'),
+				webserver = require('./src/webserver'),
+				sockets = require('./src/socket.io'),
+				plugins = require('./src/plugins'),
+				upgrade = require('./src/upgrade')
+				meta = require('./src/meta');
+
+			templates.setGlobal('relative_path', nconf.get('relative_path'));
+
+			upgrade.check(function(schema_ok) {
+				if (schema_ok || nconf.get('check-schema') === false) {
+					sockets.init(webserver.server);
+					plugins.init();
+
+					nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
+
+					plugins.ready(function() {
+						webserver.init();
+					});
+
+					process.on('SIGTERM', shutdown);
+					process.on('SIGINT', shutdown);
+					process.on('SIGHUP', restart);
+					process.on('uncaughtException', function(err) {
+						winston.error(err.message);
+						console.log(err.stack);
+
+						meta.js.killMinifier();
+						shutdown(1);
+					})
+				} else {
+					winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
+					winston.warn('    node app --upgrade');
+					winston.warn('To ignore this error (not recommended):');
+					winston.warn('    node app --no-check-schema');
+					process.exit();
+				}
+			});
+		});
+	});
+}
+
+function setup() {
+	loadConfig();
+
+	if (nconf.get('setup')) {
+		winston.info('NodeBB Setup Triggered via Command Line');
+	} else {
+		winston.warn('Configuration not found, starting NodeBB setup');
+	}
+
+	var install = require('./src/install');
+
+	winston.info('Welcome to NodeBB!');
+	winston.info('This looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.');
+	winston.info('Press enter to accept the default setting (shown in brackets).');
+
+	install.setup(function (err) {
 		if (err) {
 			winston.error('There was a problem completing NodeBB setup: ', err.message);
 		} else {
-			if (!nconf.get('setup')) {
-				process.stdout.write(
-					"Please start NodeBB again and register a new user. This user will automatically become an administrator.\n\n"
-				);
-			}
+			winston.info('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.');
 		}
 
 		process.exit();
 	});
-}
+}
+
+function upgrade() {
+	loadConfig();
+
+	var meta = require('./src/meta');
+
+	require('./src/database').init(function(err) {
+		meta.configs.init(function () {
+			require('./src/upgrade').upgrade();
+		});
+	});
+}
+
+function reset() {
+	loadConfig();
+
+	require('./src/database').init(function(err) {
+		if (err) {
+			winston.error(err.message);
+			process.exit();
+		}
+
+		if (nconf.get('themes')) {
+			resetThemes();
+		} else if (nconf.get('plugins')) {
+			resetPlugins();
+		} else if (nconf.get('widgets')) {
+			resetWidgets();
+		} else if (nconf.get('settings')) {
+			resetSettings();
+		} else if (nconf.get('all')) {
+			require('async').series([resetWidgets, resetThemes, resetPlugins, resetSettings], function(err) {
+				if (!err) {
+					winston.info('[reset] Reset complete.');
+				} else {
+					winston.error('[reset] Errors were encountered while resetting your forum settings: ' + err.message);
+				}
+				process.exit();
+			});
+		} else {
+			console.log('no match');
+		}
+	});
+}
+
+function resetSettings(callback) {
+	var meta = require('./src/meta');
+	meta.configs.set('allowLocalLogin', 1, function(err) {
+		winston.info('[reset] Settings reset to default');
+		if (typeof callback === 'function') {
+			callback(err);
+		} else {
+			process.exit();
+		}
+	});
+}
+
+function resetThemes(callback) {
+	var meta = require('./src/meta');
+
+	meta.themes.set({
+		type: 'local',
+		id: 'nodebb-theme-vanilla'
+	}, function(err) {
+		winston.info('[reset] Theme reset to Vanilla');
+		if (typeof callback === 'function') {
+			callback(err);
+		} else {
+			process.exit();
+		}
+	});
+}
+
+function resetPlugins(callback) {
+	var db = require('./src/database');
+	db.delete('plugins:active', function(err) {
+		winston.info('[reset] All Plugins De-activated');
+		if (typeof callback === 'function') {
+			callback(err);
+		} else {
+			process.exit();
+		}
+	});
+}
+
+function resetWidgets(callback) {
+	require('./src/widgets').reset(function(err) {
+		winston.info('[reset] All Widgets moved to Draft Zone');
+		if (typeof callback === 'function') {
+			callback(err);
+		} else {
+			process.exit();
+		}
+	});
+}
+
+function shutdown(code) {
+	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
+	require('./src/database').close();
+	winston.info('[app] Database connection closed.');
+
+	winston.info('[app] Shutdown complete.');
+	process.exit(code || 0);
+}
+
+function restart() {
+	if (process.send) {
+		winston.info('[app] Restarting...');
+		process.send({
+			action: 'restart'
+		});
+	} else {
+		winston.error('[app] Could not restart server. Shutting down.');
+		shutdown(1);
+	}
+}
+
+function displayHelp() {
+	winston.info('Usage: node app [options] [arguments]');
+	winston.info('       [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]');
+	winston.info('');
+	winston.info('Options:');
+	winston.info('  --help              displays this usage information');
+	winston.info('  --setup             configure your environment and setup NodeBB');
+	winston.info('  --upgrade           upgrade NodeBB, first read: github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB');
+	winston.info('  --reset             soft resets NodeBB; disables all plugins and restores selected theme to Vanilla');
+	winston.info('  --start             manually start NodeBB (default when no options are given)');
+}

docs/.gitignore

@@ -0,0 +1,4 @@
+*.sublime-build*
+_build
+_static
+_templates

docs/Makefile

@@ -0,0 +1,177 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/NodeBB.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/NodeBB.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/NodeBB"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/NodeBB"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

docs/_themes/sphinx_rtd_theme/__init__.py

@@ -0,0 +1,17 @@
+"""Sphinx ReadTheDocs theme.
+
+From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
+
+"""
+import os
+
+VERSION = (0, 1, 5)
+
+__version__ = ".".join(str(v) for v in VERSION)
+__version_full__ = __version__
+
+
+def get_html_theme_path():
+    """Return list of HTML theme paths."""
+    cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+    return cur_dir

docs/_themes/sphinx_rtd_theme/breadcrumbs.html

@@ -0,0 +1,19 @@
+<div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
+      {% for doc in parents %}
+          <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
+      {% endfor %}
+    <li>{{ title }}</li>
+      <li class="wy-breadcrumbs-aside">
+        {% if display_github %}
+          <a href="https://github.com/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-github"> Edit on GitHub</a>
+        {% elif display_bitbucket %}
+          <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
+        {% elif show_source and has_source and sourcename %}
+          <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
+        {% endif %}
+      </li>
+  </ul>
+  <hr/>
+</div>

docs/_themes/sphinx_rtd_theme/footer.html

@@ -0,0 +1,32 @@
+<footer>
+  {% if next or prev %}
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      {% if next %}
+        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}">Next <span class="fa fa-arrow-circle-right"></span></a>
+      {% endif %}
+      {% if prev %}
+        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      {% endif %}
+    </div>
+  {% endif %}
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+    {%- if show_copyright %}
+      {%- if hasdoc('copyright') %}
+        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
+      {%- else %}
+        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
+      {%- endif %}
+    {%- endif %}
+
+    {%- if last_updated %}
+      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
+    {%- endif %}
+    </p>
+  </div>
+
+  {% trans %}<a href="https://github.com/snide/sphinx_rtd_theme">Sphinx theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}
+</footer>

docs/_themes/sphinx_rtd_theme/layout.html

@@ -0,0 +1,160 @@
+{# TEMPLATE VAR SETTINGS #}
+{%- set url_root = pathto('', 1) %}
+{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
+{%- if not embedded and docstitle %}
+  {%- set titlesuffix = " — "|safe + docstitle|e %}
+{%- else %}
+  {%- set titlesuffix = "" %}
+{%- endif %}
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  {% block htmltitle %}
+  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
+  {% endblock %}
+
+  {# FAVICON #}
+  {% if favicon %}
+    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
+  {% endif %}
+
+  {# CSS #}
+  <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
+
+  {# OPENSEARCH #}
+  {% if not embedded %}
+    {% if use_opensearch %}
+      <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
+    {% endif %}
+
+  {% endif %}
+
+  {# RTD hosts this file, so just load on non RTD builds #}
+  {% if not READTHEDOCS %}
+    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+  {% endif %}
+
+  {% for cssfile in css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+  {% endfor %}
+
+  {%- block linktags %}
+    {%- if hasdoc('about') %}
+        <link rel="author" title="{{ _('About these documents') }}"
+              href="{{ pathto('about') }}"/>
+    {%- endif %}
+    {%- if hasdoc('genindex') %}
+        <link rel="index" title="{{ _('Index') }}"
+              href="{{ pathto('genindex') }}"/>
+    {%- endif %}
+    {%- if hasdoc('search') %}
+        <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}"/>
+    {%- endif %}
+    {%- if hasdoc('copyright') %}
+        <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}"/>
+    {%- endif %}
+    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}"/>
+    {%- if parents %}
+        <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}"/>
+    {%- endif %}
+    {%- if next %}
+        <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}"/>
+    {%- endif %}
+    {%- if prev %}
+        <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}"/>
+    {%- endif %}
+  {%- endblock %}
+  {%- block extrahead %} {% endblock %}
+
+  {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    {# SIDE NAV, TOGGLES ON MOBILE #}
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        <a href="{{ pathto(master_doc) }}" class="fa fa-home"> {{ project }}</a>
+        {% include "searchbox.html" %}
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        {% set toctree = toctree(maxdepth=2, collapse=False, includehidden=True) %}
+        {% if toctree %}
+            {{ toctree }}
+        {% else %}
+            <!-- Local TOC -->
+            <div class="local-toc">{{ toc }}</div>
+        {% endif %}
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="{{ pathto(master_doc) }}">{{ project }}</a>
+      </nav>
+
+
+      {# PAGE CONTENT #}
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          {% include "breadcrumbs.html" %}
+          <div role="main">
+            {% block body %}{% endblock %}
+          </div>
+          {% include "footer.html" %}
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  {% include "versions.html" %}
+
+  {% if not embedded %}
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'{{ url_root }}',
+            VERSION:'{{ release|e }}',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
+            HAS_SOURCE:  {{ has_source|lower }}
+        };
+    </script>
+    {%- for scriptfile in script_files %}
+      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+    {%- endfor %}
+
+  {% endif %}
+
+  {# RTD hosts this file, so just load on non RTD builds #}
+  {% if not READTHEDOCS %}
+    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
+  {% endif %}
+
+  {# STICKY NAVIGATION #}
+  {% if theme_sticky_navigation %}
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+  {% endif %}
+
+  {%- block footer %} {% endblock %}
+
+</body>
+</html>

docs/_themes/sphinx_rtd_theme/layout_old.html

@@ -0,0 +1,205 @@
+{#
+    basic/layout.html
+    ~~~~~~~~~~~~~~~~~
+
+    Master layout template for Sphinx themes.
+
+    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- block doctype -%}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+{%- endblock %}
+{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
+{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
+{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
+                         (sidebars != []) %}
+{%- set url_root = pathto('', 1) %}
+{# XXX necessary? #}
+{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
+{%- if not embedded and docstitle %}
+  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
+{%- else %}
+  {%- set titlesuffix = "" %}
+{%- endif %}
+
+{%- macro relbar() %}
+    <div class="related">
+      <h3>{{ _('Navigation') }}</h3>
+      <ul>
+        {%- for rellink in rellinks %}
+        <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
+          <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
+             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
+          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
+        {%- endfor %}
+        {%- block rootrellink %}
+        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
+        {%- endblock %}
+        {%- for parent in parents %}
+          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
+        {%- endfor %}
+        {%- block relbaritems %} {% endblock %}
+      </ul>
+    </div>
+{%- endmacro %}
+
+{%- macro sidebar() %}
+      {%- if render_sidebar %}
+      <div class="sphinxsidebar">
+        <div class="sphinxsidebarwrapper">
+          {%- block sidebarlogo %}
+          {%- if logo %}
+            <p class="logo"><a href="{{ pathto(master_doc) }}">
+              <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+            </a></p>
+          {%- endif %}
+          {%- endblock %}
+          {%- if sidebars != None %}
+            {#- new style sidebar: explicitly include/exclude templates #}
+            {%- for sidebartemplate in sidebars %}
+            {%- include sidebartemplate %}
+            {%- endfor %}
+          {%- else %}
+            {#- old style sidebars: using blocks -- should be deprecated #}
+            {%- block sidebartoc %}
+            {%- include "localtoc.html" %}
+            {%- endblock %}
+            {%- block sidebarrel %}
+            {%- include "relations.html" %}
+            {%- endblock %}
+            {%- block sidebarsourcelink %}
+            {%- include "sourcelink.html" %}
+            {%- endblock %}
+            {%- if customsidebar %}
+            {%- include customsidebar %}
+            {%- endif %}
+            {%- block sidebarsearch %}
+            {%- include "searchbox.html" %}
+            {%- endblock %}
+          {%- endif %}
+        </div>
+      </div>
+      {%- endif %}
+{%- endmacro %}
+
+{%- macro script() %}
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '{{ url_root }}',
+        VERSION:     '{{ release|e }}',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
+        HAS_SOURCE:  {{ has_source|lower }}
+      };
+    </script>
+    {%- for scriptfile in script_files %}
+    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro css() %}
+    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+    {%- for cssfile in css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+    {%- endfor %}
+{%- endmacro %}
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
+    {{ metatags }}
+    {%- block htmltitle %}
+    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
+    {%- endblock %}
+    {{ css() }}
+    {%- if not embedded %}
+    {{ script() }}
+    {%- if use_opensearch %}
+    <link rel="search" type="application/opensearchdescription+xml"
+          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
+          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
+    {%- endif %}
+    {%- if favicon %}
+    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
+    {%- endif %}
+    {%- endif %}
+{%- block linktags %}
+    {%- if hasdoc('about') %}
+    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
+    {%- endif %}
+    {%- if hasdoc('genindex') %}
+    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
+    {%- endif %}
+    {%- if hasdoc('search') %}
+    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
+    {%- endif %}
+    {%- if hasdoc('copyright') %}
+    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
+    {%- endif %}
+    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
+    {%- if parents %}
+    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
+    {%- endif %}
+    {%- if next %}
+    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
+    {%- endif %}
+    {%- if prev %}
+    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
+    {%- endif %}
+{%- endblock %}
+{%- block extrahead %} {% endblock %}
+  </head>
+  <body>
+{%- block header %}{% endblock %}
+
+{%- block relbar1 %}{{ relbar() }}{% endblock %}
+
+{%- block content %}
+  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
+
+    <div class="document">
+  {%- block document %}
+      <div class="documentwrapper">
+      {%- if render_sidebar %}
+        <div class="bodywrapper">
+      {%- endif %}
+          <div class="body">
+            {% block body %} {% endblock %}
+          </div>
+      {%- if render_sidebar %}
+        </div>
+      {%- endif %}
+      </div>
+  {%- endblock %}
+
+  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
+      <div class="clearer"></div>
+    </div>
+{%- endblock %}
+
+{%- block relbar2 %}{{ relbar() }}{% endblock %}
+
+{%- block footer %}
+    <div class="footer">
+    {%- if show_copyright %}
+      {%- if hasdoc('copyright') %}
+        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
+      {%- else %}
+        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
+      {%- endif %}
+    {%- endif %}
+    {%- if last_updated %}
+      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
+    {%- endif %}
+    {%- if show_sphinx %}
+      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+    {%- endif %}
+    </div>
+    <p>asdf asdf asdf asdf 22</p>
+{%- endblock %}
+  </body>
+</html>
+

docs/_themes/sphinx_rtd_theme/search.html

@@ -0,0 +1,50 @@
+{#
+    basic/search.html
+    ~~~~~~~~~~~~~~~~~
+
+    Template for the search page.
+
+    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- extends "layout.html" %}
+{% set title = _('Search') %}
+{% set script_files = script_files + ['_static/searchtools.js'] %}
+{% block footer %}
+  <script type="text/javascript">
+    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
+  </script>
+  {# this is used when loading the search index using $.ajax fails,
+     such as on Chrome for documents on localhost #}
+  <script type="text/javascript" id="searchindexloader"></script>
+  {{ super() }}
+{% endblock %}
+{% block body %}
+  <noscript>
+  <div id="fallback" class="admonition warning">
+    <p class="last">
+      {% trans %}Please activate JavaScript to enable the search
+      functionality.{% endtrans %}
+    </p>
+  </div>
+  </noscript>
+
+  {% if search_performed %}
+    <h2>{{ _('Search Results') }}</h2>
+    {% if not search_results %}
+      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
+    {% endif %}
+  {% endif %}
+  <div id="search-results">
+  {% if search_results %}
+    <ul>
+    {% for href, caption, context in search_results %}
+      <li>
+        <a href="{{ pathto(item.href) }}">{{ caption }}</a>
+        <p class="context">{{ context|e }}</p>
+      </li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  </div>
+{% endblock %}

docs/_themes/sphinx_rtd_theme/searchbox.html

@@ -0,0 +1,7 @@
+<div role="search">
+  <form id ="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>

docs/_themes/sphinx_rtd_theme/static/css/badge_only.css

@@ -0,0 +1 @@
+.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:"\f02d"}.icon-book:before{content:"\f02d"}.fa-caret-down:before{content:"\f0d7"}.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}

docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg

@@ -280,8 +280,8 @@
 <glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
 <glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
 <glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
+<glyph unicode="&#xf116;" horiz-adv-x="1792" />
+<glyph unicode="&#xf117;" horiz-adv-x="1792" />
 <glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -310,7 +310,7 @@
 <glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
 <glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1708 881l-188 -881h-304l181 849q4 21 1 43q-4 20 -16 35q-10 14 -28 24q-18 9 -40 9h-197l-205 -960h-303l204 960h-304l-205 -960h-304l272 1280h1139q157 0 245 -118q86 -116 52 -281z" />
+<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
 <glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -342,7 +342,7 @@
 <glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
 <glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
 <glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1664" d="M1664 352v-32q0 -132 -94 -226t-226 -94h-128q-132 0 -226 94t-94 226v480h-224q-2 -102 -14.5 -190.5t-30.5 -156t-48.5 -126.5t-57 -99.5t-67.5 -77.5t-69.5 -58.5t-74 -44t-69 -32t-65.5 -25.5q-4 -2 -32 -13q-8 -2 -12 -2q-22 0 -30 20l-71 178q-5 13 0 25t17 17 q7 3 20 7.5t18 6.5q31 12 46.5 18.5t44.5 20t45.5 26t42 32.5t40.5 42.5t34.5 53.5t30.5 68.5t22.5 83.5t17 103t6.5 123h-256q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h1216q14 0 23 -9t9 -23v-160q0 -14 -9 -23t-23 -9h-224v-512q0 -26 19 -45t45 -19h128q26 0 45 19t19 45 v64q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1280 1376v-160q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h960q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
 <glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
 <glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
 <glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
@@ -390,10 +390,25 @@
 <glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
 <glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
 <glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" horiz-adv-x="1920" d="M805 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM453 1176v-344q0 -179 -89.5 -326t-234.5 -217q-129 152 -129 351q0 200 129.5 352t323.5 184zM958 991q-128 -152 -128 -351q0 -201 128 -351q-145 70 -234.5 218t-89.5 328 v341q196 -33 324 -185zM1638 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM1286 1176v-344q0 -179 -91 -326t-237 -217v0q133 154 133 351q0 195 -133 351q129 151 328 185zM1920 640q0 -201 -129 -351q-145 70 -234.5 218 t-89.5 328v341q194 -32 323.5 -184t129.5 -352z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf18e;" horiz-adv-x="1792" />
+<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
+<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf197;" horiz-adv-x="1792" />
+<glyph unicode="&#xf198;" horiz-adv-x="1792" />
+<glyph unicode="&#xf199;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19a;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19b;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19c;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19d;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19e;" horiz-adv-x="1792" />
 <glyph unicode="&#xf500;" horiz-adv-x="1792" />
 </font>
 </defs></svg> 

docs/_themes/sphinx_rtd_theme/static/js/theme.js

@@ -0,0 +1,47 @@
+$( document ).ready(function() {
+    // Shift nav in mobile when clicking the menu.
+    $(document).on('click', "[data-toggle='wy-nav-top']", function() {
+      $("[data-toggle='wy-nav-shift']").toggleClass("shift");
+      $("[data-toggle='rst-versions']").toggleClass("shift");
+    });
+    // Close menu when you click a link.
+    $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
+      $("[data-toggle='wy-nav-shift']").removeClass("shift");
+      $("[data-toggle='rst-versions']").toggleClass("shift");
+    });
+    $(document).on('click', "[data-toggle='rst-current-version']", function() {
+      $("[data-toggle='rst-versions']").toggleClass("shift-up");
+    });  
+    // Make tables responsive
+    $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
+});
+
+window.SphinxRtdTheme = (function (jquery) {
+    var stickyNav = (function () {
+        var navBar,
+            win,
+            stickyNavCssClass = 'stickynav',
+            applyStickNav = function () {
+                if (navBar.height() <= win.height()) {
+                    navBar.addClass(stickyNavCssClass);
+                } else {
+                    navBar.removeClass(stickyNavCssClass);
+                }
+            },
+            enable = function () {
+                applyStickNav();
+                win.on('resize', applyStickNav);
+            },
+            init = function () {
+                navBar = jquery('nav.wy-nav-side:first');
+                win    = jquery(window);
+            };
+        jquery(init);
+        return {
+            enable : enable
+        };
+    }());
+    return {
+        StickyNav : stickyNav
+    };
+}($));

docs/_themes/sphinx_rtd_theme/theme.conf

@@ -0,0 +1,8 @@
+[theme]
+inherit = basic
+stylesheet = css/theme.css
+
+[options]
+typekit_id = hiw1hhg
+analytics_id = 
+sticky_navigation = False

docs/_themes/sphinx_rtd_theme/versions.html

@@ -0,0 +1,37 @@
+{% if READTHEDOCS %}
+{# Add rst-badge after rst-versions for small badge style. #}
+  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+    <span class="rst-current-version" data-toggle="rst-current-version">
+      <span class="fa fa-book"> Read the Docs</span>
+      v: {{ current_version }}
+      <span class="fa fa-caret-down"></span>
+    </span>
+    <div class="rst-other-versions">
+      <dl>
+        <dt>Versions</dt>
+        {% for slug, url in versions %}
+          <dd><a href="{{ url }}">{{ slug }}</a></dd>
+        {% endfor %}
+      </dl>
+      <dl>
+        <dt>Downloads</dt>
+        {% for type, url in downloads %}
+          <dd><a href="{{ url }}">{{ type }}</a></dd>
+        {% endfor %}
+      </dl>
+      <dl>
+        <dt>On Read the Docs</dt>
+          <dd>
+            <a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/?fromdocs={{ slug }}">Project Home</a>
+          </dd>
+          <dd>
+            <a href="//{{ PRODUCTION_DOMAIN }}/builds/{{ slug }}/?fromdocs={{ slug }}">Builds</a>
+          </dd>
+      </dl>
+      <hr/>
+      Free document hosting provided by <a href="http://www.readthedocs.org">Read the Docs</a>.
+
+    </div>
+  </div>
+{% endif %}
+

docs/admin/outline.rst

@@ -0,0 +1,140 @@
+Administrative Functions
+========================
+
+.. note::
+
+    These docs are out of date. If you are interested in updating these (preferably with screenshots) let us know on the `community forum <https://community.nodebb.org>`_ because we are planning on a design overhaul of the ACP soon.
+
+
+**To view the admin panel** (if you are an admin): `http://your_nodebb_domain.com/admin`
+
+**Top Menu** (all can be easily reached by other means)
+  * NodeBB ACP (Administrator Control Panel: this view)
+    * `http://your_nodebb_domain.com/admin/index` (see Home below)
+  * Forum
+    * `http://your_nodebb_domain.com` (your main forum)
+  * Home
+    * `http://your_nodebb_domain.com/admin/index` (see Home below)
+  * Settings
+    * `http://your_nodebb_domain.com/admin/settings` (see Settings below)
+
+**Side Menu: NodeBB**
+  * Home
+    * `http://your_nodebb_domain.com/admin/index`
+    * Links all go to nodebb.com homepage
+      * NOTE: should all the links go to same place? 
+    * Message reminder of what version this is and to check for updates (See :doc:`Upgrading NodeBB <../upgrading/index>`)
+      * NOTE: would a link to where the latest stable version is help?
+    * Active Users
+      * lists number users per page-path (?)
+      * NOTE: not clear exactly what the paths mean or how to visit that path
+
+
+  * Categories
+    * `http://your_nodebb_domain.com/admin/categories`
+    * Filters: Active, Disabled, Unit Tests
+    * List of Categories:
+      * Icon, Name, Desc, Action: Disable
+    * Actions: Save, Add New
+
+  * Users
+    * `http://your_nodebb_domain.com/admin/users`
+    * Filters: Latest Users, Top Posters, Most Reputation, Action: Search
+    * List of Users:
+      * Icon, Link: Name, Reputation(star), Number Posts(pencil), Action: Ban
+    * Action: Load More
+
+  * Groups
+    * `http://your_nodebb_domain.com/admin/groups`
+     * List of Groups
+      * Name, Desc, Icon
+    * Action: Delete Group
+      * NOTE: What exactly can Groups be set up to do, besides Admin?
+  
+  * Topics
+    * `http://your_nodebb_domain.com/admin/topics`
+    * List of Topics
+      * Name [link to topic], Posted When and By, Number posts (Topic+Replies), Thread Actions: Pin(pushpin), Lock(lock), Delete(trashcan)
+    * Action: Load More Topics
+
+    * Topic [from List of Topics link]
+    * Normal View of Topic+Reply Posts but with: 
+      * Link, Edit, Delete Actions all enabled for each Post
+      * Thread Tools:
+        * Pin, Lock, Move, Delete
+
+  * Themes (See :doc:`Theming NodeBB <../themes/create>`)
+    * `http://your_nodebb_domain.com/admin/themes`
+    * List of (Custom | Bootswatch) Themes 
+      * Actions: Use, Preview
+    * Action: Revert (to base)
+
+  * Plugins (See :doc:`Writing Plugins for NodeBB <../plugins/create>`)
+    * `http://your_nodebb_domain.com/admin/plugins`
+    * List of Plugins
+      * Action: De/activate
+    * Info on making plugins
+
+  * Settings
+    * `http://your_nodebb_domain.com/admin/settings`
+
+    * General Settings
+      * (textbox) Site Title 	
+      * (textbox) Site Description 
+      * (textbox) Site Keywords 
+      * (textbox) Imgur Client ID 
+        * NOTE: How does this function?
+      * (textbox) Maximum User Image Size
+
+    * Privilege Thresholds (Use privilege thresholds to manage how much reputation a user must gain to receive moderator access.)
+      * (textbox) Manage Thread
+      * (textbox) Moderate Users
+      * (textbox) Create Pinned Topics
+	
+    * Email Settings
+      * (textbox) Email Address (The following email address refers to the email that the recipient will see in the "From" and "Reply To" fields.)
+      * (textbox) SMTP Server Host (Default: 127.0.0.1)
+      * (textbox) SMTP Server Port
+
+    * User Settings
+      * (textbox) Minimum Username Length
+      * (textbox) Maximum Username Length
+      * (textbox) Minimum Password Length
+
+    * Post Settings
+      * (textbox) Post Delay
+      * (textbox) Minimum Title Length
+      * (textbox) Minimum Post Length
+      * (checkbox) Use Outgoing Links Warning Page 
+
+    * Action: Save
+
+  * Redis
+    * `http://your_nodebb_domain.com/admin/redis`
+    * Redis data storage stats
+
+  * Logger
+    * `http://your_nodebb_domain.com/admin/logger`
+    * (checkbox) Enable HTTP logging  
+    * (checkbox) Enable socket.io event logging  
+    * (textbox) Path to log file
+
+  * MOTD (Message of the Day)
+    * `http://your_nodebb_domain.com/admin/motd`
+    * (textarea) You can enter either full HTML or Markdown text.
+    * (checkbox) Show the Message of the Day
+
+**Side Menu: Social Authentication** (See :doc:`Enabling Social Network Logins <../admin/sso>`)
+
+  * Twitter
+  * `http://your_nodebb_domain.com/admin/twitter`
+
+  * Facebook
+  * `http://your_nodebb_domain.com/admin/facebook`
+
+  * Google+
+  * `http://your_nodebb_domain.com/admin/gplus`
+
+**Side Menu: Plugins** (Shows installed plugins)
+
+**Side Menu: Unit Tests** (Will run qunit tests)

docs/admin/sso.rst

@@ -0,0 +1,45 @@
+Social Network SSOs
+==================
+
+NodeBB supports integration for Facebook, Twitter, and Google through third party plugins:
+
+* `npm install nodebb-plugin-sso-facebook`
+* `npm install nodebb-plugin-sso-twitter`
+* `npm install nodebb-plugin-sso-google`
+
+Other SSO vendors are available, such as GitHub. Please check the `plugin directory <http://community.nodebb.org/category/7/nodebb-plugins>`_ for a list of all SSO vendors.
+
+After installing and activating them, they require an API key in order to function:
+
+Facebook
+---------
+
+Register an application via the `Facebook Developers <https://developers.facebook.com/>`_ page. A credit card  or mobile phone number may be required in order to create a Developer account.
+
+Create a new application, and obtain an Application Key and Application Secret:
+
+.. image:: http://i.imgur.com/hfy0eVo.png
+
+Ensure that "Website with Facebook Login" is checked, and that the URL to your NodeBB instance is specified in the "Site URL" box. Add that site's domain to the "App Domains" field.
+
+Paste this key and secret into the appropriate boxes in the NodeBB Administration Panel (accessible via /admin on your NodeBB install)
+
+Twitter
+---------
+
+Register an application at the `Twitter Developers <https://dev.twitter.com/>`_ page. Create a new Application, and obtain the Access Token and Secret:
+
+.. image:: http://i.imgur.com/ksrHkgN.png
+
+**Important**: While setting up your application, be sure to specify a Callback URL. It does not have to correspond to your installation, it just cannot be blank.
+
+Paste this token and secret into the appropriate boxes in the NodeBB Administration Panel (accessible via /admin on your NodeBB install)
+
+Google
+---------
+
+Register an application at the `Google API Console <https://code.google.com/apis/console/>`_, and obtain a Client ID and Secret.
+
+.. image:: http://i.imgur.com/xutDs1R.png
+
+Paste this ID and secret into the appropriate boxes in the NodeBB Administration Panel (accessible via /admin on your NodeBB install)

docs/admin/uploads.rst

@@ -0,0 +1,33 @@
+Image Hosting APIs
+======================
+
+
+Enabling Imgur Image Uploads
+----------------------------
+
+To enable post image attachments, first create an imgur app from :
+
+https://api.imgur.com/oauth2/addclient
+
+You can use : "Anonymous usage without user authorization"
+
+After that you will get a "Client ID". 
+
+Then install nodebb-plugin-imgur:
+
+.. code::
+	
+	npm install nodebb-plugin-imgur
+
+Activate the plugin from the control panel and restart NodeBB.
+
+You should see a Imgur menu item in the control panel. Paste the Client ID to the "Imgur Client ID" in the plugin page. Save and you should be able to upload images by dragging them into the composer window.
+
+
+
+Uploading to Amazon S3
+-----------------------
+
+.. note:: 
+
+	No documentation for this yet! See `the plugin thread <https://community.nodebb.org/topic/796/nodebb-plugin-s3-uploads-store-your-uploads-in-aws-s3>`_ for more information.

docs/conf.py

@@ -0,0 +1,258 @@
+# -*- coding: utf-8 -*-
+#
+# NodeBB documentation build configuration file, created by
+# sphinx-quickstart on Thu Apr 24 15:55:18 2014.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'NodeBB'
+copyright = u'2014, NodeBB'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.4.1'
+# The full version, including alpha/beta/rc tags.
+release = '0.4.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = "sphinx_rtd_theme"
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+html_theme_path = ["_themes", ]
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'NodeBBdoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+  ('index', 'NodeBB.tex', u'NodeBB Documentation',
+   u'psychobunny, julianlam, barisusakli', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'nodebb', u'NodeBB Documentation',
+     [u'psychobunny, julianlam, barisusakli'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'NodeBB', u'NodeBB Documentation',
+   u'psychobunny, julianlam, barisusakli', 'NodeBB', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False

docs/configuring/databases.rst

@@ -0,0 +1,39 @@
+Configuring Databases
+=====================
+
+NodeBB has a Database Abstraction Layer (DBAL) that allows one to write  drivers for their database of choice. Currently we have the following options:
+
+.. toctree::
+    :hidden:
+    :maxdepth: 0
+
+    MongoDB <databases/mongo>
+    LevelDB <databases/level>
+
+* Redis (default, see :doc:`installation guides <../installing/os>`)
+* :doc:`Mongo <databases/mongo>`
+* :doc:`Level <databases/level>`
+
+.. note::
+
+    If you would like to write your own database driver for NodeBB, please visit our `community forum <https://community.nodebb.org>`_ and we can point you in the right direction.
+
+
+Running a Secondary Database
+----------------------------
+
+
+.. warning::
+
+    **This option is experimental and should not be used on a production environment.**
+
+
+Both databases **must** be flushed before beginning - there isn't a mechanism yet that detects an existing installation on one database but not another. Until fail-safe's such as these are implemented this option is hidden under the ``--advanced`` setup flag.
+
+.. code:: bash
+
+    node app --setup --advanced
+
+Consult the other database guides for instructions on how to set up each specific database. Once you select a secondary database's modules, there's no turning back - until somebody writes an exporter/importer.
+
+Currently this setup is being tested with Redis as the primary store (sets, lists, and sorted sets, because Redis is super fast with these), and Mongo as the hash store (post and user data, because ideally we wouldn't want this in RAM).

docs/configuring/databases/level.rst

@@ -0,0 +1,19 @@
+LevelDB
+=======
+
+Follow the :doc:`installation instructions <../../installing/os>` for your particular OS but feel free to omit the Redis installation.
+
+After cloning NodeBB, ensure that you run:
+
+.. code::
+
+    npm install levelup leveldown
+
+
+Finally, set up a directory to store your LevelDB database, for example:
+
+.. code::
+
+    mkdir /var/level/
+
+Run the NodeBB install, select ``level`` when it prompts you for your database. If you created the folder as above, you can leave the rest of the questions as default.

docs/configuring/databases/mongo.rst

@@ -0,0 +1,126 @@
+MongoDB
+=======
+
+If you're afraid of running out of memory by using Redis, or want your forum to be more easily scalable, you can install NodeBB with MongoDB. This tutorial assumes you know how to SSH into your server and have root access.
+
+**These instructions are for Ubuntu. Adjust them accordingly for your distro.**
+
+**Note:** If you have to add ``sudo`` to any command, do so. No one is going to hold it against you ;)
+
+Step 1: Install MongoDB
+-------------------------
+
+The latest and greatest MongoDB is required (or at least greater than the package manager). The instructions to install it can be found on the `MongoDB manual <http://docs.mongodb.org/manual/administration/install-on-linux/>`_).
+
+Step 2: Install node.js
+-------------------------
+
+Like MongoDB, the latest and greatest node.js is required (or at least greater than the package manager), so I'm leaving this to the official wiki. The instructions to install can be found on `Joyent <https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager>`_.
+
+**Note: NPM is installed along with node.js, so there is no need to install it separately**
+
+Step 3: Install the Base Software Stack
+-------------------------
+
+Enter the following into the terminal to install the base software required to run NodeBB:
+
+.. code:: bash
+
+    # apt-get install git build-essential imagemagick
+
+Step 4: Clone the Repository
+-------------------------
+
+Enter the following into the terminal, replacing `/path/to/nodebb/install/location` to where you would like NodeBB to be installed.
+
+.. code:: bash
+
+    $ cd /path/to/nodebb/install/location
+    $ git clone git://github.com/designcreateplay/NodeBB.git nodebb
+
+Step 5: Install The Required NodeBB Dependencies
+-------------------------
+
+Go into the newly created `nodebb` directory and install the required dependencies by entering the following.
+
+.. code:: bash
+
+    $ cd nodebb
+    $ npm install
+
+Step 6: Adding a New Database With Users
+-------------------------
+
+To go into the MongoDB command line, type:
+
+.. code:: bash
+
+    $ mongo
+
+To add a new database called `nodebb`, type:
+
+.. code::
+
+    > use nodebb
+
+To add a user to access the `nodebb` database, type:
+
+.. code::
+
+    > db.addUser( { user: "nodebb",
+    ...       pwd: "<Enter in a secure password>",
+    ...       roles: [ "userAdmin" ] } )
+
+**Note:** The role ``userAdmin`` gives all permissions to the user for that specific database.
+
+Step 7: Configure MongoDB
+-------------------------
+
+MongoDB needs text search enabled. Modify ``/etc/mongodb.conf``.
+
+.. code::
+
+    # nano /etc/mongodb.conf
+
+Add ``setParameter=textSearchEnabled=true`` to the end. Also, to enable authentication, uncomment ``auth = true``. Restart MongoDB.
+
+.. code::
+
+    # service mongodb restart
+
+Step 8: Configuring NodeBB
+-------------------------
+
+Make sure you are in your NodeBB root folder. If not, just type:
+
+.. code::
+
+    $ cd /path/to/nodebb
+
+To setup the app, type:
+
+.. code::
+
+    $ node app --setup
+
+* Change the hostname to your domain name.  
+* Accept the defaults by pressing enter until it asks you what database you want to use. Type ``mongo`` in that field.
+* Accept the default port, unless you changed it in the previous steps.
+* Change your username to ``nodebb``, unless you set it to another username.
+* Enter in the password you made in step 5.
+* Change the database to ``nodebb``, unless you named it something else.
+
+Continue with the installation, following the instructions the installer provides you.
+
+Step 9: Starting the App
+-------------------------
+
+To start the app, run:
+
+.. code::
+
+    $ node app
+
+Now visit ``yourdomainorip.com:4567`` and your NodeBB installation should be running.
+
+NodeBB can also be started with helper programs, such as :doc:`supervisor or forever <../../running/index>`. You can also use ``nginx`` as a :doc:`reverse proxy <../../configuring/proxies>`).

docs/configuring/databases/secondary.rst

@@ -0,0 +1,9 @@
+**This option is experimental and should not be used on a production environment.**
+
+Both databases **must** be flushed before beginning - there isn't a mechanism yet that detects an existing installation on one database but not another. Until fail-safe's such as these are implemented this option is hidden under the `--advanced` setup flag.
+
+    node app --setup --advanced
+
+Consult the other database guides for instructions on how to set up each specific database. Once you select a secondary database's modules, there's no turning back - until somebody writes an exporter/importer.
+
+Currently this setup is being tested with Redis as the primary store (sets, lists, and sorted sets, because Redis is super fast with these), and Mongo as the hash store (post and user data, because ideally we wouldn't want this in RAM).

docs/configuring/proxies.rst

@@ -0,0 +1,16 @@
+Configuring Web Server / Proxies
+================================
+
+Here a few options that you can use to proxy your NodeBB forum.
+
+.. toctree::
+    :hidden:
+    :maxdepth: 0
+
+    Nginx <proxies/nginx>
+    Apache <proxies/apache>
+    Varnish Cache <proxies/varnish>
+
+* :doc:`Nginx <proxies/nginx>`
+* :doc:`Apache <proxies/apache>`
+* :doc:`Varnish Cache <proxies/varnish>`

docs/configuring/proxies/apache.rst

@@ -0,0 +1,84 @@
+Configuring apache as a proxy
+=============================
+
+**Prerequisites to making this work:**
+Apache 2.4.x
+
+What if I'm on 2.2.x (Debian/Ubuntu)?
+------------------------------------
+
+you need to manually compile and add the module "mod_proxy_wstunnel" to the Apache 2.2 branch. If you're running Ubuntu or Debian, you're likely on the 2.2 branch of code.
+
+The following guide will assist with that if you're on Debian or Ubuntu. This is what I used to backport the mod_proxy_wstunnel module to the 2.2 code base of Apache;
+
+http://www.amoss.me.uk/2013/06/apache-2-2-websocket-proxying-ubuntu-mod_proxy_wstunnel/
+
+NOTE: On ubuntu, if you’re missing the ./configure file
+------------------------------------
+You need to first run ./buildconf. After this is complete, you will then be able to use ./configure.
+
+**automake & libtool package was needed too.**
+
+.. code::
+
+    apt-get install automake libtool
+
+
+Enable the necessary modules
+-----------------------------
+
+1. sudo a2enmod proxy
+2. sudo a2enmod proxy_html
+3. sudo a2enmod proxy_wstunnel
+
+Add the config to Apache
+-----------------------------
+
+The next step is adding the configuration to your virtualhost.conf file, typically located in /etc/apache2/sites-available/. The below configuration assumes you've used 4567 (default) port for NobeBB installation. It also assumes you have the bind address set to 127.0.0.1.
+
+.. code::
+
+    ProxyRequests off
+
+    <Proxy *>
+        Order deny,allow
+        Allow from all
+    </Proxy>
+    ProxyPass /socket.io/1/websocket ws://127.0.0.1:4567/socket.io/1/websocket
+    ProxyPassReverse /socket.io/1/websocket ws://127.0.0.1:4567/socket.io/1/websocket
+
+    ProxyPass /socket.io/ http://127.0.0.1:4567/socket.io/
+    ProxyPassReverse /socket.io/ http://127.0.0.1:4567/socket.io/
+
+    ProxyPass / http://127.0.0.1:4567/
+    ProxyPassReverse / http://127.0.0.1:4567/
+
+
+The last thing you need to be sure of is that the config.json in the NodeBB folder has use_port: false. Otherwise some functionality will not work properly.
+
+
+Example nodebb/config.json
+-----------------------------
+
+.. code:: json
+
+    {
+        "base_url": "http://www.yoursite.com",
+        "port": "4567",
+        "use_port": false,
+        "secret": "55sb254c-62e3-4e23-9407-8655147562763",
+        "bind_address": "127.0.0.1",
+        "database": "redis",
+        "redis": {
+            "host": "127.0.0.1",
+            "port": "6379",
+            "password": "",
+            "database": "0"
+        },
+        "bcrypt_rounds": 12,
+        "upload_path": "/public/uploads",
+        "relative_path": ""
+    }
+
+
+**Change the domain and dont use the secret in the example above.**

docs/configuring/proxies/nginx.rst

@@ -0,0 +1,59 @@
+Configuring nginx as a proxy
+============================
+
+NodeBB by default runs on port ``4567``, meaning that builds are usually accessed using a port number in addition to their hostname:
+
+.. code::
+
+    http://example.org:4567
+
+In order to allow NodeBB to be served without a port, nginx can be set up to proxy all requests to a particular hostname (or subdomain) to an upstream NodeBB build running on any port.
+
+Requirements
+------------
+
+* NGINX version v1.3.13 or greater
+    * Package managers may not provide a new enough version. To get the latest version, `compile it yourself <http://nginx.org/en/download.html>`_, or if on Ubuntu, use the `NGINX Stable <https://launchpad.net/~nginx/+archive/stable>`_ or `NGINX Development <https://launchpad.net/~nginx/+archive/development>`_ PPA builds, if you are on Debian, use `DotDeb repository <http://www.dotdeb.org/instructions/>`_ to get the latest version of Nginx.
+    * To determine your nginx version, execute ``nginx -V`` in a shell
+
+Configuration
+------------
+
+NGINX-served sites are contained in a ``server`` block. This block of options goes in a specific place based on how nginx was installed and configured:
+
+* ``/path/to/nginx/sites-available/*`` -- files here must be aliased to ``../sites-enabled``
+* ``/path/to/nginx/conf.d/*.conf`` -- filenames must end in ``.conf``
+* ``/path/to/nginx/httpd.conf`` -- if all else fails
+
+Below is the basic nginx configuration for a NodeBB build running on port ``4567``:
+
+.. code:: nginx
+
+    server {
+        listen 80;
+
+        server_name forum.example.org;
+
+        location / {
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-NginX-Proxy true;
+
+            proxy_pass http://127.0.0.1:4567/;
+            proxy_redirect off;
+
+            # Socket.IO Support
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
+    }
+
+
+Notes
+------------
+
+* nginx must be on version 1.4.x to properly support websockets. Debian/Ubuntu use 1.2, although it will work there will be a reduction in functionality.
+* The ``proxy_pass`` IP should be ``127.0.0.1`` if your NodeBB is hosted on the same physical server as your nginx server. Update the port to match your NodeBB, if necessary.
+* This config sets up your nginx server to listen to requests for ``forum.example.org``. It doesn't magically route the internet to it, though, so you also have to update your DNS server to send requests for ``forum.example.org`` to the machine with nginx on it!

docs/configuring/proxies/varnish.rst

@@ -0,0 +1,37 @@
+Configuring Varnish Cache
+==========================
+
+To be sure Varnish will work properly with NodeBB check that your configuration ``/etc/varnish/default.vcl`` is optimized for **websockets**.
+
+.. code:: 
+
+  backend nodebb {
+    .host = "127.0.0.1"; # your nodebb host
+    .port = "4567"; # your nodebb port
+  }
+
+  sub vcl_recv {
+
+    # Pipe websocket connections directly to Node.js
+    if (req.http.Upgrade ~ "(?i)websocket") {
+      set req.backend = nodebb;
+      return (pipe);
+    }
+
+    # NodeBB
+    if (req.http.host == "forum.yourwebsite.com") { # change this to match your host
+      if (req.url ~ "^/socket.io/") {
+          set req.backend = nodebb;
+          return (pipe); # return pass seems not working for websockets
+      }
+      return (pass); # don't cache
+    }
+
+  }
+
+  sub vcl_pipe {
+    # Need to copy the upgrade header
+    if (req.http.upgrade) {
+      set bereq.http.upgrade = req.http.upgrade;
+    }
+  }

docs/contributing/style-guide.rst

@@ -0,0 +1,76 @@
+NodeBB Style Guide
+==================
+
+For the most part, NodeBB follows the `Google Javascript Style Guide <http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml>`_.
+
+Code Formatting
+-------------------
+
+.. note::
+	
+	The existing codebase as of July 2013 does not adhere to this style guide 100%. If you see instances where the style guide is not adhered to, feel free to restyle and send off a pull request.
+
+Indentation & Bracing
+-------------------
+
+NodeBB uses tabbed indentation. Bracing should follow the `One True Brace Style <http://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS>`_:
+
+.. code:: javascript
+
+    if (condition) {
+        // code here ...
+    } else {
+        // otherwise ...
+    }
+
+Put conditionals and statements on separate lines and wrap with curly braces even if it's just one line:
+
+.. code:: javascript
+
+    if (leTired) {
+        haveANap();
+    }
+
+Errors
+-------------------
+
+Most callbacks return an error as the first parameter. Handle this error first before processing further.
+
+.. code:: javascript
+
+    someFunction(parameters, function(err, data) {
+        if(err) {
+           return callback(err); // or handle error
+        }
+        // proceed as usual
+    });
+
+Variables
+-------------------
+
+Variables should always be prefaced with the `var` keyword:
+
+.. code:: javascript
+
+    var foo = 'bar';
+
+Multiple declarations are to be included in the same `var` statement:
+
+.. code:: javascript
+
+    var foo = 'bar',
+        bar = 'baz';
+
+Semicolons
+-------------------
+
+Use semicolons if at all possible
+
+Nomenclature
+-------------------
+
+CamelCase if at all possible:
+
+.. code:: javascript
+
+	functionNamesLikeThis, variableNamesLikeThis, ClassNamesLikeThis, EnumNamesLikeThis, methodNamesLikeThis, CONSTANT_VALUES_LIKE_THIS, foo.namespaceNamesLikeThis.bar, and filenameslikethis.js.

docs/help/faq.rst

@@ -0,0 +1,11 @@
+Frequently Asked Questions
+==========================
+
+
+testing
+
+
+testing
+-------
+
+testing

docs/help/help.rst

@@ -0,0 +1,50 @@
+Need Help?
+==========
+
+
+Frequently Asked Questions
+--------------------------
+
+If you experience difficulties setting up a NodeBB instance, perhaps one of the following may help.
+
+Is it possible to install NodeBB via FTP?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+It is possible to transfer the files to your remote server using FTP, but you do require shell access to the server in order to actually "start" NodeBB. Here is `a handy guide for installing NodeBB on DigitalOcean <http://burnaftercompiling.com/nodebb/setting-up-a-nodebb-forum-for-dummies/>`_
+
+I'm getting an "npm ERR!" error
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For the most part, errors involving ``npm`` are due to Node.js being outdated. If you see an error similar to this one while running ``npm install``:
+
+.. code:: bash
+
+    npm ERR! Unsupported
+    npm ERR! Not compatible with your version of node/npm: connect@2.7.11
+
+You'll need to update your Node.js version to 0.8 or higher.
+
+To do this on Ubuntu:
+
+.. code:: bash
+
+    # add-apt-repository ppa:chris-lea/node.js
+    # apt-get update && apt-get dist-upgrade -y
+    # apt-cache policy nodejs    // should show a version higher than 0.8
+
+I upgraded NodeBB and now X isn't working properly!
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Please consult [[Upgrading NodeBB]]
+
+
+Submit Bugs on our Issue Tracker
+--------------------------------
+
+Before reporting bugs, please ensure that the issue has not already been filed on our `tracker <https://github.com/designcreateplay/NodeBB/issues?state=closed>`_, or has already been resolved on our `support forum <http://community.nodebb.org/category/6/bug-reports>`_. If it has not been filed, feel free to create an account on GitHub and `create a new issue <https://github.com/designcreateplay/NodeBB/issues>`_.
+
+
+Ask the NodeBB Community
+------------------------
+
+Having trouble installing NodeBB? Or did something break? Don't hesitate to `join our forum <community.nodebb.org/register>`_ and ask for help. Hopefully one day you'll be able to help others too :) 

docs/helping/index.rst

@@ -0,0 +1,34 @@
+Helping out the NodeBB Project
+==============================
+
+NodeBB is an open source project, and will forever remain free. Here's a number of ways you can help us, even if you aren't a programmer.
+
+* `Like and share our content on Facebook <http://www.facebook.com/NodeBB>`_
+* `Follow us on Twitter <http://www.twitter.com/NodeBB>`_ and perhaps tweet **#NodeBB is most awesome forum software @NodeBB** 
+* Update our wiki! ;) We need everything from development/design tutorials to user friendly how-to guides.
+* Tell everybody about NodeBB, including your grandma and her cats.
+* `Submit a pull request, or two, or three.. <http://www.github.com/designcreateplay/NodeBB>`_
+* Build a new theme
+* Write a plugin
+* Keep the link back to us on the footer of your own NodeBB :)
+* Blog about us! Give the gift of SEO juice this Christmas
+* `Help Translate NodeBB <https://www.transifex.com/projects/p/nodebb/>`_ - It's a really simple translation tool and you don't need to know how to code.
+* Join our `community <http://community.nodebb.org>`_ and give us a hard time about bugs and missing features
+
+
+Translating NodeBB to another language
+------------------------------------
+
+NodeBB uses Transifex, which is a user friendly visual tool which allows any individual to translate text into a language of their choice. You don't need to be a programmer to do this, so what are you waiting for? `Join the translation team <https://www.transifex.com/projects/p/nodebb/>`_ now :)
+
+
+Writing Documentation
+---------------------
+
+These docs were written using `Sphinx <http://sphinx-doc.org/>`_ and published using `rtfd.org <http://readthedocs.org/>`_. 
+
+You can edit these docs `directly on GitHub <https://github.com/designcreateplay/NodeBB/tree/master/docs>`_, or by clicking on "View page source" on the top right of any page.
+
+If you wish, you can clone the repository and compile the documentation yourself. Check out the `Getting Started <https://read-the-docs.readthedocs.org/en/latest/getting_started.html>`_ section for more info on how to accomplish the latter.
+
+Documentation are auto-compiled and pushed to rtfd.org after every commit.

docs/index.rst

@@ -0,0 +1,127 @@
+.. image:: https://i.imgur.com/3yj1n6N.png
+
+|
+**NodeBB** is a next-generation discussion platform that utilizes web sockets for instant interactions and real-time notifications. NodeBB forums have many modern features out of the box such as social network integration and streaming discussions.
+
+NodeBB is an open source project which can be forked on `GitHub <https://github.com/designcreateplay/NodeBB/>`_. Don't forget to check out the ways that you can help contribute to this project, from translations, pull requests, and telling your friends.
+
+Table of Contents
+=================
+
+.. _installing:
+
+Installing NodeBB
+-----------------
+
+.. toctree::
+   :maxdepth: 2
+
+   installing/os
+   installing/cloud
+
+
+.. _configuring:
+
+Configuring NodeBB
+------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    configuring/databases
+    configuring/proxies
+
+Running NodeBB
+------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    running/index
+
+Upgrading NodeBB
+------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    upgrading/index
+
+Administrating NodeBB
+---------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    admin/outline
+    admin/sso
+    admin/uploads
+
+Contributing to NodeBB
+----------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    contributing/style-guide
+    modules/index
+
+Plugin System
+-------------
+
+.. toctree::
+    :maxdepth: 2
+
+    plugins/create
+    plugins/hooks
+    plugins/settings
+
+Widgets System
+--------------
+
+.. toctree::
+    :maxdepth: 2
+
+    widgets/create
+
+Theming Engine
+--------------
+
+.. toctree::
+    :maxdepth: 2
+
+    themes/create
+    themes/templates
+
+
+Developer's Resources
+---------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    resources
+
+Helping out the NodeBB Project
+------------------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    helping/index
+
+Troubleshooting / Help
+----------------------
+
+.. toctree::
+    :maxdepth: 2
+
+    help/help
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

docs/installing/cloud.rst

@@ -0,0 +1,21 @@
+Installing NodeBB on the Cloud
+==============================
+
+The following are step-by-step guides to help you get up and running on the cloud using popular PaaS solutions.
+
+.. note::
+
+    If the PaaS solution of your choice is not listed here, please feel free to request a guide on our `community <https://community.nodebb.org>`_ or even better yet, submit one here.
+
+
+
+.. toctree::
+    :hidden:
+    :maxdepth: 0
+
+    Heroku <cloud/heroku>
+    Cloud9 <cloud/cloud9>
+
+* :doc:`Heroku <cloud/heroku>`
+* :doc:`Cloud9 <cloud/cloud9>`
+* `Digital Ocean <http://burnaftercompiling.com/nodebb/setting-up-a-nodebb-forum-for-dummies/>`_ (external)

docs/installing/cloud/cloud9.rst

@@ -0,0 +1,75 @@
+Cloud 9 IDE
+===========
+
+The following are installation instructions for the `Cloud 9 <https://c9.io/>`_ web based IDE.
+
+**Step 1:** Clone NodeBB into a new workspace from GitHub. You can use the following command from the terminal:
+
+.. code:: bash
+	
+	git clone git://github.com/designcreateplay/NodeBB.git nodebb
+
+The nodebb command after the git url will create a file called nodebb so you have to CD into the file after you have cloned NodeBB.
+
+**Step 2:** Install redis with Cloud9's package manager
+
+.. code:: bash
+	
+	nada-nix install redis
+
+**Step 3:** Run your redis server on port 16379 - port 6379 tends to be already used on Cloud 9. The "&" makes the command run in the background. You can always terminate the process later. $IP is a Cloud 9 system variable containing the global ip of your server instance.
+
+.. code:: bash
+	
+	redis-server --port 16379 --bind $IP &
+
+**Step 4:** Find out your instance's ip address so NodeBB can bind to it correctly. This is one of Cloud 9's demands and seems to be the only way it will work. You can't use $IP in your config.json either (which means you can't enter $IP in the node app --setup).
+
+.. code:: bash
+	
+	echo $IP
+
+**Step 5:** Install NodeBB and it's dependencies:
+
+.. code:: bash
+	
+	npm install
+
+**Step 6:** Run the nodebb setup utility:
+
+.. code:: bash
+	
+	node app --setup
+
+URL of this installation should be set to 'http://workspace_name-c9-username.c9.io', replacing workspace_name with your workspace name and username with your username. Note that as NodeBB is currently using unsecure http for loading jQuery you will find it much easier using http:// instead of https:// for your base url. Otherwise jQuery won't load and NodeBB will break.
+
+Port number isn't so important - Cloud9 may force you to use port 80 anyway. Just set it to 80. If this is another port, like 4567, that is also fine.
+
+Use a port number to access NodeBB? Again, this doesn't seem to make a big difference. Set this to no. Either will work.
+
+Host IP or address of your Redis instance: localhost (the output of the $IP Command is also acceptable)
+
+IP or Hostname to bind to: Enter what your $IP value holds here found in step 4. It should look something like: 123.4.567.8
+
+Host port of your Redis instance: 16379
+
+Redis Password: Unless you have set one manually, Redis will be configured without a password. Leave this blank and press enter
+
+First-time set-up will also require an Admin name, email address and password to be set.
+
+And you're good to go! Don't use the Run button at the top if the IDE, it has been a little buggy for me. Besides, you're better off using the command line anyway. Run:
+
+.. code:: bash
+	
+	node app
+
+And then open http://workspace_name-c9-username.c9.io in your browser.
+
+Troubleshooting
+---------------
+
+A common problem is that the database hasn't been started. Make sure you have set Redis up correctly and ran 
+
+.. code:: bash
+	
+	redis-server --port 16379 --bind $IP

docs/installing/cloud/heroku.rst

@@ -0,0 +1,61 @@
+Heroku
+======
+
+**Note**: Installations to Heroku require a local machine with some flavour of unix, as NodeBB does not run on Windows.
+
+1. Download and install `Heroku Toolbelt <https://toolbelt.heroku.com/>`_ for your operating system
+2. Log into your Heroku account: ``heroku login``
+3. Verify your Heroku account by adding a credit card (at http://heroku.com/verify)
+4. Clone the repository: ``git clone https://github.com/designcreateplay/NodeBB.git /path/to/repo/clone``
+5. ``cd /path/to/repo/clone``
+6. Install dependencies locally ``npm install``
+7. Create the heroku app: ``heroku create``
+8. Enable WebSocket support (beta): ``heroku labs:enable websockets -a {APP_NAME}``, where ``{APP_NAME}`` is provided by Heroku, and looks something like ``adjective-noun-wxyz.herokuapp.com`` (NOTE: `See this doc <https://discussion.heroku.com/t/application-error/160>`_): drop the `.herokuapp.com` when entering ``{APP_NAME}`` above. 
+9. Enable `Redis To Go <https://addons.heroku.com/redistogo>`_ for your heroku account: ``heroku addons:add redistogo:nano``
+10. Run the NodeBB setup script: ``node app --setup`` (information for your Heroku server and Redis to Go instance can be found in your account page)
+
+    * Your server name is found in your Heroku app's "settings" page, and looks something like ``adjective-noun-wxyz.herokuapp.com``
+    * Use any port number. It will be ignored.
+    * Specify "n" when asked if a port will be used. Heroku transparently proxies all requests.
+    * Your redis server can be found as part of the redis url. For example, for the url: ``redis://redistogo:h28h3wgh37fns7@crestfish.redistogo.com:12345/``
+    * The server is ``fishyfish.redistogo.com``
+    * The port is ``12345``
+    * The password is ``h28h3wgh37fns7``
+
+12. Add the following two packages to the ``dependencies`` section of your ``package.json``:
+
+.. code:: json
+
+        "dependencies": {
+            ...
+            "nodebb-plugin-dbsearch": "0.0.9",
+            "redis": "~0.10.1",
+            "connect-redis": "~1.4"
+        },
+        "devDependencies": {
+
+13. Create a Procfile for Heroku: ``echo "web: node app.js" > Procfile``
+14. Commit the Procfile:
+
+.. code:: bash
+
+	git add -f Procfile config.json package.json && git commit -am "adding Procfile and configs for Heroku"
+
+15. Push to heroku: ``git push heroku master``
+    * Ensure that a proper SSH key was added to your account, otherwise the push will not succeed!
+16. Initialise a single dyno: ``heroku ps:scale web=1``
+17. Visit your app!
+
+If these instructions are unclear or if you run into trouble, please let us know by `filing an issue <https://github.com/designcreateplay/NodeBB/issues>`_.
+
+Keeping it up to date
+---------------------
+
+If you wish to pull the latest changes from the git repository to your Heroku app:
+
+1. Navigate to your repository at ``/path/to/nodebb``
+2. ``git pull``
+3. ``npm install``
+4. ``node app --upgrade``
+5. ``git commit -am "upgrading to latest nodebb"``
+6. ``git push heroku master``

docs/installing/cloud9.rst

@@ -0,0 +1,75 @@
+Cloud 9 IDE
+===========
+
+The following are installation instructions for the `Cloud 9 <https://c9.io/>`_ web based IDE.
+
+**Step 1:** Clone NodeBB into a new workspace from GitHub. You can use the following command from the terminal:
+
+.. code:: bash
+	
+	git clone git://github.com/designcreateplay/NodeBB.git nodebb
+
+The nodebb command after the git url will create a file called nodebb so you have to CD into the file after you have cloned NodeBB.
+
+**Step 2:** Install redis with Cloud9's package manager
+
+.. code:: bash
+	
+	nada-nix install redis
+
+**Step 3:** Run your redis server on port 16379 - port 6379 tends to be already used on Cloud 9. The "&" makes the command run in the background. You can always terminate the process later. $IP is a Cloud 9 system variable containing the global ip of your server instance.
+
+.. code:: bash
+	
+	redis-server --port 16379 --bind $IP &
+
+**Step 4:** Find out your instance's ip address so NodeBB can bind to it correctly. This is one of Cloud 9's demands and seems to be the only way it will work. You can't use $IP in your config.json either (which means you can't enter $IP in the node app --setup).
+
+.. code:: bash
+	
+	echo $IP
+
+**Step 5:** Install NodeBB and it's dependencies:
+
+.. code:: bash
+	
+	npm install
+
+**Step 6:** Run the nodebb setup utility:
+
+.. code:: bash
+	
+	node app --setup
+
+URL of this installation should be set to 'http://workspace_name-c9-username.c9.io', replacing workspace_name with your workspace name and username with your username. Note that as NodeBB is currently using unsecure http for loading jQuery you will find it much easier using http:// instead of https:// for your base url. Otherwise jQuery won't load and NodeBB will break.
+
+Port number isn't so important - Cloud9 may force you to use port 80 anyway. Just set it to 80. If this is another port, like 4567, that is also fine.
+
+Use a port number to access NodeBB? Again, this doesn't seem to make a big difference. Set this to no. Either will work.
+
+Host IP or address of your Redis instance: localhost (the output of the $IP Command is also acceptable)
+
+IP or Hostname to bind to: Enter what your $IP value holds here found in step 4. It should look something like: 123.4.567.8
+
+Host port of your Redis instance: 16379
+
+Redis Password: Unless you have set one manually, Redis will be configured without a password. Leave this blank and press enter
+
+First-time set-up will also require an Admin name, email address and password to be set.
+
+And you're good to go! Don't use the Run button at the top if the IDE, it has been a little buggy for me. Besides, you're better off using the command line anyway. Run:
+
+.. code:: bash
+	
+	node app
+
+And then open http://workspace_name-c9-username.c9.io in your browser.
+
+Troubleshooting
+---------------
+
+A common problem is that the database hasn't been started. Make sure you have set Redis up correctly and ran 
+
+.. code:: bash
+	
+	redis-server --port 16379 --bind $IP

docs/installing/heroku.rst

@@ -0,0 +1,47 @@
+Heroku
+======
+
+**Note**: Installations to Heroku require a local machine with some flavour of unix, as NodeBB does not run on Windows.
+
+1. Download and install `Heroku Toolbelt <https://toolbelt.heroku.com/>`_ for your operating system
+2. Log into your Heroku account: ``heroku login``
+3. Verify your Heroku account by adding a credit card (at http://heroku.com/verify)
+4. Clone the repository: ``git clone https://github.com/designcreateplay/NodeBB.git /path/to/repo/clone``
+5. ``cd /path/to/repo/clone``
+6. Install dependencies locally ``npm install``
+7. Create the heroku app: ``heroku create``
+8. Enable WebSocket support (beta): ``heroku labs:enable websockets -a {APP_NAME}``, where ``{APP_NAME}`` is provided by Heroku, and looks something like ``adjective-noun-wxyz.herokuapp.com`` (NOTE: `See this doc <https://discussion.heroku.com/t/application-error/160>`_): drop the `.herokuapp.com` when entering ``{APP_NAME}`` above. 
+9. Enable `Redis To Go <https://addons.heroku.com/redistogo>`_ for your heroku account: ``heroku addons:add redistogo:nano``
+10. Run the NodeBB setup script: ``node app --setup`` (information for your Heroku server and Redis to Go instance can be found in your account page)
+    * Your server name is found in your Heroku app's "settings" page, and looks something like ``adjective-noun-wxyz.herokuapp.com``
+    * Use any port number. It will be ignored.
+    * Specify "n" when asked if a port will be used. Heroku transparently proxies all requests.
+    * Your redis server can be found as part of the redis url. For example, for the url: ``redis://redistogo:h28h3wgh37fns7@crestfish.redistogo.com:12345/``
+    * The server is ``fishyfish.redistogo.com``
+    * The port is ``12345``
+    * The password is ``h28h3wgh37fns7``
+11. Create a Procfile for Heroku: ``echo "web: node app.js" > Procfile``
+12. Commit the Procfile:
+
+.. code:: bash
+
+	git add -f Procfile config.json public/config.json && git commit -am "adding Procfile and configs for Heroku"
+
+13. Push to heroku: ``git push heroku master``
+    * Ensure that a proper SSH key was added to your account, otherwise the push will not succeed!
+14. Initialise a single dyno: ``heroku ps:scale web=1``
+15. Visit your app!
+
+If these instructions are unclear or if you run into trouble, please let us know by `filing an issue <https://github.com/designcreateplay/NodeBB/issues>`_.
+
+Keeping it up to date
+---------------------
+
+If you wish to pull the latest changes from the git repository to your Heroku app:
+
+1. Navigate to your repository at ``/path/to/nodebb``
+2. ``git pull``
+3. ``npm install``
+4. ``node app --upgrade``
+5. ``git commit -am "upgrading to latest nodebb"``
+6. ``git push heroku master``

docs/installing/os.rst

@@ -0,0 +1,25 @@
+NodeBB Installation by OS
+=========================
+
+The following are step-by-step guides to help you get up and running.
+
+.. note::
+
+    If your operating system is not listed here, please feel free to request a guide on our `community <https://community.nodebb.org>`_ or even better yet, submit one here.
+
+
+
+.. toctree::
+    :hidden:
+    :maxdepth: 0
+
+    Ubuntu <os/ubuntu>
+    Debian <os/debian>
+    SmartOS <os/smartos>
+    Windows <os/windows8>
+
+* :doc:`Ubuntu <os/ubuntu>`
+* :doc:`Debian <os/debian>`
+* :doc:`SmartOS <os/smartos>`
+* :doc:`Windows <os/windows8>`
+* `CentOS <https://blog.tommyparnell.com/installing-nodebb-on-centos-6-5/>`_ (external)

docs/installing/os/debian.rst

@@ -0,0 +1,177 @@
+
+Debian
+======
+
+The current Ubuntu guide is not completely compatible with Debian and there are some specificities and especially the NodeJS installation, and how to get latest Redis.
+
+Requirements
+^^^^^^^^^^^^^^^^^^^^^^^
+NodeBB requires these software to be installed:
+
+* Node.js at least 0.10 and greater
+* Redis, version 2.6 or greater
+* cURL installed, just do ``sudo apt-get install curl`` in order to install it
+
+Node.js installation
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Debian 7 and Debian 6 and older doesn't have `nodejs` packages included by default, but there are some solutions to install Node.js on your Debian distribution.
+
+Wheezy Backport :
+------------------
+
+This solution is **ONLY for Debian 7**, simply run the following **as root** :
+
+.. code:: bash
+
+	$ echo "deb http://ftp.us.debian.org/debian wheezy-backports main" >> /etc/apt/sources.list
+	$ apt-get update
+
+
+To install Node.js + NPM, run this :
+
+.. code:: bash
+
+	$ apt-get install nodejs-legacy
+	$ curl --insecure https://www.npmjs.org/install.sh | bash
+
+
+The following install a Node.js version who is greater than 0.8 (at 29 March 2014 : 0.10.21)
+
+Compiling from the source :
+------------------
+
+This solution is for Debian 6 (Squeeze) and greater, in order to install NodeJS, run this **as root** :
+
+.. code:: bash
+
+	$ sudo apt-get install python g++ make checkinstall
+	$ src=$(mktemp -d) && cd $src
+	$ wget -N http://nodejs.org/dist/node-latest.tar.gz
+	$ tar xzvf node-latest.tar.gz && cd node-v*
+	$ ./configure
+	$ fakeroot checkinstall -y --install=no --pkgversion $(echo $(pwd) | sed -n -re's/.+node-v(.+)$/\1/p') make -j$(($(nproc)+1)) install
+	$ sudo dpkg -i node_*
+
+
+Get latest Software via DotDeb
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Dotdeb is a repository containing packages to turn your Debian boxes into powerful, stable and up-to-date LAMP servers.
+
+* Nginx,
+* PHP 5.4 and 5.3 (useful PHP extensions : APC, imagick, Pinba, xcache, Xdebug, XHpro..)
+* MySQL 5.5,
+* Percona toolkit,
+* Redis,
+* Zabbix,
+* Passenger…
+
+Dotdeb supports :
+
+* Debian 6.0 “Squeeze“ and 7 “Wheezy“
+* both amd64 and i386 architectures
+
+Debian 7 (Wheezy) :
+------------------
+
+For the complete DotDeb repositories :
+
+.. code:: bash
+
+	$ sudo echo 'deb http://packages.dotdeb.org wheezy all' >> /etc/apt/sources.list
+	$ sudo echo 'deb-src http://packages.dotdeb.org wheezy all' >> /etc/apt/sources.list
+
+
+After this, add the following GPC keys :
+
+.. code:: bash
+
+	$ wget http://www.dotdeb.org/dotdeb.gpg
+	$ sudo apt-key add dotdeb.gpg
+
+
+And update your package source :
+
+.. code:: bash
+
+	$ sudo apt-get update
+
+
+Debian 6 (Squeeze)
+------------------
+
+For the complete DotDeb repositories :
+
+.. code:: bash
+
+	$ sudo echo 'deb http://packages.dotdeb.org squeeze all' >> /etc/apt/sources.list
+	$ sudo echo 'deb-src http://packages.dotdeb.org squeeze all' >> /etc/apt/sources.list
+
+
+After this, add the following GPC keys :
+
+.. code:: bash
+
+	$ wget http://www.dotdeb.org/dotdeb.gpg
+	$ sudo apt-key add dotdeb.gpg
+
+
+And update your package source :
+
+.. code:: bash
+
+	$ sudo apt-get update
+
+
+Installing NodeBB
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Now, we have NodeJS installed and Redis ready to be installed, run this command for install the base software stack :
+
+.. code:: bash
+
+	$ apt-get install redis-server imagemagick git
+
+
+Next clone this repository :
+
+.. code:: bash
+
+	$ cd /path/to/nodebb/install/location
+	$ git clone git://github.com/designcreateplay/NodeBB.git nodebb
+
+Now we are going to install all dependencies for NodeBB via NPM :
+
+    $ cd /path/to/nodebb/install/location/nodebb (or if you are on your install location directory run : cd nodebb)
+    $ npm install
+
+Install NodeBB by running the app with `--setup` flag :
+
+.. code:: bash
+
+	$ ./nodebb setup
+
+
+1. `URL of this installation` is either your public ip address or your domain name pointing to that ip address.  
+    **Example:** ``http://0.0.0.0`` or ``http://example.org``  
+
+2. ``Port number of your NodeBB`` is the port needed to access your site:  
+    **Note:** If you do not proxy your port with something like nginx then port 80 is recommended for production.  
+3. If you used the above steps to setup your redis-server then use the default redis settings.
+
+And after all.. let's run the NodeBB forum
+
+.. code:: bash
+
+	$ ./nodebb start
+
+
+**Note:** If you NodeBB or your server crash, your NodeBB instance will not reboot (snap), this is why you should take a look at the other way to start your NodeBB instance with helper programs such as ``supervisor`` and ``forever``, just :doc:`take a look here <../../running/index>` it's simple as a click!
+
+Extras, tips and Advice
+^^^^^^^^^^^^^^^^^^^^^^^
+
+You should secure your NodeBB installation, `take a look here <https://github.com/designcreateplay/NodeBB#securing-nodebb>`_.
+
+You should use Nginx (or similar) in order to reverse proxy your NodeBB installation on the port 80, :doc:`take a look here <../../configuring/proxies>`

docs/installing/os/smartos.rst

@@ -0,0 +1,133 @@
+SmartOS
+========
+
+Requirements
+----------------
+
+NodeBB requires the following software to be installed:
+
+* A version of Node.js at least 0.8 or greater.
+* Redis, version 2.6 or greater (steps to install from Joyent's package repository given below).
+* nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB server).
+
+Server Access
+----------------
+
+1. Sign in your Joyent account: `Joyent.com <http://joyent.com>`_
+
+2. Select: ``Create Instance``
+
+3. Create the newest ``smartos nodejs`` image.  
+
+    **Note:** The following steps have been tested with image: ``smartos nodejs 13.1.0``
+
+4. Wait for your instance to show `Running` then click on its name.
+
+5. Find your ``Login`` and admin password. If the ``Credentials`` section is missing, refresh the webpage.  
+
+    **Example:** ``ssh root@0.0.0.0`` ``A#Ca{c1@3`` 
+
+6. SSH into your server as the admin not root: ``ssh admin@0.0.0.0``  
+
+    **Note:** For Windows users that do not have ssh installed, here is an option: `Cygwin.com <http://cygwin.com>`_
+
+Installation
+----------------
+
+1. Install NodeBB's software dependencies:
+
+    .. code:: bash
+
+        $ sudo pkgin update
+        $ sudo pkgin install scmgit nodejs build-essential ImageMagick redis
+
+    If any of these failed:
+
+    .. code:: bash
+
+        $ pkgin search *failed-name*
+        $ sudo pkgin install *available-name*
+
+2. **If needed** setup a redis-server with default settings as a service (automatically starts and restarts):  
+    **Note:** These steps quickly setup a redis server but does not fine-tuned it for production.  
+
+    **Note:** If you ran `redis-server` manually then exit out of it now.  
+
+    .. code:: bash
+
+        $ svcadm enable redis
+        $ svcs
+
+    *-* If `svcs` shows "/pkgsrc/redis:default" in maintenance mode then:
+
+    .. code:: bash
+
+        $ scvadm clear redis  
+
+    *-* To shut down your redis-server and keep it from restarting:
+
+    .. code:: bash
+
+        $ scvadm disable redis
+
+    *-* To start up your redis-server and have it always running:
+
+    .. code:: bash
+
+        $ scvadm enable redis
+
+3. Move to where you want to create the nodebb folder:
+
+    .. code:: bash
+
+        $ cd /parent/directory/of/nodebb/
+
+4. Clone NodeBB's repository:
+
+    .. code:: bash
+
+        $ git clone git://github.com/designcreateplay/NodeBB.git nodebb
+
+5. Install NodeBB's npm dependencies:
+
+    .. code:: bash
+
+        $ cd nodebb/
+        $ npm install
+
+6. Run NodeBB's setup script:  
+
+    .. code:: bash
+
+        $ node app --setup
+
+    A. `URL of this installation` is either your public ip address from your ssh `Login` or your domain name pointing to that ip address.  
+
+        **Example:** `http://0.0.0.0` or `http://example.org`  
+
+    B. `Port number of your NodeBB` is the port needed to access your site:  
+
+        **Note:** If you do not proxy your port with something like nginx then port 80 is recommended for production.  
+    C. If you used the above steps to setup your redis-server then use the default redis settings.  
+
+7. Start NodeBB process:  
+
+    **Run NodeBB manually:**
+
+    **Note:** This should not be used for production.  
+
+    .. code:: bash
+
+        $ node app
+
+8. Visit your app!  
+    **Example:** With a port of 4567: ``http://0.0.0.0:4567`` or ``http://example.org:4567``
+
+    **Note:** With port 80 the `:80` does not need to be entered.  
+
+**Note:** If these instructions are unclear or if you run into trouble, please let us know by `filing an issue <https://github.com/designcreateplay/NodeBB/issues>`_.
+
+Upgrading NodeBB
+----------------
+
+**Note:** Detailed upgrade instructions are listed in :doc:`Upgrading NodeBB <../../upgrading/index>`.

docs/installing/os/ubuntu.rst

@@ -0,0 +1,58 @@
+
+Ubuntu
+--------------------
+
+First, we install our base software stack:
+
+.. code:: bash
+
+	$ apt-get install git nodejs redis-server imagemagick
+
+
+If you want to use MongoDB, LevelDB, or another database instead of Redis please look at the :doc:`Configuring Databases <../configuring/databases>` section.
+
+**If your package manager only installed a version of Node.js that is less than 0.8 (e.g. Ubuntu 12.10, 13.04):**
+
+
+.. code:: bash
+
+	$ add-apt-repository ppa:chris-lea/node.js
+	$ apt-get update && apt-get dist-upgrade
+
+
+Next, clone this repository:
+
+
+.. code:: bash
+
+	$ cd /path/to/nodebb/install/location
+	$ git clone git://github.com/designcreateplay/NodeBB.git nodebb
+
+
+Obtain all of the dependencies required by NodeBB:
+
+.. code:: bash
+
+    $ cd nodebb
+    $ npm install
+
+
+Initiate the setup script by running the app with the ``setup`` flag:
+
+
+.. code:: bash
+
+	$ ./nodebb setup
+
+
+The default settings are for a local server running on the default port, with a redis store on the same machine/port. 
+
+Lastly, we run the forum.
+
+
+.. code:: bash
+
+	$ ./nodebb start
+
+
+NodeBB can also be started with helper programs, such as ``supervisor`` and ``forever``. :doc:`Take a look at the options here <../../running/index>`.

docs/installing/os/windows8.rst

@@ -0,0 +1,82 @@
+Windows 8
+==========
+
+Required Software
+---------------------
+
+First, install the following programs:
+
+* https://windows.github.com/
+* http://nodejs.org/
+* http://sourceforge.net/projects/redis/files/redis-2.6.10/
+
+You may have to restart your computer.
+
+Running NodeBB
+---------------------
+
+Start Redis Server
+
+.. note::
+
+	The default location of Redis Server is
+
+	**C:\Program Files (x86)\Redis\StartRedisServer.cmd**
+
+Open Git Shell, and type the following commands. Clone NodeBB repo:
+
+.. code:: bash
+
+    git clone https://github.com/designcreateplay/NodeBB.git
+
+Enter directory: 
+
+.. code:: bash
+
+    cd NodeBB
+
+Install dependencies:
+
+.. code:: bash
+
+    npm install
+
+Run interactive installation:
+
+.. code:: bash
+
+    node app.js
+
+You may leave all of the options as default.
+
+And you're done! After the installation, run 
+
+.. code:: bash
+
+    node app.js
+
+You can visit your forum at ``http://127.0.0.1:4567/``
+
+
+Developing on Windows
+---------------------
+
+It's a bit of a pain to shutdown and restart NodeBB everytime you make changes. First install supervisor:
+
+.. code:: bash
+
+    npm install -g supervisor
+
+Open up bash:
+
+.. code:: bash
+
+    bash
+
+And run NodeBB on "watch" mode:
+
+.. code:: bash
+
+    ./nodebb watch
+
+It will launch NodeBB in development mode, and watch files that change and automatically restart your forum.

docs/make.bat

@@ -0,0 +1,244 @@
+@ECHO OFF
+
+REM rmdir /s /q _build
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\NodeBB.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\NodeBB.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %BUILDDIR%/..
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %BUILDDIR%/..
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+:end

docs/modules/index.rst

@@ -0,0 +1,43 @@
+Core Modules
+================
+
+.. note::
+
+    This section is under construction. Have a look at the modules folder for more information, located at:
+
+    .. code:: bash
+
+    	public/src/modules
+
+Alerts
+-------
+
+The alert module is a toaster notification that can be called via the following syntax:
+
+.. code:: javascript
+
+	app.alert({
+	    title: 'Success!',
+	    message: 'Here\'s an example of an alert!',
+	    location: 'left-bottom', 
+	    timeout: 2500,
+	    type: 'success', 
+	    image: 'https://i.imgur.com/dJBzcGT.jpg'
+	});
+
+The above code will result in this notification (default styling):
+
+.. image:: https://i.imgur.com/jRD5GAI.png
+
+To style this, have a look at the vanilla theme's ``modules/alert.less`` and ``templates/alert.tpl``.
+
+**Parameters**:
+
+1. ``title`` - string, which can be a language string as well. Some core language strings that you can use here include: ``[[global:alert.success]]`` and ``[[global:alert.error]]``
+2. ``message`` - string, which can be a language string as well.
+3. ``location`` (optional) - ``right-top`` (default), ``left-top``, ``right-bottom``, ``left-bottom``
+4. ``timeout`` (optional) - integer in milliseconds, default is permanent until closed.
+5. ``type`` - error, success, info, warning/notify
+6. ``image`` (optional) - string, URL to image.
+7. ``closefn`` (optional) - function. This is called when the user closes the alert via the (X) button.
+8. ``clickfn`` (optional) - function. This is called when the user clicks on the alert.

docs/plugins/create.rst

@@ -0,0 +1,121 @@
+Writing Plugins for NodeBB
+==========================
+
+So you want to write a plugin for NodeBB, that's fantastic! There are a couple of things you need to know before starting that will help you out.
+
+Like WordPress, NodeBB's plugins are built on top of a hook system in NodeBB. This system exposes parts of NodeBB to plugin creators in a controlled way, and allows them to alter content while it passes through, or execute certain behaviours when triggered.
+
+See the full :doc:`list of hooks <hooks>` for more information.
+
+Filters and Actions
+------------------
+
+There are two types of hooks: **filters** and **actions**.
+
+**Filters** act on content, and can be useful if you want to alter certain pieces of content as it passes through NodeBB. For example, a filter may be used to alter posts so that any occurrences of "apple" gets changed to "orange". Likewise, filters may be used to beautify content (i.e. code filters), or remove offensive words (profanity filters).
+
+**Actions** are executed at certain points of NodeBB, and are useful if you'd like to *do* something after a certain trigger. For example, an action hook can be used to notify an admin if a certain user has posted. Other uses include analytics recording, or automatic welcome posts on new user registration.
+
+When you are writing your plugin, make sure a hook exists where you'd like something to happen. If a hook isn't present, `file an issue <https://github.com/designcreateplay/NodeBB/issues>`_ and we'll include it in the next version of NodeBB.
+
+Configuration
+------------------
+
+Each plugin package contains a configuration file called ``plugin.json``. Here is a sample:
+
+.. code:: json
+
+    {
+        "id": "my-plugin",
+        "name": "My Awesome Plugin",
+        "description": "Your plugin's description",
+        "url": "Absolute URL to your plugin or a Github repository",
+        "library": "./my-plugin.js",
+        "staticDirs": {
+            "images": "public/images"
+        },
+        "less": [
+            "assets/style.less"
+        ],
+        "hooks": [
+            { "hook": "filter:post.save", "method": "filter" },
+            { "hook": "action:post.save", "method": "emailme" }
+        ]
+    }
+
+The ``id`` property is a unique name that identifies the plugin.
+
+The ``library`` property is a relative path to the library in your package. It is automatically loaded by NodeBB (if the plugin is activated).
+
+The ``staticDirs`` property is an object hash that maps out paths (relative to your plugin's root) to a directory that NodeBB will expose to the public at the route ``/plugins/{YOUR-PLUGIN-ID}``.
+
+* e.g. The ``staticDirs`` hash in the sample configuration maps ``/path/to/your/plugin/public/images`` to ``/plugins/my-plugin/images``
+
+The ``less`` property contains an array of paths (relative to your plugin's directory), that will be precompiled into the CSS served by NodeBB.
+
+The ``hooks`` property is an array containing objects that tell NodeBB which hooks are used by your plugin, and what method in your library to invoke when that hook is called. Each object contains the following properties (those with a * are required):
+
+* ``hook``, the name of the NodeBB hook
+* ``method``, the method called in your plugin
+* ``priority``, the relative priority of the method when it is eventually called (default: 10)
+
+Writing the plugin library
+------------------
+
+The core of your plugin is your library file, which gets automatically included by NodeBB if your plugin is activated.
+
+Each method you write into your library takes a certain number of arguments, depending on how it is called:
+
+* Filters send a single argument through to your method, while asynchronous methods can also accept a callback.
+* Actions send a number of arguments (the exact number depends how the hook is implemented). These arguments are listed in the :doc:`list of hooks <hooks>`.
+
+Example library method
+------------------
+
+If we were to write method that listened for the ``action:post.save`` hook, we'd add the following line to the ``hooks`` portion of our ``plugin.json`` file:
+
+.. code:: json
+
+    { "hook": "action:post.save", "method": "myMethod" }
+
+Our library would be written like so:
+
+.. code:: javascript
+
+    var MyPlugin = {
+            myMethod: function(postData) {
+                // do something with postData here
+            }
+        };
+
+Using NodeBB libraries to enhance your plugin
+------------------
+
+Occasionally, you may need to use NodeBB's libraries. For example, to verify that a user exists, you would need to call the ``exists`` method in the ``User`` class. To allow your plugin to access these NodeBB classes, use ``module.parent.require``:
+
+.. code:: javascript
+
+    var User = module.parent.require('./user');
+    User.exists('foobar', function(err, exists) {
+        // ...
+    });
+
+Installing the plugin
+------------------
+
+In almost all cases, your plugin should be published in `npm <https://npmjs.org/>`_, and your package's name should be prefixed "nodebb-plugin-". This will allow users to install plugins directly into their instances by running ``npm install``.
+
+When installed via npm, your plugin **must** be prefixed with "nodebb-plugin-", or else it will not be found by NodeBB.
+
+As of v0.0.5, "installing" a plugin by placing it in the ``/plugins`` folder is still supported, but keep in mind that the package ``id`` and its folder name must match exactly, or else NodeBB will not be able to load the plugin. *This feature may be deprecated in later versions of NodeBB*.
+
+Testing
+------------------
+
+Run NodeBB in development mode:
+
+.. code::
+
+    ./nodebb dev
+
+This will expose the plugin debug logs, allowing you to see if your plugin is loaded, and its hooks registered. Activate your plugin from the administration panel, and test it out.

docs/plugins/hooks.rst

@@ -0,0 +1,193 @@
+Available Hooks
+=============
+
+The following is a list of all hooks present in NodeBB. This list is intended to guide developers who are looking to write plugins for NodeBB. For more information, please consult :doc:`Writing Plugins for NodeBB <create>`.
+
+There are two types of hooks, **filters**, and **actions**. Filters take an input (provided as a single argument), parse it in some way, and return the changed value. Actions take multiple inputs, and execute actions based on the inputs received. Actions do not return anything.
+
+**Important**: This list is by no means exhaustive. Hooks are added on an as-needed basis (or if we can see a potential use case ahead of time), and all requests to add new hooks to NodeBB should be sent to us via the `issue tracker <https://github.com/designcreateplay/NodeBB/issues>`_.
+
+
+Filters
+----------
+
+``filter:admin.header_build``
+^^^^^^^^^^^^^^^^^^^^^
+
+Allows plugins to create new navigation links in the ACP
+
+``filter:post.save``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Argument(s)**: A post's content (markdown text)
+
+Executed whenever a post is created or edited, but before it is saved into the database.
+
+``filter:post.get``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Argument(s)**: A post object (javascript Object)
+
+Executed whenever a post is retrieved, but before being sent to the client.
+
+``filter:header.build``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Allows plugins to add new navigation links to NodeBB**
+
+``filter:post.parse``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Argument(s)**: A post or signature's raw text (String)
+
+Executed when a post or signature needs to be parsed from raw text to HTML (for output to client). This is useful if you'd like to use a parser to prettify posts, such as `Markdown <http://daringfireball.net/projects/markdown/>`_, or `BBCode <http://www.bbcode.org/>`_.
+
+``filter:posts.custom_profile_info``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Allows plugins to add custom profile information in the topic view's author post block**
+
+
+``filter:register.check``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Allows plugins to run checks on information and deny registration if necessary.**
+
+
+``filter:scripts.get``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Allows to add client-side JS to the header and queue up for minification on production**
+
+
+``filter:uploadImage``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:uploadFile``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:widgets.getAreas``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:widgets.getWidgets``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:search.query``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:post.parse``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:messaging.parse``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:sounds.get``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:post.getPosts``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:post.getFields``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:auth.init``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:composer.help``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:topic.thread_tools``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:user.create``
+^^^^^^^^^^^^^^^^^^^^^
+
+``filter:widget.render``
+^^^^^^^^^^^^^^^^^^^^^
+
+
+
+Actions
+----------
+
+``action:app.load``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Argument(s)**: None
+
+Executed when NodeBB is loaded, used to kickstart scripts in plugins (i.e. cron jobs, etc)
+
+``action:page.load``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Argument(s)**: An object containing the following properties:
+
+* ``template`` - The template loaded
+* ``url`` - Path to the page (relative to the site's base url)
+
+``action:plugin.activate``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Argument(s)**: A String containing the plugin's ``id`` (e.g. ``nodebb-plugin-markdown``)
+
+Executed whenever a plugin is activated via the admin panel.
+
+**Important**: Be sure to check the ``id`` that is sent in with this hook, otherwise your plugin will fire its registered hook method, even if your plugin was not the one that was activated.
+
+``action:plugin.deactivate``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Argument(s)**: A String containing the plugin's ``id`` (e.g. ``nodebb-plugin-markdown``)
+
+Executed whenever a plugin is deactivated via the admin panel.
+
+**Important**: Be sure to check the ``id`` that is sent in with this hook, otherwise your plugin will fire its registered hook method, even if your plugin was not the one that was deactivated.
+
+``action:post.save``
+^^^^^^^^^^^^^^^^^^^^^
+
+**Argument(s)**: A post object (javascript Object)
+
+Executed whenever a post is created or edited, after it is saved into the database.
+
+``action:email.send``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:post.setField``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:topic.edit``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:post.edit``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:post.delete``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:post.restore``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:config.set``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:topic.save``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:user.create``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:topic.delete``
+^^^^^^^^^^^^^^^^^^^^^
+
+``action:user.set``
+^^^^^^^^^^^^^^^^^^^^^
+Parameters: field (str), value, type ('set', 'increment', or 'decrement')
+Useful for things like awarding badges or achievements after a user has reached some value (ex. 100 posts)
+
+``action:settings.set``
+^^^^^^^^^^^^^^^^^^^^^
+Parameters: hash (str), object (obj)
+Useful if your plugins want to cache settings instead of pulling from DB everytime a method is called. Listen to this and refresh accordingly.
+
+

docs/plugins/settings.rst

@@ -0,0 +1,306 @@
+Settings Framework
+==========================
+
+If you want to make your plugin customizable you may use the Settings Framework NodeBB offers.
+
+Server-Side Access
+------------------
+
+First you need some default settings, just create a new object for this:
+
+.. code:: javascript
+
+    var defaultSettings = {
+            booleans: {
+                someBool: true,
+                moreBools: [false, false, true]
+            },
+            strings: {
+                someString: 'hello world',
+                multiLineString: 'some\nlong\ntext',
+                arrayOfStrings: ['some\nlong\ntexts', 'and another one']
+            },
+            numbers: {
+                multiArrayDimensions: [[42,42],[21,21]],
+                multiArrayDimensions2: [[42,42],[]],
+                justSomeNumbers: [],
+                oneNumber: 3,
+                anotherNumber: 2
+            },
+            someKeys: ['C+S+#13'] // Ctrl+Shift+Enter
+        };
+
+Now you can use the server-side settings-module to access the saved settings like this:
+
+.. code:: javascript
+
+    var Settings = module.parent.require('./settings');
+    var mySettings = new Settings('myPlugin', '0.1', defaultSettings, function() {
+        // the settings are ready and can accessed.
+        console.log(mySettings === this); // true
+        console.log(this.get('strings.someString') === mySettings.get().strings.someString); // true
+    });
+
+The second parameter should change at least every time the structure of default settings changes. Because of this it's
+recommended to use your plugins version.
+
+To use the settings client-side you need to create a WebSocket that delivers the result of ``mySettings.get()``.
+
+The mySettings-object will cache the settings, so be sure to use methods like ``mySettings.sync(callback)`` when the
+settings got changed from somewhere else and ``mySettings.persist(callback)`` when you finished
+``mySettings.set(key, value)`` calls.
+
+You need to create a socket-listener like following to allow the admin to initiate a synchronization with the settings
+stored within database:
+
+.. code:: javascript
+
+    var SocketAdmin = module.parent.require('./socket.io/admin');
+    SocketAdmin.settings.syncMyPlugin = function() {
+        mySettings.sync();
+    };
+
+If you want to add a reset-functionality you need to create another socket-listener:
+
+.. code:: javascript
+
+    SocketAdmin.settings.getMyPluginDefaults = function (socket, data, callback) {
+        callback(null, mySettings.createDefaultWrapper());
+    };
+
+The methods of the ``mySettings`` object you probably want to use:
+
++ ``constructor()``
++ ``sync([callback])``
+    Reloads the settings from database, overrides local changes.
++ ``persist([callback])``
+    Saves the local changes within database.
++ ``get([key])``
+    Returns the setting(s) identified by given key. If no key is provided the whole settings-object gets returned. If no
+    such setting is saved the default value gets returned.
++ ``set([key, ]value)``
+    Sets the setting of given key to given value. Remember that it's just a local change, you need to call ``persist``
+    in order to save the changes.
++ ``reset([callback])``
+    Persists the default settings.
++ ``getWrapper()``
+    Returns the local object as it would get saved within database.
++ ``createWrapper(version, settings)``
+    Creates an object like it would get saved within database containing given information and settings.
++ ``createDefaultWrapper()``
+    Creates an object like it would get saved within database containing the default settings.
+
+Client-Side Access
+------------------
+
+The next step is making the settings available to the admin.
+
+You need to use the :doc:`hooks <hooks>` ``filter:admin.header.build`` (to display a link to your page within ACP) and
+``action:app.load`` (to create the needed route).
+
+Within your page you can access the client-side Settings API via
+
+.. code:: javascript
+
+    require(['settings'], function (settings) {
+        var wrapper = $('#my_form_id');
+        // [1]
+        settings.sync('myPlugin', wrapper);
+        // [2]
+    });
+
+To make a button with the id ``save`` actually save the settings you can add the following at ``[2]``:
+
+.. code:: javascript
+
+    $('#save').click(function(event) {
+        event.preventDefault();
+        settings.persist('myPlugin', wrapper, function(){
+            socket.emit('admin.settings.syncMyPlugin');
+        });
+    });
+
+As said before the server-side settings-object caches the settings, so we emit a WebSocket to notify the server to
+synchronize the settings after they got persisted.
+
+To use a reset-button you can add the following at ``[2]``:
+
+.. code:: javascript
+
+    $('#reset').click(function(event) {
+        event.preventDefault();
+        socket.emit('admin.settings.getMyPluginDefaults', null, function (err, data) {
+            settings.set('myPlugin', data, wrapper, function(){
+                socket.emit('admin.settings.syncMyPlugin');
+            });
+        });
+    });
+
+There you go, the basic structure is done.
+Now you need to add the form-fields.
+
+Each field needs an attribute ``data-key`` to reference its position within the settings.
+The Framework does support any fields whose jQuery-object provides the value via the ``val()`` method.
+
+The plugin to use for a field gets determined by its ``data-type``, ``type`` or tag-name in this order.
+
+Additionally the following plugins are registered by default:
+ * array (types: div, array)
+    An Array of any other fields.
+    Uses the object within ``data-attributes`` to define the array-elements.
+    Uses ``data-new`` to define the value of new created elements.
+ * key (types: key)
+    A field to input keyboard-combinations.
+ * checkbox, number, select, textarea
+    Handle appropriate fields.
+
+A full list of all attributes that may influence the behavior of the default Framework:
+
+ * data-key:   the key to save/load the value within configuration-object
+ * data-type:  highest priority type-definition to determine what kind of element it is or which plugin to associate
+ * type:       normal priority type-definition
+ * data-empty: if ``false`` or ``0`` then values that are assumed as empty turn into null. data-empty of arrays affect their child-elements
+ * data-trim:  if not ``false`` or ``0`` then values will get trimmed as defined by the elements type
+ * data-split: if set and the element doesn't belong to any plugin, it's value will get split and joined by its value into the field
+ * array-elements:
+     + data-split:      separator (HTML allowed) between the elements, defaults to ``', '``
+     + data-new:        value to insert into new created elements
+     + data-attributes: an object to set the attributes of the child HTML-elements. tagName as special key will set the tag-name of the child HTML-elements
+ * key-fields:
+     + data-trim:  if ``false`` or ``0`` then the value will get saved as string else as object providing following properties: ``ctrl``, ``alt``, ``shift``, ``meta``, ``code``, ``char``
+     + data-split: separator between different modifiers and the key-code of the value that gets saved (only takes effect if trimming)
+     + data-short: if not ``false`` or ``0`` then modifier-keys get saved as first uppercase character (only takes effect if trimming)
+ * select:
+     + data-options: an array of objects containing ``text`` and ``value`` attributes.
+
+The methods of the ``settings`` module:
+
++ ``registerPlugin(plugin[, types])``
+    Registers the given plugin and associates it to the given types if any, otherwise the plugins default types will get
+    used.
++ ``get()``
+    Returns the saved object.
++ ``set(hash, settings[, wrapper[, callback[, notify]]])``
+    Refills the fields with given settings and persists them.
+    ``hash`` Identifies your plugins settings.
+    ``settings`` The object to save in database (settings-wrapper if you use server-side Settings Framework).
+    ``wrapper`` (default: 'form') The DOM-Element that contains all fields to fill.
+    ``callback`` (default: null) Gets called when done.
+    ``notify`` (default: true) Whether to display saved- and fail-notifications.
++ ``sync(hash[, wrapper[, callback]])``
+    Resets the settings to saved ones and refills the fields.
++ ``persist(hash[, wrapper[, callback[, notify]]])``
+    Reads the settings from given wrapper (default: 'form') and saves them within database.
+
+For Settings 2.0 support the methods ``load`` and ``save`` are still available but not recommended.
+
+Client-Side Example Template
+------------------
+
+An example template-file to use the same settings we already used server-side:
+
+.. code:: html
+
+    <h1>My Plugin</h1>
+    <hr />
+
+    <form id="my_form_id">
+        <div class="row">
+            <p>
+                <h2>Settings</h2>
+                A boolean: <input type="checkbox" data-key="booleans.someBool"></input><br>
+                An array of checkboxes that are selected by default:
+                <div data-key="booleans.moreBools" data-attributes='{"data-type":"checkbox"}' data-new='true'></div><br>
+
+                A simple input-field of any common type: <input type="password" data-key="strings.someString"></input><br>
+                A simple textarea: <textarea data-key="strings.multiLineString"></textarea><br>
+                Array of textareas:
+                <div data-key="strings.arrayOfStrings" data-attributes='{"data-type":"textarea"}' data-new='Hello Kitty, ahem... World!'></div><br>
+
+                2D-Array of numbers that persist even when empty (but not empty rows):
+                <div data-key="numbers.multiArrayDimensions" data-split="<br>"
+                    data-attributes='{"data-type":"array","data-attributes":{"type":"number"}}' data-new='[42,21]'></div><br>
+                Same with persisting empty rows, but not empty numbers, if no row is given null will get saved:
+                <div data-key="numbers.multiArrayDimensions2" data-split="<br>" data-empty="false"
+                    data-attributes='{"data-type":"array","data-empty":true,"data-attributes":{"type":"number","data-empty":false}}' data-new='[42,21]'></div><br>
+                Array of numbers (new: 42, step: 21):
+                <div data-key="numbers.justSomeNumbers" data-attributes='{"data-type":"number","step":21}' data-new='42'></div><br>
+                Select with dynamic options:
+                <select data-key="numbers.oneNumber" data-options='[{"value":"2","text":"2"},{"value":"3","text":"3"}]'></select><br>
+                Select that loads faster:
+                <select data-key="numbers.anotherNumber"><br>
+                    <option value="2">2</option>
+                    <option value="3">3</option>
+                </select>
+
+                Array of Key-shortcuts (new: Ctrl+Shift+7):
+                <div data-key="someKeys" data-attributes='{"data-type":"key"}' data-new='Ctrl+Shift+#55'></div><br>
+            </p>
+        </div>
+        <button class="btn btn-lg btn-warning" id="reset">Reset</button>
+        <button class="btn btn-lg btn-primary" id="save">Save</button>
+    </form>
+
+    <script>
+        require(['settings'], function (settings) {
+            var wrapper = $('#my_form_id');
+            // [1]
+            settings.sync('myPlugin', wrapper);
+            $('#save').click(function(event) {
+                event.preventDefault();
+                settings.persist('myPlugin', wrapper, function(){
+                    socket.emit('admin.settings.syncMyPlugin');
+                });
+            });
+            $('#reset').click(function(event) {
+                event.preventDefault();
+                socket.emit('admin.settings.getMyPluginDefaults', null, function (err, data) {
+                    settings.set('myPlugin', data, wrapper, function(){
+                        socket.emit('admin.settings.syncMyPlugin');
+                    });
+                });
+            });
+          });
+    </script>
+
+Custom Settings-Elements
+------------------
+
+If you want do define your own element-structure you can create a **plugin** for the Settings Framework.
+
+This allows you to use a whole object like a single field which - besides comfort in using multiple similar objects -
+allows you to use them within arrays.
+
+A plugin is basically an object that contains at least an attribute ``types`` that contains an array of strings that
+associate DOM-elements with your plugin.
+
+You can add a plugin at ``[1]`` using the method ``settings.registerPlugin``.
+
+To customize the way the associated fields get interpreted you may add the following methods to your plugin-object:
+
+All given elements are instances of JQuery.
+
+All methods get called within Settings-scope.
+
++ ``use()``
+    Gets called when the plugin gets registered.
++ ``[HTML-Element|JQuery] create(type, tagName, data)``
+    Gets called when a new element should get created (eg. by expansion of an array).
++ ``destruct(element)``
+    Gets called when the given element got removed from DOM (eg. by array-splice).
++ ``init(element)``
+    Gets called when an element should get initialized (eg. after creation).
++ ``[value] get(element, trim, empty)``
+    Gets called whenever the value of the given element is requested.
+    ``trim`` Whether the result should get trimmed.
+    ``empty`` Whether considered as empty values should get saved too.
++ ``set(element, value, trim)``
+    Gets called whenever the value of the given element should be set to given one.
+    ``trim`` Whether the value is assumed as trimmed.
+
+For further impression take a look at the
+`default plugins <https://github.com/designcreateplay/NodeBB/tree/master/public/src/modules/settings>`_.
+
+You should also take a look at the helper-functions within
+`Settings <https://github.com/designcreateplay/NodeBB/tree/master/public/src/modules/settings.js>`_ in order to create
+your own plugins. There are a few methods that take response to call the methods of other plugins when fittingly.

docs/resources.rst

@@ -0,0 +1,27 @@
+Developer's Resources
+=====================
+
+
+.. note::
+
+	This section is under construction.
+
+
+Core
+----
+
+* `Building a new Admin Page <https://github.com/designcreateplay/NodeBB/wiki/How-to-build-a-new-Admin-Page>`_ (Out of date)
+
+
+Plugins
+-------
+
+* `Developing plugins with Grunt and Coffeescript <https://github.com/frissdiegurke/nodebb-grunt-development>`_
+* `Writing your first NodeBB plugin <http://burnaftercompiling.com/nodebb/writing-your-first-nodebb-plugin/>`_
+
+
+Themes
+------
+
+Widgets
+-------

docs/running/index.rst

@@ -0,0 +1,45 @@
+Running NodeBB
+================
+
+The preferred way to start and stop NodeBB is by invoking its executable:
+
+* ``./nodebb start`` Starts the NodeBB server
+* ``./nodebb stop`` Stops the NodeBB server
+* Alternatively, you may use ``npm start`` and ``npm stop`` to do the same
+
+The methods listed below are alternatives to starting NodeBB via the executable.
+
+
+Simple Node.js Process
+-----------------------
+
+To start NodeBB, run it with ``node`` (some distributions use the executable ``nodejs``, please adjust accordingly):
+
+.. code:: bash
+
+    $ cd /path/to/nodebb/install
+    $ node app
+
+However, bear in mind that crashes will cause the NodeBB process to halt, bringing down your forum. Consider some of the more reliable options, below:
+
+Supervisor Process
+-----------------------
+
+Using the `supervisor package <https://github.com/isaacs/node-supervisor>`_, you can have NodeBB restart itself if it crashes:
+
+.. code:: bash
+
+    $ npm install -g supervisor
+    $ supervisor app
+
+As ``supervisor`` by default continues to pipe output to ``stdout``, it is best suited to development builds.
+
+Forever Daemon
+-----------------------
+
+Another way to keep NodeBB up is to use the `forever package <https://github.com/nodejitsu/forever>`_ via the command line interface, which can monitor NodeBB and re-launch it if necessary:
+
+.. code:: bash
+
+    $ npm install -g forever
+    $ forever start app.js

docs/themes/create.rst

@@ -0,0 +1,61 @@
+Creating a new NodeBB Theme
+===========================
+
+NodeBB is built on `Twitter Bootstrap <twitter.github.com/bootstrap/>`_, which makes theming incredibly simple.
+
+Packaging for NodeBB
+-------------------------------------
+
+NodeBB expects any installed themes to be installed via ``npm``. Each individual theme is an npm package, and users can install themes through the command line, ex.:
+
+.. code:: bash
+
+    npm install nodebb-theme-modern-ui
+
+The theme's folder must contain at least two files for it to be a valid theme:
+
+1. ``theme.json``
+
+2. ``theme.less``
+
+``theme.less`` is where your theme's styles will reside. NodeBB expects LESS to be present in this file, and will precompile it down to CSS on-demand. For more information regarding LESS, take a look at `the project homepage <http://lesscss.org/>`_.
+
+**Note**: A *suggested* organization for ``theme.less`` is to ``@import`` multiple smaller files instead of placing all of the styles in the main ``theme.less`` file.
+
+Configuration
+-------------------------------------
+The theme configuration file is a simple JSON string containing all appropriate meta data regarding the theme. Please take note of the following properties:
+
+* ``id``: A unique id for a theme (e.g. "my-theme")
+* ``name``: A user-friendly name for the theme (e.g. "My Theme")
+* ``description``: A one/two line description about the theme (e.g. "This is the theme I made for my personal NodeBB")
+* ``screenshot``: A filename (in the same folder) that is a preview image (ideally, 370x250, or an aspect ratio of 1.48:1)
+* ``url``: A fully qualified URL linking back to the theme's homepage/project
+
+Child Themes
+-------------------------------------
+
+If your theme is based off of another theme, simply modify your LESS files to point to the other theme as a base:
+
+topic.less
+^^^^^^^^^^
+
+.. code: css
+
+    @import "../nodebb-theme-vanilla/topic";
+
+    .topic .main-post {
+        .post-info {
+            font-size: 20px;  // My theme specific override
+        }
+    }
+
+As ``topic.less`` from the theme ``nodebb-theme-vanilla`` was imported, those styles are automatically incorporated into your theme.
+
+**Important**: If you depend on another theme, make sure that your theme specifically states this in its ``package.json``. For example, for the above theme, as we depend on ``nodebb-theme-vanilla``, we would explicitly state this by adding a new section into the ``package.json`` file:
+
+.. code:: json
+
+    "peerDependencies": {
+        "nodebb-theme-vanilla": "~0.0.1"
+    }

docs/themes/templates.rst

@@ -0,0 +1,194 @@
+Rendering Engine
+=================
+
+How it works
+------------------------------------------------------
+
+Every page has an associated API call, Template file, and Language File.
+
+For example, if you navigate to `/topic/351/nodebb-wiki <http://community.nodebb.org/topic/351/nodebb-wiki>`_, the application will load three resources. The API return `/api/topic/351/nodebb-wiki <http://community.nodebb.org/api/topic/351/nodebb-wiki>`_ and the `template <http://community.nodebb.org/templates/topic.tpl>`_, in this example, "topic.tpl", and the appropriate `language file <community.nodebb.org/language/en_GB/topic.json>`_ "topic.json"*.
+
+Just prepend api/ to the URL's path name to discover the JSON return. Any value in that return can be utilized in your template.
+
+*A page's name corresponds to the template and language's filename (ex. ``http://domain.com/topic/xyz`` correlates to ``topic.tpl``). Sometimes this is not the case - ex. ``/user/xyz`` loads ``account.tpl``. Have a look at the ``custom_mapping`` section in ``public/templates/config.json`` for more details.
+
+Templating Basics
+------------------------------------------------------
+
+Using the API return as your guide, you can utilize any of those values in your template/logic. Using the above API call as an example, for anything in the root level of the return you can do something like:
+
+.. code:: html
+
+    {topic_name}
+
+To access values in objects:
+
+.. code:: html
+
+    {privileges.read}
+
+And finally you can loop through arrays and create blocks like so:
+
+.. code:: html
+
+	<!-- BEGIN posts -->
+	{posts.content}
+	<!-- END posts -->
+
+
+The above will create X copies of the above block, for each item in the posts array.
+
+Templating Logic
+------------------------------------------------------
+
+NodeBB's templating system implements some basic logic. Using the same API call as above for our example. You can write IF conditionals like so:
+
+.. code:: html
+
+	<!-- IF unreplied -->
+	This thread is unreplied!
+	<!-- ENDIF unreplied -->
+
+
+Another example:
+
+.. code:: html
+
+	<!-- IF !disableSocialButtons -->
+	<button>Share on Facebook</button>
+	<!-- ELSE -->
+	Sharing has been disabled.
+	<!-- ENDIF !disableSocialButtons -->
+
+
+We can check for the length of an array like so:
+
+.. code:: html
+
+	<!-- IF posts.length -->
+	There be some posts
+	<!-- ENDIF posts.length -->
+
+
+While looping through an array, we can check if our current index is the @first or @last like so:
+
+.. code:: html
+
+	<!-- BEGIN posts -->
+	  <!-- IF @first -->
+	    <h1>Main Author: {posts.username}</h1>
+	  <!-- ENDIF @first -->
+	  {posts.content}
+	  <!-- IF @last -->
+	    End of posts. Click here to scroll to the top.
+	  <!-- ENDIF @last -->
+	<!-- END posts -->
+
+
+For more advanced documentation, have a look at the `templates.js <https://github.com/psychobunny/templates.js>`_ repository
+
+
+Exposing template variables to client-side JavaScript
+------------------------------------------------------
+
+There are two ways of letting our JS know about data from the server-side, apart from WebSockets (TODO: will be covered in a different article).
+
+Via jQuery.get
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If we require data from a different page we can make a ``$.get`` call to any other API call. For example, if we wanted to know more about a specific user we could make a call like so:
+
+.. code:: javascript
+
+	$.get(RELATIVE_PATH + '/api/user/psychobunny', {}, function(user) {
+	    console.log(user)
+	});
+
+
+See this API call in action: http://community.nodebb.org/api/user/psychobunny
+
+Via Template Variables
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In topic.tpl for example, we can add a hidden input like so:
+
+.. code:: html
+
+    <input type="hidden" template-variable="pageCount" value="{pageCount}" />
+
+The template system will immediately parse all of these and expose them via the following method:
+
+.. code:: html
+
+    ajaxify.variables.get('pageCount');
+
+This is the ideal method of letting JS know about important variables within the template.
+
+Internationalization
+---------------------
+
+The template engine interfaces with the internationalization system as well. We can embed variables into language strings. Let's use `this API call <http://community.nodebb.org/api/register>`_ as well as this `language file <http://community.nodebb.org/language/en_GB/register.json>`_ as an example. We can now do something like the following:
+
+.. code:: html
+
+    [[register:help.username_restrictions, {minimumUsernameLength}, {maximumUsernameLength}]]
+
+Which will translate this string:
+
+.. code:: html
+
+    A unique username between %1 and %2 characters
+
+to
+
+.. code:: html
+
+    A unique username between 2 and 16 characters
+
+Advanced Topics
+---------------------
+
+Dynamically requiring and rendering a template file from client-side JavaScript
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The template engine lazy loads templates on an as-needed basis and caches them. If your code requires a template or partial on-demand then you can  :
+
+.. code:: javascript
+
+	ajaxify.loadTemplate('myTemplate', function(myTemplate) {
+		var html = templates.parse(myTemplate, myData);
+	});
+
+
+You can also access the invidual blocks inside each template, which is handy for doing things like (for example) rendering a new post's ``<li>`` and dynamically sticking it in an already loaded ``<ul>``
+
+.. code:: html
+
+	Some stuff here...
+	<!-- BEGIN posts -->
+	We just want to pull this block only.
+	<!-- END posts -->
+	... some stuff here
+
+.. code:: javascript
+
+	ajaxify.loadTemplate('myTemplate', function(myTemplate) {
+		var block = templates.getBlock(myTemplate, 'posts');
+		var html = templates.parse(block, myData);
+	});
+
+
+Rendering templates on server-side Node.js
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The templating system hooks into Express just like most other templating frameworks. Just use either ``app.render`` or ``res.render`` to parse the appropriate template.
+
+.. code:: javascript
+
+	res.render('myTemplate', myData);
+
+.. code:: javascript
+
+	app.render('myTemplate', myData, function(err, parsedTemplate) {
+		console.log(parsedTemplate);
+	});

docs/upgrading/index.rst

@@ -0,0 +1,148 @@
+Upgrading NodeBB
+======================
+
+NodeBB's periodic releases are located in the `Releases <https://github.com/designcreateplay/NodeBB/releases>`_. These releases contain what is usually considered the most bug-free code, and is designed to be used on production-level instances of NodeBB.
+
+You can utilise git to install a specific version of NodeBB, and upgrade periodically as new releases are made.
+
+To obtain the latest fixes and features, you can also ``git clone`` the latest version directly from the repository (``master`` branch), although its stability cannot be guaranteed. Core developers will attempt to ensure that every commit results in a working client, even if individual features may not be 100% complete.
+
+***As always***, the NodeBB team is not responsible for any misadventures, loss of data, data corruption, or any other bad things that may arise due to a botched upgrade - so please **don't forget to back up** before beginning!
+
+Upgrade Path
+-------------------
+
+NodeBB's upgrade path is designed so that upgrading between versions is straightforward. NodeBB will provide upgrade compatibility (via the ``--upgrade`` flag) between the latest version of a lower branch and the latest version of the higher branch. For example, if ``v0.2.2`` is the latest version in the ``v0.2.x`` branch, you can switch to the ``v0.3.x`` branch and suffer no ill effects. Upgrading from ``v0.2.0`` to ``v0.3.x`` is not supported, and NodeBB will warn you when attempting to upgrade that you are not upgrading cleanly.
+
+Upgrading between patch revisions
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*e.g. v0.1.0 to v0.1.1*
+
+Patch revisions contain bugfixes and other minor changes. Updating to the latest version of code for your specific version branch is all that is usually required.
+
+**Execute steps 1 through 3.**
+
+Upgrading between minor revisions
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*e.g. v0.1.3 to v0.2.0*
+
+Minor revisions contain new features or substantial changes that are still backwards compatible. They may also contain dependent packages that require upgrading, and other features may be deprecated (but would ideally still be supported).
+
+Execute steps 1 through 4.
+
+..  (the block below was commented out in original, so I'm leaving it commented out)
+	Upgrading between major revisions
+	^^^^^^^^^^^^^^^^^^^^^^^^^
+
+	*e.g. v0.2.4 to v1.0.0*
+
+	Major revisions contain breaking changes that are done in a backwards incompatible manner. Complete rewrites of core functionality are not uncommon. In all cases, NodeBB will attempt to provide migration tools so that a transition is possible.
+
+	Execute all of the steps.
+
+Upgrade Steps
+-------------------
+
+**Note**: After upgrading between revisions (i.e. v0.0.4 to v0.0.5), it may be necessary to run the following upgrade steps to ensure that any data schema changes are properly upgraded as well:
+
+1. Shut down your forum
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+While it is possible to upgrade NodeBB while it is running, it is definitely not recommended, particularly if it is an active forum:
+
+.. code:: bash
+
+	$ cd /path/to/nodebb
+	$ ./nodebb stop
+
+
+2. Back up your data
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. note:: 
+
+	This section is incomplete, please take care to back up your files properly!
+
+
+Backing up Redis
+~~~~~~~~~~~~~~
+
+As with all upgrades, the first step is to **back up your data**! Nobody likes database corruption/misplacement.
+
+All of the textual data stored in NodeBB is found in a ``.rdb`` file. On typical installs of Redis, the main database is found at ``/var/lib/redis/dump.rdb``.
+
+**Store this file somewhere safe.**
+
+Backing up MongoDB
+~~~~~~~~~~~~~~
+
+TBA
+
+Backing up LevelDB
+~~~~~~~~~~~~~~
+
+As LevelDB is simply a collection of flat files, just copy the database over to a safe location, ex.
+
+.. code:: bash
+
+    cp -r /path/to/db /path/to/backups
+
+**Store this file somewhere safe.**
+
+Avatars
+~~~~~~~~~~~~~~
+
+Uploaded images (avatars) are stored in /public/uploads. Feel free to back up this folder too:
+
+.. code:: bash
+
+    cd /path/to/nodebb/public
+    tar -czf ~/nodebb_assets.tar.gz ./uploads
+
+3. Grab the latest and greatest code
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Navigate to your NodeBB: ``$ cd /path/to/nodebb``.
+
+If you are upgrading from a lower branch to a higher branch, switch branches as necessary. ***Make sure you are completely up-to-date on your current branch!***.
+
+For example, if upgrading from ``v0.1.4`` to ``v0.2.0``:
+
+.. code:: bash
+
+    $ git fetch    # Grab the latest code from your current branch
+    $ git checkout v0.2.x
+
+If not upgrading between branches, skip the commands above.
+
+Then, grab the latest code:
+
+.. code:: bash
+
+    $ git pull
+
+This should retrieve the latest (and greatest) version of NodeBB from the repository.
+
+Alternatively, download and extract the latest versioned copy of the code from `the Releases Page <https://github.com/designcreateplay/NodeBB/releases>`_. Overwrite any files as necessary. This method is not supported.
+
+4. Run the NodeBB upgrade script
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This script will install any missing dependencies, upgrade any plugins or themes (if an upgrade is available), and migrate the database if necessary.
+
+.. code:: bash
+
+    $ ./nodebb upgrade
+
+**Note**: ``./nodebb upgrade`` is only available after v0.3.0. If you are running an earlier version, run these instead:
+
+* ``npm install``
+* ``ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm update``
+* ``node app --upgrade``
+
+6. Start up NodeBB & Test!
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You should now be running the latest version of NodeBB.

docs/widgets/create.rst

@@ -0,0 +1,78 @@
+Writing Widgets for NodeBB
+==========================
+
+See the original `blog post <http://blog.nodebb.org/widgets-system/>`_ for a high level overview and screenshots of the widget system.
+
+Embedding HTML and JavaScript
+-----------------------------
+
+You don't need to be a developer to figure this out. Head over to the Themes control panel and click on the Widgets tab. Create a new HTML widget by dragging and dropping the widget onto whatever template you want. 
+
+Copy and paste HTML or JavaScript into the widget and hit save - you're done!
+
+You can optionally give your widget a container by dragging and dropping from the containers section onto your selected widget.
+
+If you're looking for some sample scripts, head over to our `plugins section <http://community.nodebb.org/category/7/nodebb-plugins>`_ and look for any topic labelled ``nodebb-script-xyz``. Don't forget to submit your scripts and ideas as well!
+
+
+Creating Widgets
+-----------------------------
+
+You can define widgets in both plugins and themes. If you're building a plugin which simply delivers a widget (or collection of widgets), we strongly suggest you follow the ``nodebb-widget-xyz`` nomenclature instead when publishing.
+
+Registering your widget
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Listen to this hook to register your widget:
+
+.. code:: json
+
+    "hook": "filter:widgets.getWidgets", "method": "defineWidgets", "callbacked": true
+
+Pass this back in the array:
+
+.. code:: json
+	{
+		widget: "widget_namespace",
+		name: "My Widget",
+		description: "Short description of what it does.",
+		content: "<input type=\"text\" name=\"myKey\" class=\"form-control\" />"
+	}
+
+
+``Content`` defines the form that is displayed to customize your widget in the admin panel.
+
+Listening to your widget
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+NodeBB core will call your widget on the appropriate page load by way of the hooks system. The hook will be named after your widget's namespace (see previous example) - like so: ``filter:widget.render:widget_namespace``
+
+This will pass in an object with the following useful properties:
+
+* ``obj.area`` - will have ``location``, ``template``, ``url``
+* ``obj.data`` - will have your admin-defined data; in the example from the previous section you will be exposed an ``obj.data.myKey``
+
+Defining Widget Areas in Themes
+------------------------------------
+
+A Widget Area is characterized by a template and a location. Themes can share widgets if they define the same Widget Areas. If an admin switches themes, widgets that were previously defined in a Widget Area incompatible with the new theme are saved.
+
+Listen to this hook to register your Widget Area:
+
+.. code:: json
+
+    "hook": "filter:widgets.getAreas", "method": "defineWidgetAreas", "callbacked": true
+
+Pass this back in the array:
+
+.. code:: json
+
+	{
+		name: "Category Sidebar",
+		template: "category.tpl",
+		location: "sidebar"
+	}
+
+
+And that's all. You can define as many Widget Areas in your theme as you wish. If you're still stuck, have a look at `this commit <https://github.com/designcreateplay/nodebb-theme-cerulean/commit/50e49a9da5a89484fa8001bbda2e613b69f18e86>`_ which upgraded the Cerulean theme to use the widget system.
+

feeds/categories/.gitignore

@@ -1 +0,0 @@
-*.rss

feeds/topics/.gitignore

@@ -1 +0,0 @@
-*.rss

install/data/categories.json

@@ -1,74 +1,98 @@
- [
+[
     {
         "name": "Announcements",
-        "description": "A place to talk about whateeeever you want",
-        "blockclass": "category-blue",
-        "icon" : "icon-bullhorn"
+        "description": "Announcements regarding our community",
+        "bgColor": "#0059B2",
+        "color": "#fff",
+        "icon" : "fa-bullhorn",
+        "order": 1
     },
     {
         "name": "General Discussion",
         "description": "A place to talk about whateeeever you want",
-        "blockclass": "category-blue",
-        "icon" : "icon-comment"
+        "bgColor": "#0059B2",
+        "color": "#fff",
+        "icon" : "fa-comment",
+        "order": 2
     },
     {
         "name": "NodeBB Development",
-        "description": "Bugs? Dont worry, we dont read this thread, so post them here.",
-        "blockclass": "category-blue",
-        "icon" : "icon-github"
+        "description": "NodeBB development news and announcements",
+        "bgColor": "#0059B2",
+        "color": "#fff",
+        "icon" : "fa-github",
+        "order": 3
     },
     {
         "name": "Blogs",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-blue",
-        "icon" : "icon-pencil"
+        "description": "Blog posts from individual members",
+        "bgColor": "#0059B2",
+        "color": "#fff",
+        "icon" : "fa-pencil",
+        "order": 4
     },
     {
         "name": "Feature Requests",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-purple",
-        "icon" : "icon-lightbulb"
+        "description": "Got a feature request you'd like to see? Give us a shout here.",
+        "bgColor": "#ab1290",
+        "color": "#fff",
+        "icon" : "fa-lightbulb-o",
+        "order": 5
     },
     {
         "name": "Bug Reports",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-purple",
-        "icon" : "icon-cogs"
+        "description": "Having trouble with NodeBB? Let us know...",
+        "bgColor": "#ab1290",
+        "color": "#fff",
+        "icon" : "fa-cogs",
+        "order": 6
     },
     {
-        "name": "NodeBB Addons",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-purple",
-        "icon" : "icon-plus-sign"
+        "name": "NodeBB Plugins",
+        "description": "Enhance your NodeBB with plugins!",
+        "bgColor": "#ab1290",
+        "color": "#fff",
+        "icon" : "fa-plus-square",
+        "order": 7
     },
     {
         "name": "NodeBB Link Exchange",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-purple",
-        "icon" : "icon-exchange"
+        "description": "Link exchange",
+        "bgColor": "#ab1290",
+        "color": "#fff",
+        "icon" : "fa-exchange",
+        "order": 8
     },
     {
         "name": "News",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-darkblue",
-        "icon" : "icon-globe"
+        "description": "News from around the world",
+        "bgColor": "#004C66",
+        "color": "#fff",
+        "icon" : "fa-globe",
+        "order": 9
     },
     {
         "name": "Movies",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-darkblue",
-        "icon" : "icon-film"
+        "description": "Discuss the latest movies here",
+        "bgColor": "#004C66",
+        "color": "#fff",
+        "icon" : "fa-film",
+        "order": 10
     },
     {
         "name": "Games",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-darkblue",
-        "icon" : "icon-screenshot"
+        "description": "Discuss the latest games here",
+        "bgColor": "#004C66",
+        "color": "#fff",
+        "icon" : "fa-crosshairs",
+        "order": 11
     },
     {
         "name": "Random",
-        "description": "In future an example of how a hidden category should look like.",
-        "blockclass": "category-darkblue",
-        "icon" : "icon-beer"
+        "description": "Anything and (almost) everything welcome!",
+        "bgColor": "#004C66",
+        "color": "#fff",
+        "icon" : "fa-beer",
+        "order": 12
     }
 ]

install/data/defaults.json

@@ -0,0 +1,74 @@
+[
+    {
+        "field": "title",
+        "value": "NodeBB"
+    },
+    {
+        "field": "postDelay",
+        "value": 10
+    },
+    {
+        "field": "minimumPostLength",
+        "value": 8
+    },
+    {
+        "field": "allowGuestPosting",
+        "value": 0
+    },
+    {
+        "field": "allowGuestSearching",
+        "value": 0
+    },
+    {
+        "field": "allowTopicsThumbnail",
+        "value": 0
+    },
+    {
+        "field": "allowRegistration",
+        "value": 1
+    },
+    {
+        "field": "allowLocalLogin",
+        "value": 1
+    },
+    {
+        "field": "allowFileUploads",
+        "value": 0
+    },
+    {
+        "field": "maximumFileSize",
+        "value": 2048
+    },
+    {
+        "field": "minimumTitleLength",
+        "value": 3
+    },
+    {
+        "field": "maximumTitleLength",
+        "value": 255
+    },
+    {
+        "field": "minimumUsernameLength",
+        "value": 2
+    },
+    {
+        "field": "maximumUsernameLength",
+        "value": 16
+    },
+    {
+        "field": "minimumPasswordLength",
+        "value": 6
+    },
+    {
+        "field": "maximumSignatureLength",
+        "value": 255
+    },
+    {
+        "field": "maximumProfileImageSize",
+        "value": 256
+    },
+    {
+        "field": "chatMessagesToDisplay",
+        "value": 50
+    }
+]

install/databases.js

@@ -0,0 +1,113 @@
+"use strict";
+
+var async = require('async'),
+	prompt = require('prompt'),
+	nconf = require('nconf'),
+	winston = require('winston'),
+
+	questions = {};
+
+function success(err, config, callback) {
+	if (!config) {
+		return callback(new Error('aborted'));
+	}
+
+	var database = (config.redis || config.mongo || config.level) ? config.secondary_database : config.database;
+
+	function dbQuestionsSuccess(err, databaseConfig) {
+		if (!databaseConfig) {
+			return callback(new Error('aborted'));
+		}
+
+		// Translate redis properties into redis object
+		if(database === 'redis') {
+			config.redis = {
+				host: databaseConfig['redis:host'],
+				port: databaseConfig['redis:port'],
+				password: databaseConfig['redis:password'],
+				database: databaseConfig['redis:database']
+			};
+
+			if (config.redis.host.slice(0, 1) === '/') {
+				delete config.redis.port;
+			}
+		} else if (database === 'mongo') {
+			config.mongo = {
+				host: databaseConfig['mongo:host'],
+				port: databaseConfig['mongo:port'],
+				username: databaseConfig['mongo:username'],
+				password: databaseConfig['mongo:password'],
+				database: databaseConfig['mongo:database']
+			};
+		} else if (database === 'level') {
+			config.level = {
+				database: databaseConfig['level:database']
+			};
+		} else {
+			return callback(new Error('unknown database : ' + database));
+		}
+
+		var allQuestions = questions.redis.concat(questions.mongo.concat(questions.level));
+		for(var x=0;x<allQuestions.length;x++) {
+			delete config[allQuestions[x].name];
+		}
+
+		callback(err, config);
+	}
+
+	if(database === 'redis') {
+		if (config['redis:host'] && config['redis:port']) {
+			dbQuestionsSuccess(null, config);
+		} else {
+			prompt.get(questions.redis, dbQuestionsSuccess);
+		}
+	} else if(database === 'mongo') {
+		if (config['mongo:host'] && config['mongo:port']) {
+			dbQuestionsSuccess(null, config);
+		} else {
+			prompt.get(questions.mongo, dbQuestionsSuccess);
+		}
+	} else if(database === 'level') {
+		if (config['level:database']) {
+			dbQuestionsSuccess(null, config);
+		} else {
+			prompt.get(questions.level, dbQuestionsSuccess);
+		}
+	} else {
+		return callback(new Error('unknown database : ' + database));
+	}
+}
+
+function getSecondaryDatabaseModules(config, next) {
+	prompt.get({
+		"name": "secondary_db_modules",
+		"description": "Which database modules should " + config.secondary_database + " store?",
+		"default": nconf.get('secondary_db_modules') || "hash, list, sets, sorted"
+	}, function(err, db) {
+		config.secondary_db_modules = db.secondary_db_modules;
+		success(err, config, next);
+	});
+}
+
+module.exports = function(err, config, databases, callback) {
+	var allowedDBs = Object.keys(databases);
+	
+	allowedDBs.forEach(function(db) {
+		questions[db] = require('./../src/database/' + db).questions;
+	});
+
+	async.waterfall([
+		function(next) {
+			winston.info('Now configuring ' + config.database + ' database:');
+			success(err, config, next);
+		},
+		function(config, next) {
+			winston.info('Now configuring ' + config.secondary_database + ' database:');
+			if (config.secondary_database && allowedDBs.indexOf(config.secondary_database) !== -1) {
+				getSecondaryDatabaseModules(config, next);
+			} else {
+				next(err, config);
+			}
+		}
+	], callback);
+};

loader.js

@@ -0,0 +1,101 @@
+"use strict";
+
+var	nconf = require('nconf'),
+	fs = require('fs'),
+	pidFilePath = __dirname + '/pidfile',
+	output = fs.openSync(__dirname + '/logs/output.log', 'a'),
+	start = function() {
+		var	fork = require('child_process').fork,
+			nbb_start = function() {
+				if (timesStarted > 3) {
+					console.log('\n[loader] Experienced three start attempts in 10 seconds, most likely an error on startup. Halting.');
+					return nbb_stop();
+				}
+
+				timesStarted++;
+				if (startTimer) {
+					clearTimeout(startTimer);
+				}
+				startTimer = setTimeout(resetTimer, 1000*10);
+
+				nbb = fork('./app', process.argv.slice(2), {
+					env: {
+						'NODE_ENV': process.env.NODE_ENV
+					}
+				});
+
+				nbb.on('message', function(message) {
+					if (message && typeof message === 'object' && message.action) {
+						if (message.action === 'restart') {
+							nbb_restart();
+						}
+					}
+				});
+
+				nbb.on('exit', function(code, signal) {
+					if (code) {
+						nbb_start();
+					} else {
+						nbb_stop();
+					}
+				});
+			},
+			nbb_stop = function() {
+				if (startTimer) {
+					clearTimeout(startTimer);
+				}
+
+				nbb.kill();
+				if (fs.existsSync(pidFilePath)) {
+					var	pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10);
+					if (process.pid === pid) {
+						fs.unlinkSync(pidFilePath);
+					}
+				}
+			},
+			nbb_restart = function() {
+				nbb.removeAllListeners('exit').on('exit', function() {
+					nbb_start();
+				});
+				nbb.kill();
+			},
+			resetTimer = function() {
+				clearTimeout(startTimer);
+				timesStarted = 0;
+			},
+			timesStarted = 0,
+			startTimer;
+
+		process.on('SIGINT', nbb_stop);
+		process.on('SIGTERM', nbb_stop);
+		process.on('SIGHUP', nbb_restart);
+
+		nbb_start();
+	},
+	nbb;
+
+nconf.argv();
+
+// Start the daemon!
+if (nconf.get('daemon') !== false) {
+	// Check for a still-active NodeBB process
+	if (fs.existsSync(pidFilePath)) {
+		try {
+			var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+			process.kill(pid, 0);
+			process.exit();
+		} catch (e) {
+			fs.unlinkSync(pidFilePath);
+		}
+	}
+
+	// Daemonize and record new pid
+	require('daemon')({
+		stdout: output
+	});
+	fs.writeFile(__dirname + '/pidfile', process.pid);
+
+	start();
+} else {
+	start();
+}

logs/.gitignore

@@ -0,0 +1 @@
+*.log

minifier.js

@@ -0,0 +1,58 @@
+var uglifyjs = require('uglify-js'),
+	less = require('less'),
+	async = require('async'),
+	fs = require('fs'),
+
+	Minifier = {
+		js: {},
+		css: {}
+	};
+
+/* Javascript */
+Minifier.js.minify = function (scripts, callback) {
+	try {
+		var minified = uglifyjs.minify(scripts);
+		callback(minified.code);
+	} catch(err) {
+		process.send({
+			action: 'error',
+			error: err
+		});
+	}
+};
+
+Minifier.js.concatenate = function(scripts, callback) {
+	async.map(scripts, function(path, next) {
+		fs.readFile(path, { encoding: 'utf-8' }, next);
+	}, function(err, contents) {
+		if (err) {
+			process.send({
+				action: 'error',
+				error: err
+			});
+		} else {
+			callback(contents.reduce(function(output, src) {
+				return output.length ? output + ';\n' + src : src;
+			}, ''));
+		}
+	});
+};
+
+process.on('message', function(payload) {
+	var	executeCallback = function(data) {
+			process.send({
+				action: payload.action,
+				data: data
+			});
+		};
+
+	switch(payload.action) {
+		case 'js.minify':
+			Minifier.js.minify(payload.scripts, executeCallback);
+		break;
+
+		case 'js.concatenate':
+			Minifier.js.concatenate(payload.scripts, executeCallback);
+		break;
+	}
+})

mocks/databasemock.js

@@ -0,0 +1,100 @@
+/**
+ * Database Mock - wrapper for database.js, makes system use separate test db, instead of production
+ * ATTENTION: testing db is flushed before every use!
+ */
+
+(function(module) {
+	'use strict';
+	/*global before*/
+
+	var utils = require('./../public/src/utils.js'),
+		path  = require('path'),
+		nconf = require('nconf'),
+		winston = require('winston'),
+		errorText;
+
+
+	nconf.file({ file: path.join(__dirname, '../config.json') });
+	nconf.defaults({
+		base_dir: path.join(__dirname,'..'),
+		themes_path: path.join(__dirname, '../node_modules'),
+		upload_url: path.join(path.sep, '../uploads', path.sep),
+		views_dir: path.join(__dirname, '../public/templates')
+	});
+
+	var dbType = nconf.get('database'),
+		testDbConfig = nconf.get('test_database'),
+		productionDbConfig = nconf.get(dbType);
+
+	if(!testDbConfig){
+		errorText = 'test_database is not defined';
+		winston.info(
+			"\n===========================================================\n"+
+			"Please, add parameters for test database in config.json\n"+
+			"For example (redis):\n"+
+				'"test_database": {' + '\n' +
+				'    "host": "127.0.0.1",' + '\n' +
+				'    "port": "6379",' + '\n' +
+				'    "password": "",' + '\n' +
+				'    "database": "1"' + '\n' +
+			'}\n'+
+			" or (mongo):\n" +
+				'"test_database": {' + '\n' +
+				'    "host": "127.0.0.1",' + '\n' +
+				'    "port": "27017",' + '\n' +
+				'    "password": "",' + '\n' +
+				'    "database": "1"' + '\n' +
+			'}\n'+
+			" or (level):\n" +
+				'"test_database": {' + '\n' +
+				'    "database": "/path/to/database"' + '\n' +
+			'}\n'+
+			"==========================================================="
+		);
+		winston.error(errorText);
+		throw new Error(errorText);
+	}
+
+	if(	testDbConfig.database === productionDbConfig.database &&
+		testDbConfig.host === productionDbConfig.host &&
+		testDbConfig.port === productionDbConfig.port
+	){
+		errorText = 'test_database has the same config as production db';
+		winston.error(errorText);
+		throw new Error(errorText);
+	}
+
+	nconf.set(dbType, testDbConfig);
+
+	var db = require('../src/database'),
+		meta = require('../src/meta');
+
+	before(function(done) {
+		db.init(function(err) {
+			//Clean up
+			db.flushdb(function(err) {
+				if(err) {
+					winston.error(err);
+					throw new Error(err);
+				}
+
+				winston.info('test_database flushed');
+
+				meta.configs.init(function () {
+					nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
+					nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
+					nconf.set('theme_templates_path', meta.config['theme:templates'] ? path.join(nconf.get('themes_path'), meta.config['theme:id'], meta.config['theme:templates']) : nconf.get('base_templates_path'));
+
+					var	webserver = require('../src/webserver'),
+						sockets = require('../src/socket.io');
+						sockets.init(webserver.server);
+
+					done();
+				});
+			});
+		});
+	});
+
+	module.exports = db;
+
+}(module));

nodebb

@@ -1,6 +1,130 @@
 #!/bin/bash
-clear
-echo "Launching NodeBB in \"development\" mode."
-echo "To run the production build of NodeBB, please use \"forever\"."
-echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
-NODE_ENV=development supervisor --extensions 'node|js|tpl' -- app $1
+
+# $0 script path
+# $1 action
+# $2 subaction
+
+node="$(which nodejs 2>/dev/null)";
+if [ $? -gt 0 ];
+	then node="$(which node)";
+fi
+
+function pidExists() {
+	if [ -e "pidfile" ];
+		then
+			kill -s 0 $(cat pidfile);
+			if [ !$? ];
+				then return 1;
+				else return 0;
+			fi
+		else
+			return 0;
+	fi
+}
+
+case "$1" in
+	start)
+		echo "Starting NodeBB";
+		echo "  \"./nodebb stop\" to stop the NodeBB server";
+		echo "  \"./nodebb log\" to view server output";
+
+		if [ -f "./logs/output.log" ];	# Preserve the last output log
+			then
+				mv ./logs/output.log ./logs/output.1.log;
+		fi;
+
+		# Start the loader daemon
+		"$node" loader -d "$@"
+		;;
+
+	stop)
+		pidExists;
+		if [ 0 -eq $? ];
+			then
+				echo "NodeBB is already stopped.";
+			else
+				echo "Stopping NodeBB. Goodbye!";
+				kill $(cat pidfile);
+		fi
+		;;
+
+	reload|restart)
+		pidExists;
+		if [ 0 -eq $? ];
+			then
+				echo "NodeBB could not be restarted, as a running instance could not be found.";
+			else
+				echo "Restarting NodeBB.";
+				kill -1 $(cat pidfile);
+		fi
+		;;
+
+	status)
+		pidExists;
+		if [ 0 -eq $? ];
+			then
+				echo "NodeBB is not running";
+				echo "  \"./nodebb start\" to launch the NodeBB server";
+			else
+				echo "NodeBB Running (pid $(cat pidfile))";
+				echo "  \"./nodebb stop\" to stop the NodeBB server";
+				echo "  \"./nodebb log\" to view server output";
+				echo "  \"./nodebb restart\" to restart NodeBB";
+		fi
+		;;
+
+	log)
+		clear;
+		tail -F ./logs/output.log;
+		;;
+
+	upgrade)
+		npm install
+		# ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm install
+		# ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm update
+		npm i nodebb-theme-vanilla nodebb-theme-lavender
+		"$node" app --upgrade
+		touch package.json
+		echo -e "\n\e[00;32mNodeBB Dependencies up-to-date!\e[00;00m";
+		;;
+
+	setup)
+		"$node" app --setup "$@"
+		;;
+
+	reset)
+		"$node" app --reset --$2
+		;;
+
+	dev)
+		echo "Launching NodeBB in \"development\" mode."
+		echo "To run the production build of NodeBB, please use \"forever\"."
+		echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
+		NODE_ENV=development "$node" loader --no-daemon "$@"
+		;;
+
+	watch)
+		echo "Launching NodeBB in \"development\" mode."
+		echo "To run the production build of NodeBB, please use \"forever\"."
+		echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
+		NODE_ENV=development supervisor -q --ignore public/templates --extensions 'node|js|tpl|less' -- app "$@"
+		;;
+
+	*)
+		echo "Welcome to NodeBB"
+		echo $"Usage: $0 {start|stop|reload|restart|log|setup|reset|upgrade|dev|watch}"
+		echo ''
+		column -s '	' -t <<< '
+		start	Start the NodeBB server
+		stop	Stops the NodeBB server
+		reload	Restarts NodeBB
+		restart	Restarts NodeBB
+		log	Opens the logging interface (useful for debugging)
+		setup	Runs the NodeBB setup script
+		reset	Disables all plugins, restores the default theme.
+		upgrade	Run NodeBB upgrade scripts, ensure packages are up-to-date
+		dev	Start NodeBB in interactive development mode
+		watch	Start NodeBB in development mode and watch for changes
+		'
+		exit 1
+esac

package.json

@@ -2,40 +2,58 @@
   "name": "nodebb",
   "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.0.6",
+  "version": "0.4.3",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
     "url": "https://github.com/designcreateplay/NodeBB/"
   },
   "main": "app.js",
+  "scripts": {
+    "start": "./nodebb start",
+    "stop": "./nodebb stop",
+    "test": "mocha ./tests -t 10000"
+  },
   "dependencies": {
-    "socket.io": "0.9.14",
-    "redis": "0.8.3",
     "express": "3.2.0",
-    "express-namespace": "0.1.1",
-    "emailjs": "0.3.4",
-    "cookie": "0.0.6",
-    "connect-redis": "1.4.5",
-    "passport": "0.1.17",
+    "express-namespace": "~0.1.1",
+    "socket.io": "~0.9.16",
+    "socket.io-wildcard": "~0.1.1",
+    "passport": "~0.2.0",
     "passport-local": "0.1.6",
-    "passport-twitter": "0.1.5",
-    "passport-google-oauth": "0.1.5",
-    "passport-facebook": "0.1.5",
-    "less-middleware": "0.1.12",
     "marked": "0.2.8",
-    "bcrypt": "0.7.5",
-    "async": "0.2.8",
-    "node-imagemagick": "0.1.8",
-    "node-rss": "1.0.1",
+    "async": "~0.2.8",
+    "gm": "1.14.2",
     "gravatar": "1.0.6",
     "nconf": "~0.6.7",
-    "sitemap": "~0.6.0",
-    "cheerio": "~0.12.0",
-    "request": "~2.25.0",
-    "reds": "~0.2.4",
+    "sitemap": "~0.7.1",
     "winston": "~0.7.2",
-    "nodebb-plugin-mentions": "~0.1.0"
+    "rss": "~0.2.0",
+    "request": "~2.34.0",
+    "prompt": "~0.2.11",
+    "uglify-js": "~2.4.0",
+    "validator": "~3.4.0",
+    "cron": "~1.0.4",
+    "semver": "~2.2.1",
+    "string": "~1.7.0",
+    "xregexp": "~2.0.0",
+    "bcryptjs": "~0.7.10",
+    "less": "~1.6.3",
+    "daemon": "~1.1.0",
+    "underscore": "~1.6.0",
+    "mkdirp": "~0.3.5",
+    "rimraf": "~2.2.6",
+    "npm": "^1.4.6",
+    "nodebb-plugin-mentions": "~0.4.0",
+    "nodebb-plugin-markdown": "~0.4.1",
+    "nodebb-widget-essentials": "~0.0.21",
+    "nodebb-theme-vanilla": "<0.0.20",
+    "nodebb-theme-lavender": "<0.0.26",
+    "nodebb-plugin-soundpack-default": "~0.1.1",
+    "nodebb-plugin-dbsearch": "0.0.9"
+  },
+  "devDependencies": {
+    "mocha": "~1.13.0"
   },
   "bugs": {
     "url": "https://github.com/designcreateplay/NodeBB/issues"
@@ -43,26 +61,21 @@
   "engines": {
     "node": ">=0.8"
   },
-  "contributors": [
+  "maintainers": [
     {
       "name": "Andrew Rodrigues",
-      "email": "andrew@designcreateplay.com"
+      "email": "andrew@designcreateplay.com",
+      "url": "https://github.com/psychobunny"
     },
     {
       "name": "Julian Lam",
-      "email": "julian@designcreateplay.com"
+      "email": "julian@designcreateplay.com",
+      "url": "https://github.com/julianlam"
     },
     {
       "name": "Barış Soner Uşaklı",
-      "email": "baris@designcreateplay.com"
-    },
-    {
-      "name": "Damian Bushong",
-      "url": "https://github.com/damianb"
-    },
-    {
-      "name": "Matt Smith",
-      "url": "https://github.com/soimafreak"
+      "email": "baris@designcreateplay.com",
+      "url": "https://github.com/barisusakli"
     }
   ]
 }

public/css/admin.less

@@ -1,157 +0,0 @@
-@import "mixins";
-
-.admin {
-	.entry-row {
-		border-radius: 10px;
-		margin-bottom: 10px;
-		padding: 10px;
-		cursor: move;
-	}
-
-	input.description {
-		width: 400px;
-	}
-
-	.admin-categories {
-		form {
-			margin: 0 0 0px;
-		}
-
-		input {
-			height: 20px;
-			padding: 5px;
-			margin-left: 10px;
-			width: 150px;
-			border: 0;
-			border-radius: 5px;
-			margin-top: -8px;	
-		}
-		
-		.category_description {
-			width: 300px;
-		}
-
-		select {
-			border: 0;
-			margin-left: 10px;
-			padding: 5px;
-			margin-top: -8px;
-		}
-
-		button {
-			margin-top: -7px;
-		}
-
-		.icon{
-			width: 30px;
-			height: 30px;
-			text-align: center;
-			line-height: 35px;
-			display: inline-block;
-		}
-	}
-
-	.themes {
-		margin: 0;
-		padding: 0;
-
-		li {
-			padding: 10px 16px;
-			margin: 0.25em 1em;
-			list-style-type: none;
-			.pointer;
-			-webkit-border-radius: 10px;
-			-moz-border-radius: 10px;
-			border-radius: 10px;
-			-webkit-transition: background-color 250ms linear;
-			-moz-transition: background-color 250ms linear;
-			-ms-transition: background-color 250ms linear;
-			-o-transition: background-color 250ms linear;
-			transition: background-color 250ms linear;
-
-			img {
-				max-width: 150px;
-				float: left;
-			}
-
-			h4, p {
-				margin-left: 170px;
-			}
-
-			p {
-				font-size: 0.9em;
-			}
-
-			&:hover {
-				background-color: rgba(128, 128, 128, 0.2);
-			}
-
-			&.no-themes {
-				font-style: italic;
-			}
-		}
-	}
-
-	.motd textarea {
-		width: 100%;
-	}
-
-	.topics {
-		margin: 0;
-		padding: 0;
-
-		> li {
-			.zebra;
-			list-style-type: none;
-			padding: 1em;
-			margin-bottom: 1em;
-
-			ul {
-				margin: 0.5em 0;
-
-				li {
-					list-style-type: none;
-				}
-			}
-		}
-	}
-
-	.icon-container {
-		.row {
-			margin: 0;
-			.span3 {
-				width: 20px;
-				height: 20px;
-				margin: 1px;
-				cursor: pointer;
-				line-height: 20px;
-				text-align: center;
-
-				&:hover, &.selected {
-					background: black;
-					color: white;
-				}
-
-
-			}
-		}
-	}
-
-	.plugins {
-		li {
-			list-style-type: none;
-			background: rgba(64, 64, 64, 0.05);
-			padding: 1em;
-			border-left: 5px solid #08c;
-
-			h2 {
-				font-size: 16px;
-				margin: 0;
-			}
-
-			p {
-				font-size: 12px;
-			}
-		}
-	}
-}

public/css/category.less

@@ -1,224 +0,0 @@
-
-.category {
-	.span9 {
-		margin-bottom: 50px;
-	}
-
-	a {
-		li {
-			list-style: none;
-			//border-bottom: 1px solid #eee;
-			margin-bottom: 10px;
-			padding-bottom: 10px;
-
-			&.deleted {
-				-moz-opacity: 0.30;
-				opacity: 0.30;
-			}
-		}
-
-		&:last-child li {
-			border-bottom: 0;
-		}
-	}
-
-	ul {
-		margin-left: 0;
-	}
-
-	.thread-rating {
-		color: #444;
-		text-align: center;
-		margin-top: 7px;
-
-		span {
-			display: inline-block; margin-left: 5px;
-			i {
-				padding-left: 2.4px;
-			}
-
-
-			@media (max-width: 1200px) 
-			{
-				margin-left: -1px;
-			}
-		}
-
-
-	}
-
-	.topic-row {
-		border-radius: 5px;
-		padding-left: 20px;
-		border: 1px solid rgba(0, 0, 0, 0.2);
-
-		small {
-			vertical-align: 2px;
-			strong {
-				color: #666;
-			}
-			color: #999;
-			font-size: 14px;
-		}
-
-		h3 {
-			padding: 0;
-			margin: 0;
-			margin-top: 4px;
-			color: rgb(0, 136, 204);
-			line-height: 25px;
-
-			.topic-title {
-				width: 50%;
-				display: inline-block;
-				font-size: 20px;
-				white-space: nowrap;
-				text-overflow:ellipsis;
-				overflow: hidden;
-
-
-				.badge {
-					margin-right: 6px;
-				}
-
-				@media (max-width: 979px) 
-				{
-					width: 100%;
-				}
-			}
-		}
-
-		@media (max-width: 979px) 
-		{
-			width: 100%;
-			margin-left: 0px;
-		}
-
-	}
-
-	.latest-post {
-		float: right;
-		padding-top: 2px;
-		margin-right: 0px;
-		width: 40%;
-
-		.pull-right {
-			width: 100%;
-			height: 50px;
-			line-height: 16px;
-			margin-left: 1px;
-			padding: 5px;
-			border-left: 1px solid #bbb;
-			padding-left: 20px;
-
-			img {
-				display: block;
-				float: left;
-			}
-			p {
-				display: block;
-				float: left;
-				width: 70%;
-				margin-left: 10px;
-				overflow: hidden;
-				height: 32px;
-			}
-			span {
-				display: block;
-				float: left;
-				width: 70%;
-				margin-left: 10px;
-				overflow: hidden;
-				height: 16px;
-				margin-top: -10px;
-				color: #666;
-			}
-		}
-	}
-
-	.recent-replies {
-		overflow-y: auto;
-		overflow-x: hidden;
-
-		ul {
-			width: 100%;
-			height: 50px;
-			line-height: 16px;
-			margin-left: 1px;
-			padding: 5px 5px 5px 0px;
-			list-style-type: none;
-
-			li {
-				clear: both;
-				line-height: 16px;
-				margin-bottom: 1em;
-
-				&:last-child {
-					margin-bottom: 0;
-				}
-
-				img {
-					display: block;
-					float: left;
-				}
-				p {
-					display: block;
-					padding-left:5px;
-					padding-top: 2px;
-					overflow: hidden;
-					height: 32px;
-					margin-bottom: 0.5em;
-				}
-				span {
-					font-size: 12px;
-					display: block;
-					overflow: hidden;
-					height: 16px;
-					padding-left:5px;
-					color: #666;
-				}
-			}
-		}
-	}
-
-
-
-	.sidebar-block {
-		.block-header {
-			padding: 8px;
-			padding-left: 13px;
-			display: block;
-			background: rgb(245,245,245);
-			color: #676;
-			font-weight: 400;
-			font-size: 14px;
-			border-radius: 5px 5px 0 0;
-			border-bottom: 1px solid #ddd;
-
-		}
-		.block-content {
-			padding: 10px;
-			.img-polaroid {
-				width: 20%;
-				height: auto;
-				max-width: 48px;
-			}
-		}
-
-		border-radius: 5px;
-		padding: 0;
-		margin-bottom: 20px;
-
-		.img-polaroid {
-			margin-top: 2px;
-
-		}
-	}
-
-
-
-}
-
-
-
-

public/css/mixins.less

@@ -1,33 +0,0 @@
-.no-select {
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-.pointer {
-	cursor: pointer;
-	*cursor: hand;
-}
-
-.inline-block {
-	display: inline-block;
-	*display: inline;
-	zoom: 1;
-}
-
-.clear {
-	clear: both;
-}
-
-.zebra {
-	&:nth-child(even) {
-		background: rgba(191,191,191,0.2);
-	}
-
-	&:nth-child(odd) {
-		background: rgba(223,223,223,0.2);
-	}
-}

public/css/nodebb.less

@@ -1,5 +0,0 @@
-@import "style";
-
-@import "topic";
-@import "category";
-@import "noscript";

public/css/noscript.less

@@ -1,57 +0,0 @@
-@import "mixins";
-
-noscript {
-	.default {
-		list-style-type: none;
-		padding: 1em;
-		margin-bottom: 1em;
-		.zebra;
-	}
-
-	.categories {
-		li {
-			.default;
-
-			.icon {
-				float: left;
-				margin-right: 1em;
-			}
-
-			a {
-				font-size: 20px;
-			}
-		}
-	}
-
-	.topics {
-		li {
-			.default;
-		}
-
-		.teaser {
-			margin-left: 16px;
-			margin-top: 8px;
-
-			img {
-				float: left;
-				width: 32px;
-			}
-
-			p {
-				color: #666;
-				font-size: 13px;
-				text-overflow: ellipsis;
-				overflow: hidden;
-				white-space: nowrap;
-				margin-left: 64px;
-				padding-top: 10px;
-			}
-		}
-	}
-
-	.posts {
-		li {
-			.default;
-		}
-	}
-}

public/css/style.less

@@ -1,885 +0,0 @@
-@import "mixins";
-
-html {
-	overflow-y: scroll;
-}
-
-body {
-	/*background: #fdfdfd;*/  // port to default theme when it is implemented.
-	-webkit-transition: margin-bottom 250ms ease;
-	-moz-transition: margin-bottom 250ms ease;
-	-ms-transition: margin-bottom 250ms ease;
-	-o-transition: margin-bottom 250ms ease;
-	transition: margin-bottom 250ms ease;
-
-	&.composing {
-		margin-bottom: 350px;
-	}
-
-	@media (min-width: 979px) 
-	{
-		padding-top: 70px;
-	}
-
-	@media (max-width: 979px)
-	{
-		padding-bottom: 50px;
-	}
-}
-
-button, a {
-	-webkit-tap-highlight-color: rgba(0,0,0,0);
-}
-
-.none {
-	display: none !important;
-}
-
-.block, .show {
-	display: block;
-}
-.badge {
-	vertical-align: 17%;
-}
-.nav .badge {
-	vertical-align: 2%;
-}
-
-#alert_window {
-	position: fixed;
-	right: 20px;
-	top: 60px;
-	width: 300px;
-	height: 0px;
-}
-
-.toaster-alert {
-
-	cursor: pointer;
-}
-
-footer.footer {
-	color: #555;
-	text-align: center;
-
-	a {
-		color: #222;
-	}
-}
-
-#post_window {
-	width: 100%;
-	position: fixed;
-	height: 350px;
-	left: 0px;
-	bottom: 0px;
-	background: white;
-	z-index: 1500;
-
-	input {
-		width: 100%;
-		height: 30px;
-		padding: 5px;
-	}
-
-	textarea {
-		width: 100%;
-		background: #222;
-		height: 220px;
-		resize: none;
-		border-radius: 0;
-		border: 1px solid #111;
-		font-size: 16px;
-		color: #bebebe;
-		outline: 0;
-
-		&:focus { 
-			outline: 0;
-			border:none !important;
-			box-shadow:none !important;
-		}
-	}
-
-	.post-title-container {
-		opacity: 0.8;
-		height: 50px;
-	}
-
-	.post-content-container {
-		opacity: 0.8;
-		background: #000;
-		width: 100%;
-		height: 300px;
-	}
-}
-
-
-
-#user_label { //belongs in header.less
-	img {
-		border: 1px solid #454;
-		margin-right: 8px;
-		margin-top: -2px;
-		float: left;
-		width:24px;
-		height:24px;
-	}
-
-	span {
-		font-size: 14px;
-		font-weight: 400;
-		color: #ded;
-	}
-}
-
-#reply_title {
-	font-size: 17px;
-	padding-top: 14px;
-	font-weight: 600;
-}
-
-.alt-logins {
-	margin: 0 0 0 1em;
-	padding: 0;
-
-	li {
-		vertical-align: top;
-		background: transparent;
-		display: none;
-		margin: 0.25em;
-		.pointer;
-
-		&.active {
-			.inline-block;
-		}
-
-		i {
-			-webkit-transition: color 100ms linear;
-			-moz-transition: color 100ms linear;
-			-ms-transition: color 100ms linear;
-			-o-transition: color 100ms linear;
-			transition: color 100ms linear;
-
-			&.icon-twitter-sign:hover {
-				color: #4099FF;
-			}
-
-			&.icon-facebook-sign:hover {
-				color: #3b5999;
-			}
-
-			&.icon-google-plus-sign:hover {
-				color: #d34836;
-			}
-		}
-	}
-}
-
-
-#thread_active_users {
-	float: right;
-	color: rgb(153,153,153);
-
-	strong {
-		color: rgb(100,100,100);
-		font-weight: 600;
-		cursor: pointer;
-	}
-}
-
-.account-username-box{
-  border-bottom:1px solid #e3e3e3;
-  margin-bottom:10px;
-}
-
-.account-sub-links a{
-	margin-left:10px;
-}
-
-.account-username{
-  font-size:20px;
-  font-weight:bold;
-}
-
-.account-block {
-  div {
-    padding-bottom:10px;
-  }
-}
-
-.account-picture-block{
-    display:inline-block;
-    vertical-align:top;
-}
-
-.account-online-status {
-  .icon-circle-blank {
-      color:red;
-    }
-    .icon-circle {
-      color:green;
-    }
-}
- 
-.user-profile-picture {
-   width:128px;
-}
-
-.user-picture-label {
-  font-size:20px;
-}
-
-.account-bio-block{
-  display:inline-block;
-  vertical-align:top;
-}
-
-.account-bio-label{
-  display:inline-block;
-  width:100px;
-}
-
-.user-recent-posts {
-  div {
-    color: #333;
-    margin-bottom: 10px;
-    cursor: pointer;
-    overflow:hidden;
-    p {
-    	color: #333;
-    }
-  }
-  span {
-    padding-top: 10px;
-  }
-}
-
-.category-icon {
-	width: 100%;
-	height: 90px;
-	text-align: center;
-	border-radius: 0px;
-	margin: 0;
-	padding-top:25px;
-	cursor: pointer;
-	margin-bottom: 20px;
-	border-radius: 5px;
-	overflow:hidden;
-}
-.category-row h4 {
-	font-weight: 700;
-	text-align: left;
-	/*color: #555;*/ // NOTE: color for cat/topic header links should be grey in the default theme when we get around to it.
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.category-row a {
-	text-decoration: none;
-	border: 0;
-}
-
-.category-purple {
-	@color: #ab1290;
-	background: @color;
-	color: white;
-
-	&:hover {
-		background: lighten(@color, 10%);
-	}
-}
-
-.category-darkblue {
-	@color: #004C66;
-	background: @color;
-	color: white;
-
-	&:hover {
-		background: lighten(@color, 10%);
-	}
-}
-
-.category-blue {
-	@color: #0059B2;
-	background: @color;
-	color: white;
-
-	&:hover {
-		background: lighten(@color, 10%);
-	}
-}
-
-.category-darkgreen {
-	@color: #004000;
-	background: @color;
-	color: white;
-
-	&:hover {
-		background: lighten(@color, 10%);
-	}
-}
-.category-orange {
-	@color: #FF7A4D;
-	color: white;
-	background: @color;
-
-	&:hover {
-		background: lighten(@color, 10%);
-	}
-}
-
-.category-list {
-	li {
-		.inline-block;
-		.pointer;
-		padding: 0.5em 0;
-		text-align: center;
-		margin: 0.5em;
-		-webkit-border-radius: 5px;
-		-moz-border-radius: 5px;
-		border-radius: 5px;
-		padding: 0.5em;
-	}
-}
-
-.hero-unit {
-	background: #56BCDA;
-	color: white;
-	padding: 30px;
-	word-wrap: break-word;
-}
-
-.users-box{
-  display: inline-block;
-  margin-top: 20px;
-  text-align: center; 
-  vertical-align: top; 
-  max-width: 104px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-
-  img {
-  	width:80px;
-  	height:80px;
-  }
-
-  a {
-  	margin:5px;
-  }
-}
-
-a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
-  text-decoration:none;
-}
-
-.formatting-bar {
-	.no-select;
-
-	span:focus {
-		outline: none;
-	}
-}
-
-
-.breadcrumb {
-	li {
-		max-width: 35%;
-		white-space: nowrap;
-		text-overflow:ellipsis;
-		overflow: hidden;
-	}
-}
-
-body .navbar .nodebb-inline-block {
-	display:inline-block;
-}
-
-#right-menu{
-	float:right;
-}
-
-#admin-redis-info {
-	span {
-		display:inline-block;
-		width:220px;
-	}
-}
-
-.post-signature {
-  color: #666;
-  font-size: 12px;
-  border-top: 1px solid #ddd;
-  display: inline-block;
-	
-	img {
-	  max-width:200px;
-	  max-height:60px;
-	}
-}
-
-.username-field {
-	.icon-circle {
-		font-size: 12px;
-		color: green;
-		margin-right:3px;
-	}
-	.icon-circle-blank {
-		font-size: 12px;
-		color: red;
-		margin-right:3px;
-	}
-}
-
-#chat-content {
-	width:95%;
-	height:200px;
-	resize:none;
-}
-
-#chat-message-input {
-	width:95%;
-}
-
-#content{
-  padding-bottom:20px;
-}
-
-
-.dropdown-toggle {
-	i {
-		font-size: 12px;
-
-		@-webkit-keyframes glow
-		{
-			from {text-shadow: 0 0 5px #aaf, 0 0 5px #aaf, 0 0 5px #aaf;}
-			50% {text-shadow: 0 0 10px #aaf, 0 0 10px #aaf, 0 0 10px #aaf;}
-			to {text-shadow: 0 0 5px #aaf, 0 0 5px #aaf, 0 0 5px #aaf;}
-		}
-		@keyframes glow
-		{
-			from {text-shadow: 0 0 5px #aaf, 0 0 5px #aaf, 0 0 5px #aaf;}
-			50% {text-shadow: 0 0 10px #aaf, 0 0 10px #aaf, 0 0 10px #aaf;}
-			to {text-shadow: 0 0 5px #aaf, 0 0 5px #aaf, 0 0 5px #aaf;}
-		}
-
-
-		&.active {
-			color: #558;
-			
-			text-shadow: 0 0 1em #aaf, 0 0 1em #aaf, 0 0 1em #aaf;
-			-webkit-animation:glow 1.5s infinite linear;
-				    animation:glow 1.5s infinite linear;
-		}
-
-	}
-}
-
-#notif-list {
-	li {
-		font-size: 12px;
-		width: 300px;
-		text-align: left;
-
-		a {
-			white-space: normal;
-		}
-
-		&.unread {
-			background: #eceff5;
-		}
-	}
-}
-
-.taskbar {
-	display: none;
-	-moz-opacity: 0.5;
-	opacity: 0.5;
-	margin-top: 0;
-	-webkit-transition: opacity 250ms ease-in;
-	-moz-transition: opacity 250ms ease-in;
-	-ms-transition: opacity 250ms ease-in;
-	-o-transition: opacity 250ms ease-in;
-	transition: opacity 250ms ease-in;
-
-	&[data-active="1"] {
-		display: block;
-	}
-
-	&:hover {
-		-moz-opacity: 1;
-		opacity: 1;
-	}
-
-	li {
-		a > span {
-			.inline-block;
-			max-width: 200px;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			overflow: hidden;
-		}
-
-		img {
-			max-width: 24px;
-			max-height: 24px;
-			margin-right: 1em;
-		}
-
-		&.pulse {
-			-webkit-animation: pulsate 2500ms linear;
-			-webkit-animation-iteration-count: infinite;
-		}
-
-		@-webkit-keyframes pulsate {
-			0% { background: none; }
-			50% { background: #e5e5e5; }
-			100% { background: none; }
-		}
-	}
-}
-
-.post-window {
-	position: fixed;
-	display: none;
-	height: 350px;
-	visibility: hidden;
-
-	> div {
-		position: absolute;
-		height: 100%;
-		background: rgba(64, 64, 64, 0.6);
-		visibility: visible;
-
-		.btn-toolbar {
-			&.formatting-bar {
-				width: 90%;
-				margin: 0 auto 8px auto;
-
-				span {
-					color: white;
-
-					&:hover {
-						text-decoration: none;
-					}
-				}
-			}
-
-			&.action-bar {
-				width: 90%;
-				margin: 8px auto 0 auto;
-			}
-		}
-
-		input {
-			width: 98%;
-			text-align: center;
-			border: none;
-			padding: 0.5em 0;
-			-webkit-border-radius: 0px;
-			-moz-border-radius: 0px;
-			border-radius: 0px;
-			margin: 5px auto 10px auto;
-			display: block;
-		}
-
-		textarea {
-			background: rgba(64, 64, 64, 0.95);
-			border: none;
-			padding: 0.5em;
-			display: block;
-			width: 90%;
-			margin: 0em auto;
-			resize: none;
-			color: white;
-			height: 200px;
-		}
-		
-		.imagedrop {
-			text-align: center;
-			color: white;
-			position: absolute;
-			top: 0px;
-			left: 0px;
-			width: 100%;
-			height: 214px;
-			line-height: 214px;
-			font-size: 20px;
-			vertical-align: middle;
-			display: none;
-		}
-		
-		.imagelist {
-			position: absolute;
-			bottom: 50px;
-			left: 5%;
-
-			div {
-				margin-right:5px;
-			}
-			
-			span {
-				line-height:20px;
-				float:left;
-			}
-			
-			button { 
-				padding-left:5px;
-			}
-		}
-	}
-}
-
-@media (max-width: 979px) {
-	.post-window {
-		position: relative;
-		bottom: 0px !important;
-
-		> div {
-			position: static;
-			width: 100% !important;
-		}
-	}
-}
-
-
-#mobile-menu {
-	position: fixed;
-	bottom: 0px;
-	height: 50px;
-	background: #333;
-	width: 100%;
-	left: 0px;
-}
-
-#mobile-menu, #mobile-menu-overlay {
-	z-index: 999;
-
-	@media (min-width: 979px) 
-	{
-		display: none !important;
-	}
-}
-
-
-.btn-none,
-.btn-none:active,
-.btn-none[disabled] {
-  background-color: transparent;
-  background-image: none;
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-none {
-  cursor: pointer;
-  border-color: transparent;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-none:hover,
-.btn-none:focus {
-  text-decoration: none;
-  background-color: transparent;
-}
-
-.btn-none[disabled]:hover,
-.btn-none[disabled]:focus {
-  text-decoration: none;
-}
-
-.btn-none {
-	.icon-white {
-		color: white;
-	}
-}
-
-#mobile-menu {
-	button {
-		color: #eee;
-		padding: 10px;
-		text-shadow: none;
-		-webkit-tap-highlight-color: rgba(0,0,0,0);
-	}
-}
-
-#mobile-menu-overlay {
-
-	background: rgba(0, 0, 0, 0.85);
-	position: fixed;
-	top: 0px;
-	left: 0px;
-	height: 100%;
-	width: 100%;
-	//margin-top: 50px;
-	padding-top: 20px;
-	opacity: 0;
-
-	-webkit-transition: opacity 150ms ease;
-	-moz-transition: opacity 150ms ease;
-	-ms-transition: opacity 150ms ease;
-	-o-transition: opacity 150ms ease;
-	transition: opacity 150ms ease;
-	z-index: -1;
-	&.menu-visible {
-		z-index: 99;
-		opacity: 1;
-	}
-
-	.mobile-menu-icon {
-		color: white;
-		width: 20%;
-		min-width: 85px;
-		height: auto;
-		text-align: center;
-		padding: 10px;
-		display: inline-block;
-		cursor: pointer;
-		-webkit-tap-highlight-color: rgba(0,0,0,0);
-
-		-webkit-transition: margin-top 250ms ease;
-		-moz-transition: margin-top 250ms ease;
-		-ms-transition: margin-top 250ms ease;
-		-o-transition: margin-top 250ms ease;
-		transition: margin-top 250ms ease;
-
-		margin-top: 20%;
-		
-
-		&.menu-visible {
-			margin-top: 0%;
-  	}
-
-		i {
-			width: 100%;
-		}
-
-	}
-}
-
-#mobile-sidebar {
-	height: 100%;
-	position: absolute;
-	left: 100%;
-	top: 0px;
-	overflow: hidden;
-	margin-top: 60px;
-}
-
-.category-box {
-  height:90px;
-  
-  .post-preview {
-    padding-left:10px;
-    padding-right:10px;
-    text-align:left;
-    img {
-      width:60px;
-      height:60px;
-      padding-right:5px;
-    }
-    
-    p {
-      overflow: hidden;
-      text-overflow:ellipsis;
-      height:60px;
-    }
-  }
-}
-
-#mark-allread-btn {
-  margin-bottom:15px;
-}
-
-@-webkit-keyframes scroll-2 /* Safari and Chrome */
-{
-    0%   {top: 0px;}
-    25%   {top: -90px;}
-    50%  {top: -180px;}
-    75%  {top: -270px;}
-    100% {top: -360px;}
-}
-
-@keyframes scroll-2
-{
-    0%   {top: 0px;}
-    25%   {top: -90px;}
-    50%  {top: -180px;}
-    75%  {top: -270px;}
-    100% {top: -360px;}
-}
-
-@-webkit-keyframes scroll-1 /* Safari and Chrome */
-{
-    0%   {top: 0px;}
-    33%   {top: -90px;}
-    66%  {top: -180px;}
-    100%  {top: -270px;}
-}
-
-@keyframes scroll-1
-{
-    0%   {top: 0px;}
-    33%   {top: -90px;}
-    66%  {top: -180px;}
-    100%  {top: -270px;}
-}
-
-@-webkit-keyframes scroll-0 /* Safari and Chrome */
-{
-    0%   {top: 0px;}
-    50%   {top: -90px;}
-    100%  {top: -180px;}
-}
-
-@keyframes scroll-0
-{
-    0%   {top: 0px;}
-    50%   {top: -90px;}
-    100%  {top: -180px;}
-}
-
-.category-slider-2:hover {
-  position:relative;
-
-  -webkit-animation: scroll-2 10s ease 0.5s infinite normal;    
-  animation: scroll-2 10s ease 0.5s infinite normal;/* Safari and Chrome: */
-}
-
-.category-slider-1:hover {
-  position:relative;
-
-  -webkit-animation: scroll-1 8s ease 0.5s infinite normal;    
-  animation: scroll-1 8s ease 0.5s infinite normal;/* Safari and Chrome: */
-}
-
-.category-slider-0:hover {
-  position:relative;
-
-  -webkit-animation: scroll-0 6s ease 0.5s infinite normal;    
-  animation: scroll-0 6s ease 0.5s infinite normal;/* Safari and Chrome: */
-}
-
-.form-search {
-	float: left;
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
-
-.search-result-post {
-  width: 100%;
-  line-height: 16px;
-  padding: 5px;
-  overflow:hidden;
-  img {
-    display: block;
-    float: left;
-    width:48px;
-    height:48px;
-    padding-right:10px;
-  }
-
-}

public/css/topic.less

@@ -1,226 +0,0 @@
-
-.post-container {
-	list-style-type: none;
-	padding: 0;
-	margin: 0;
-	clear: both;
-
-	.profile-image-block {
-		display: inline-block;
-		text-align: center;
-		font-size: 12px;
-
-		.stats {
-			clear: both;
-		}
-	}
-
-	li {
-		padding-bottom: 15px;
-
-		&.deleted {
-			-moz-opacity: 0.30;
-			opacity: 0.30;
-			height:30px;
-			overflow-y:hidden;
-		}
-
-		&.deleted-expanded {
-			height:100%;
-			overflow-y:default;
-		}
-	}
-
-	.profile-block, .post-block {
-		position:relative;
-		border: 1px solid rgba(0, 0, 0, 0.06);
-		border-radius: 5px;
-		padding: 10px;
-
-		p {
-			line-height: 1.75em;
-		}
-	}
-
-	.profile-block {
-		background: rgba(0, 0, 0, 0.02);
-		margin-right: -11px;
-		margin-left: -11px;
-		margin-bottom: -11px;
-		margin-top: 15px;
-		border-radius: 0 0 5px 5px;
-		font-size: 10px;
-		line-height: 18px;
-		padding: 5px;
-		padding-left: 10px;
-
-		img.hidden-desktop {
-			max-width: 10px;
-			max-height: 10px;
-			padding-top: 5px;
-			margin-right: 5px;
-			
-		}
-	}
-	.post-content {
-		min-height: 50px;
-		padding: 2px 5px 0 5px;
-		word-wrap: break-word;
-	}
-
-	.post-images{
-		padding: 2px 5px 0 5px;
-	}
-
-	.post-block {
-		.post-buttons {
-			font-size: 12px;
-			float: right;
-			margin-right: 5px;
-
-			button, a {
-				display: inline-block;
-				padding: 0px 15px;
-				border: none;
-				border-left: 1px solid rgba(0, 0, 0, 0.06);
-				cursor: pointer;
-				background: none;
-				font-size: 12px;
-				height: 20px;
-
-				&:last-child {
-					padding-right: 5px;
-				}
-			}
-
-			.icon-star {
-				//theme this to make it yellow eventually
-			}
-		}
-	}
-
-	
-
-	&.deleted {
-		-moz-opacity: 0.30;
-		opacity: 0.30;
-	}
-	/*http://stackoverflow.com/questions/11037517/bootstrap-making-responsive-changes-to-layout*/
-	@media (max-width: 979px) {
-
-
-		.span12-tablet {
-			width: 100% !important;
-			margin-left:0px;
-			*width: 100% !important;
-		}
-	}
-
-	@media (min-width: 979px) {
-		.speech-bubble:after 
-		{
-			content: "";
-			position: absolute;
-			top: 9px;
-			left: -7px;
-			border-style: solid;
-			border-width: 7px 7px 7px 0;
-			border-color: transparent #FFFFFF;
-			display: block;
-			width: 0;
-			z-index: 1;
-		}
-
-		.speech-bubble:before 
-		{
-			content: "";
-			position: absolute;
-			top: 9px;
-			left: -8px;
-			border-style: solid;
-			border-width: 7px 7px 7px 0;
-			border-color: transparent rgba(0, 0, 0, 0.125);
-			display: block;
-			width: 0;
-			z-index: 0;
-		}
-	}
-
-	.main-post {
-		h3 {
-			margin: 0;
-
-			.topic-title {
-				width: auto;
-				overflow: hidden;
-				margin: 0;
-				padding: 0;
-				padding-top: 5px;
-				margin-bottom: -5px;
-				padding-bottom: 5px;
-			}
-		}
-
-		.main-avatar {
-			color: white;
-			position: relative;
-			float: left;
-			margin-right: 25px;
-			margin-bottom: 0px;
-			padding-bottom: 0px;
-			text-align: center;
-			width:80px;
-			
-			@media (max-width: 767px) { 
-				display: none;
-			}
-		}
-
-		.main-avatar:hover .hover-overlay {
-			opacity: 0.75;
-		}
-
-		.hover-overlay {
-			margin: 5px;
-			position: absolute;
-			bottom: 0px;
-			height: 35px;
-			padding-top: 2px;
-			width: 80px;
-			font-size: 13px;
-			line-height: 16px;
-			background: #000;
-			opacity: 0;
-			transition: opacity 0.3s;
-		}
-
-		.post-content {
-			min-height: 80px;
-		}
-		hr {
-			margin-top: 0;
-			margin-right: 10px;
-			margin-bottom: 0;
-		}
-		.post-block {
-			.post-buttons {
-				div {
-					border: 0;
-				}
-			}
-		}
-		.favourite {
-			cursor: pointer;
-		}
-		.btn {
-			display: inline-block;
-		}
-
-		.topic-buttons {
-			margin-top: 8px;
-		}
-
-	}
-}
-
-

public/language/TODO

@@ -0,0 +1,3 @@
+NPM INSTALL
+For now, language packs will be stored here. Eventually, will be moved to server side to allow for npm install-ability.
+When that happens, server code will generate compressed JSON language files in this folder.

public/language/ar/category.json

@@ -0,0 +1,7 @@
+{
+    "new_topic_button": "موضوع جديد",
+    "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لماذا لا تحاول نشر واحد؟<br />",
+    "browsing": "يتصفح",
+    "no_replies": "لم يرد أحد",
+    "share_this_category": "Share this category"
+}

public/language/ar/error.json

@@ -0,0 +1,50 @@
+{
+    "invalid-data": "Invalid Data",
+    "not-logged-in": "You don't seem to be logged in.",
+    "account-locked": "Your account has been locked temporarily",
+    "invalid-cid": "Invalid Category ID",
+    "invalid-tid": "Invalid Topic ID",
+    "invalid-pid": "Invalid Post ID",
+    "invalid-uid": "Invalid User ID",
+    "invalid-username": "Invalid Username",
+    "invalid-email": "Invalid Email",
+    "invalid-title": "Invalid title",
+    "invalid-user-data": "Invalid User Data",
+    "invalid-password": "Invalid Password",
+    "invalid-pagination-value": "Invalid pagination value",
+    "username-taken": "Username taken",
+    "email-taken": "Email taken",
+    "user-banned": "User banned",
+    "no-category": "Category doesn't exist",
+    "no-topic": "Topic doesn't exist",
+    "no-post": "Post doesn't exist",
+    "no-group": "Group doesn't exist",
+    "no-user": "User doesn't exist",
+    "no-teaser": "Teaser doesn't exist",
+    "no-privileges": "You don't have enough privileges for this action.",
+    "category-disabled": "Category disabled",
+    "topic-locked": "Topic Locked",
+    "still-uploading": "Please wait for uploads to complete.",
+    "content-too-short": "Please enter a longer post. At least %1 characters.",
+    "title-too-short": "Please enter a longer title. At least %1 characters.",
+    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
+    "too-many-posts": "You can only post every %1 seconds.",
+    "file-too-big": "Maximum allowed file size is %1 kbs",
+    "cant-vote-self-post": "You cannot vote for your own post",
+    "already-favourited": "You already favourited this post",
+    "already-unfavourited": "You alread unfavourited this post",
+    "cant-ban-other-admins": "You can't ban other admins!",
+    "invalid-image-type": "Invalid image type",
+    "group-name-too-short": "Group name too short",
+    "group-already-exists": "Group already exists",
+    "group-name-change-not-allowed": "Group name change not allowed",
+    "post-already-deleted": "Post already deleted",
+    "post-already-restored": "Post already restored",
+    "topic-already-deleted": "Topic already deleted",
+    "topic-already-restored": "Topic already restored",
+    "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
+    "invalid-file": "Invalid File",
+    "uploads-are-disabled": "Uploads are disabled",
+    "signature-too-long": "Signature can't be longer than %1 characters!",
+    "cant-chat-with-yourself": "You can't chat with yourself!"
+}

public/language/ar/footer.json

@@ -0,0 +1,7 @@
+{
+    "stats.online": "حالياً على الموقع",
+    "stats.users": "مستخدمين",
+    "stats.topics": "مواضيع",
+    "stats.posts": "مشاركات",
+    "success": "نجاح"
+}

public/language/ar/global.json

@@ -0,0 +1,71 @@
+{
+    "home": "الصفحة الرئيسية",
+    "search": "بحث",
+    "buttons.close": "أغلق",
+    "403.title": "غير مسموح بالدخول",
+    "403.message": "يبدو أنك قد تعثر على الصفحة التي لم يكن لديك الوصول إليها. ربما يجب عليك <a href='/login'> تسجيل الدخول </a> ",
+    "404.title": "لم يتم العثور",
+    "404.message": "يبدو أنك قد تعثرت على صفحة غير موجودة. عودة إلى الصفحة الرئيسية.",
+    "500.title": "خطأ داخلي.",
+    "500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
+    "register": "تسجيل",
+    "login": "دخول",
+    "please_log_in": "Please Log In",
+    "logout": "تسجيل الخروج",
+    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
+    "welcome_back": "Welcome Back ",
+    "you_have_successfully_logged_in": "You have successfully logged in",
+    "save_changes": "حفظ التغييرات",
+    "close": "أغلق",
+    "pagination": "Pagination",
+    "pagination.out_of": "%1 out of %2",
+    "header.admin": "مشرف",
+    "header.recent": "حديث",
+    "header.unread": "غير مقروء",
+    "header.popular": "Popular",
+    "header.users": "المستخدمين",
+    "header.chats": "Chats",
+    "header.notifications": "Notifications",
+    "header.search": "بحث",
+    "header.profile": "ملف",
+    "notifications.loading": "تحميل التبليغات",
+    "chats.loading": "تحميل الدردشات",
+    "motd.welcome": "مرحبا بكم  NodeBB، منصة مناقشة المستقبل",
+    "previouspage": "Previous Page",
+    "nextpage": "Next Page",
+    "alert.success": "Success",
+    "alert.error": "Error",
+    "alert.banned": "Banned",
+    "alert.banned.message": "You have just been banned, you will now be logged out.",
+    "alert.unfollow": "You are no longer following %1!",
+    "alert.follow": "You are now following %1!",
+    "online": "Online",
+    "users": "Users",
+    "topics": "Topics",
+    "posts": "Posts",
+    "views": "Views",
+    "reputation": "Reputation",
+    "read_more": "read more",
+    "posted_ago_by_guest": "posted %1 by Guest",
+    "posted_ago_by": "posted %1 by %2",
+    "posted_ago": "posted %1",
+    "posted_in_ago_by_guest": "posted in %1 %2 by Guest",
+    "posted_in_ago_by": "posted in %1 %2 by %3",
+    "posted_in_ago": "posted in %1 %2",
+    "replied_ago": "replied %1",
+    "user_posted_ago": "%1 posted %2",
+    "guest_posted_ago": "Guest posted %1",
+    "last_edited_by_ago": "last edited by %1 %2",
+    "norecentposts": "No Recent Posts",
+    "norecenttopics": "No Recent Topics",
+    "recentposts": "Recent Posts",
+    "recentips": "Recently Logged In IPs",
+    "away": "Away",
+    "dnd": "Do not Disturb",
+    "invisible": "Invisible",
+    "offline": "Offline",
+    "email": "Email",
+    "language": "Language",
+    "guest": "Guest",
+    "guests": "Guests"
+}

public/language/ar/language.json

@@ -0,0 +1,5 @@
+{
+    "name": "العربية",
+    "code": "ar",
+    "dir": "rtl"
+}

public/language/ar/login.json

@@ -0,0 +1,8 @@
+{
+    "username": "Username / Email",
+    "remember_me": "تذكرني؟",
+    "forgot_password": "نسيت كلمة المرور؟",
+    "alternative_logins": "تسجيلات الدخول البديلة",
+    "failed_login_attempt": "فشلت محاولة تسجيل الدخول، يرجى المحاولة مرة أخرى.",
+    "login_successful": "قمت بتسجيل الدخول بنجاح!"
+}

public/language/ar/modules.json

@@ -0,0 +1,8 @@
+{
+    "chat.chatting_with": "الدردشة مع <span id=\"chat-with-name\"></span>",
+    "chat.placeholder": "اكتب رسالة دردشة هنا، وإضغط ENTER لإرسال",
+    "chat.send": "أرسل",
+    "chat.no_active": "لا يوجد لديك دردشات نشطة.",
+    "chat.user_typing": "%1 is typing ...",
+    "chat.user_has_messaged_you": "%1 has messaged you."
+}

public/language/ar/notifications.json

@@ -0,0 +1,18 @@
+{
+    "title": "إعلام",
+    "no_notifs": "You have no new notifications",
+    "see_all": "See all Notifications",
+    "back_to_home": "العودة إلى NodeBB",
+    "outgoing_link": "رابط خارجي",
+    "outgoing_link_message": "أنت الأن ترحل",
+    "continue_to": "أكمل إلى",
+    "return_to": "إرجع إلى",
+    "new_notification": "New Notification",
+    "you_have_unread_notifications": "You have unread notifications.",
+    "user_made_post": "<strong>%1</strong> made a new post",
+    "new_message_from": "New message from <strong>%1</strong>",
+    "upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
+    "favourited_your_post": "<strong>%1</strong> has favourited your post.",
+    "user_flagged_post": "<strong>%1</strong> flagged a post.",
+    "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>"
+}

public/language/ar/pages.json

@@ -0,0 +1,15 @@
+{
+    "home": "Home",
+    "unread": "Unread Topics",
+    "popular": "Popular Topics",
+    "recent": "Recent Topics",
+    "users": "Registered Users",
+    "notifications": "Notifications",
+    "user.edit": "Editing \"%1\"",
+    "user.following": "People %1 Follows",
+    "user.followers": "People who Follow %1",
+    "user.posts": "Posts made by %1",
+    "user.topics": "Topics created by %1",
+    "user.favourites": "%1's Favourite Posts",
+    "user.settings": "User Settings"
+}

public/language/ar/recent.json

@@ -0,0 +1,7 @@
+{
+    "title": "Recent",
+    "day": "يوم",
+    "week": "أسبوع",
+    "month": "شهر",
+    "no_recent_topics": "There are no recent topics."
+}

public/language/ar/register.json

@@ -0,0 +1,18 @@
+{
+    "register": "تسجيل",
+    "help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من الجمهور.",
+    "help.username_restrictions": "اسم مستخدم فريدة من نوعها بين1% و2% حرفا. يمكن للآخرين ذكرك @ <'span id='your-username> اسم المستخدم </span>.",
+    "help.minimum_password_length": "كلمتك السر يجب أن تكون على الأقل متألفة من 1% أحرف",
+    "email_address": "عنوان البريد الإلكتروني",
+    "email_address_placeholder": "ادخل عنوان البريد الإلكتروني",
+    "username": "اسم المستخدم",
+    "username_placeholder": "أدخل اسم المستخدم",
+    "password": "كلمة السر",
+    "password_placeholder": "أدخل كلمة السر",
+    "confirm_password": "تأكيد كلمة السر",
+    "confirm_password_placeholder": "تأكيد كلمة السر",
+    "register_now_button": "قم بالتسجيل الآن",
+    "alternative_registration": "التسجيل البديلة",
+    "terms_of_use": "Terms of Use",
+    "agree_to_terms_of_use": "I agree to the Terms of Use"
+}

public/language/ar/reset_password.json

@@ -0,0 +1,14 @@
+{
+    "reset_password": "إعادة تعيين كلمة السر",
+    "update_password": "تحديث كلمة السر",
+    "password_changed.title": "تم تغير كلمة السر",
+    "password_changed.message": "<p>تم تغير كلمة السر بنجاح. يرجى <a href='/login'>إعادة الدخول</a></p>",
+    "wrong_reset_code.title": "إعادة تعيين رمز غير صحيح",
+    "wrong_reset_code.message": "رامز إعادة التعين غير صحيح، يرجى المحاولة مرة أخرى أو <a href='/reset'>اطلب رمز جديد</a>",
+    "new_password": "كلمة السر الجديدة",
+    "repeat_password": "تأكيد كلمة السر",
+    "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
+    "enter_email_address": "Enter Email Address",
+    "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
+    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
+}

public/language/ar/success.json

@@ -0,0 +1,6 @@
+{
+    "success": "Success",
+    "topic-post": "You have successfully posted.",
+    "authentication-successful": "Authentication Successful",
+    "settings-saved": "Settings saved!"
+}