fix upgrade script for notification types

https://github.com/NodeBB/NodeBB/issues/6620

.codeclimate.yml

@@ -1,30 +1,16 @@
 # Save as .codeclimate.yml (note leading .) in project root directory
 version: "2"
 languages:
-  Ruby: false
+  Ruby: true
   JavaScript: true
-  PHP: false
+  PHP: true
 checks:
   file-lines:
     config:
       threshold: 500
   method-lines:
     config:
-      threshold: 75
+      threshold: 50
-  method-complexity:
-    config:
-      threshold: 10
-  similar-code:
-    config:
-      threshold: 65
-plugins:
-  duplication:
-    enabled: true
-    config:
-      languages:
-        javascript:
-          mass_threshold: 110
-          count_threshold: 3
 exclude_paths:
 - "public/vendor/*"
 - "test/*"

.dockerignore

@@ -1,10 +0,0 @@
-.*
-logs
-test
-node_modules
-commitlint.config.js
-nodebb.bat
-renovate.json
-*.yml
-*.md
-Dockerfile

.eslintignore

@@ -7,6 +7,7 @@ node_modules/
 logs/
 /public/templates
 /public/uploads
+/public/sounds
 /public/vendor
 /public/src/modules/string.js
 .idea/
@@ -18,4 +19,3 @@ logs/
 .eslintrc
 test/files
 *.min.js
-install/docker/

.eslintrc

@@ -1,3 +1,136 @@
 {
-	"extends": "nodebb"
+	"extends": "airbnb-base",
+	"parserOptions": {
+		"sourceType": "script"
+	},
+
+	"rules": {
+		// Customized
+		"handle-callback-err": [ "error","^(e$|(e|(.*(_e|E)))rr)" ],
+		"comma-dangle": ["error", {
+			"arrays": "always-multiline",
+			"objects": "always-multiline",
+			"imports": "always-multiline",
+			"exports": "always-multiline",
+			"functions": "never"
+		}],
+		"no-empty": ["error", { "allowEmptyCatch": true }],
+		"no-underscore-dangle": "off",
+		"newline-per-chained-call": "off",
+		"no-console": "off",
+		"no-mixed-operators": ["error", { "allowSamePrecedence": true }],
+		"strict": ["error", "global"],
+		"consistent-return": "off",
+		"func-names": "off",
+		"no-tabs": "off",
+		"indent": ["error", "tab"],
+		"no-eq-null": "off",
+		"camelcase": "off",
+		"no-new": "off",
+		"no-shadow": "off",
+		"no-use-before-define": ["error", "nofunc"],
+		"no-prototype-builtins": "off",
+		"new-cap": "off",
+		"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
+		"object-curly-newline": "off",
+		"no-restricted-globals": "off",
+		"function-paren-newline": "off",
+		"import/no-unresolved": "error",
+		"quotes": ["error", "single", {
+			"avoidEscape": true,
+			"allowTemplateLiterals": true
+		}],
+
+		// ES6
+		"prefer-rest-params": "off",
+		"prefer-spread": "off",
+		"prefer-arrow-callback": "off",
+		"prefer-template": "off",
+		"no-var": "off",
+		"object-shorthand": "off",
+		"vars-on-top": "off",
+		"prefer-destructuring": "off",
+
+		// TODO
+		"import/no-extraneous-dependencies": "off",
+		"import/no-dynamic-require": "off",
+		"import/newline-after-import": "off",
+		"no-bitwise": "off",
+		"global-require": "off",
+		"max-len": "off",
+		"no-param-reassign": "off",
+		"no-restricted-syntax": "off",
+		"no-script-url": "off",
+		"default-case": "off",
+		"linebreak-style": "off",
+
+		// "no-multi-assign": "off",
+		// "one-var": "off",
+		// "no-undef": "off",
+		// "max-nested-callbacks": "off",
+		// "no-mixed-requires": "off",
+		// "brace-style": "off",
+		// "max-statements-per-line": "off",
+		// "no-unused-vars": "off",
+		// "no-mixed-spaces-and-tabs": "off",
+		// "no-useless-concat": "off",
+		// "require-jsdoc": "off",
+		// "eqeqeq": "off",
+		// "no-negated-condition": "off",
+		// "one-var-declaration-per-line": "off",
+		// "no-lonely-if": "off",
+		// "radix": "off",
+		// "no-else-return": "off",
+		// "no-useless-escape": "off",
+		// "block-scoped-var": "off",
+		// "operator-assignment": "off",
+		// "yoda": "off",
+		// "no-loop-func": "off",
+		// "no-void": "off",
+		// "valid-jsdoc": "off",
+		// "no-cond-assign": "off",
+		// "no-redeclare": "off",
+		// "no-unreachable": "off",
+		// "no-nested-ternary": "off",
+		// "operator-linebreak": "off",
+		// "guard-for-in": "off",
+		// "no-unneeded-ternary": "off",
+		// "no-sequences": "off",
+		// "no-extend-native": "off",
+		// "no-shadow-restricted-names": "off",
+		// "no-extra-boolean-cast": "off",
+		// "no-path-concat": "off",
+		// "no-unused-expressions": "off",
+		// "no-return-assign": "off",
+		// "no-restricted-modules": "off",
+		// "object-curly-spacing": "off",
+		// "indent": "off",
+		// "padded-blocks": "off",
+		// "eol-last": "off",
+		// "lines-around-directive": "off",
+		// "strict": "off",
+		// "comma-dangle": "off",
+		// "no-multi-spaces": "off",
+		// "quotes": "off",
+		// "keyword-spacing": "off",
+		// "no-mixed-operators": "off",
+		// "comma-spacing": "off",
+		// "no-trailing-spaces": "off",
+		// "key-spacing": "off",
+		// "no-multiple-empty-lines": "off",
+		// "spaced-comment": "off",
+		// "space-in-parens": "off",
+		// "block-spacing": "off",
+		// "quote-props": "off",
+		// "space-unary-ops": "off",
+		// "no-empty": "off",
+		// "dot-notation": "off",
+		// "func-call-spacing": "off",
+		// "array-bracket-spacing": "off",
+		// "object-property-newline": "off",
+		// "no-continue": "off",
+		// "no-extra-semi": "off",
+		// "no-spaced-func": "off",
+		// "no-useless-return": "off"
+	}
 }

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,26 @@
+<!-- 
+	== Github Issues are for bug reports and feature requests only ==
+	== Please visit https://community.nodebb.org for other support ==
+	== Found a security exploit? Please email us at security@nodebb.org instead for immediate attention ==
+	==   → DO NOT SUBMIT VULNERABILITIES TO THE PUBLIC BUG TRACKER ==
+-->
+
+<!-- ++ Please include the following information when submitting a bug report ++ -->
+
+- **NodeBB version:** 
+- **NodeBB git hash:** 
+<!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
+- **Database type:** mongo, redis, or postgres
+- **Database version:** 
+<!-- `mongod --version`, `redis-server --version`, or `postgres --version` -->
+- **Exact steps to cause this issue:**
+<!--
+	1. First I did this...
+	2. Then, I clicked on this item...
+-->
+- **What you expected:**
+<!-- e.g. I expected *abc* to *xyz* -->
+- **What happened instead:**
+<!-- e.g. Instead, I got *zyx* and NodeBB set fire to my house -->
+
+<!-- Thank you! -->

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,81 +0,0 @@
-name: Bug Report
-description: File a bug report
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Github Issues are for bug reports and feature requests only
-        Please visit https://community.nodebb.org for other support
-        Found a security exploit? Please email us at security@nodebb.org instead for immediate attention
-        ### → DO NOT SUBMIT VULNERABILITIES TO THE PUBLIC BUG TRACKER ←
-  - type: input
-    attributes:
-      label: NodeBB version
-      placeholder: e.g. v2.2.0
-  - type: input
-    attributes:
-      label: NodeBB git hash
-      description: to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory
-      placeholder: e.g. 783250ee6f8c51cdc243ce3b8d9f1a080517247e
-  - type: input
-    attributes:
-      label: NodeJS version
-      placeholder: e.g. v16.15.1
-  - type: textarea
-    attributes:
-      label: Installed NodeBB plugins
-      description: to find installed plugins run `./nodebb plugins`
-      placeholder: |
-        e.g.
-        * nodebb-plugin-2factor@5.0.1 (installed, disabled)
-        * nodebb-plugin-composer-default@8.0.0 (installed, enabled)
-        * nodebb-plugin-dbsearch@5.1.5 (installed, disabled)
-        * nodebb-plugin-emoji@4.0.4 (installed, enabled)
-        * nodebb-plugin-emoji-android@3.0.0 (installed, enabled)
-        * nodebb-plugin-markdown@10.0.0 (installed, enabled)
-        * nodebb-plugin-mentions@3.0.11 (installed, enabled)
-        * nodebb-plugin-spam-be-gone@1.0.0 (installed, disabled)
-        * nodebb-rewards-essentials@0.2.1 (installed, enabled)
-        * nodebb-theme-lavender@6.0.0 (installed, disabled)
-        * nodebb-theme-persona@12.0.11 (installed, enabled)
-        * nodebb-theme-slick@2.0.2 (installed, disabled)
-        * nodebb-theme-vanilla@12.1.18 (installed, disabled)
-        * nodebb-widget-essentials@6.0.0 (installed, enabled)
-  - type: dropdown
-    attributes:
-      label: Database type
-      multiple: true
-      options:
-        - MongoDB
-        - Redis
-        - PostgreSQL
-  - type: input
-    attributes:
-      label: Database version
-      description: "`mongod --version`, `redis-server --version`, or `postgres --version`"
-      placeholder: e.g. v5.0.9
-  - type: textarea
-    attributes:
-      label: Exact steps to cause this issue
-      placeholder: |
-        1. First I did this...
-        2. Then, I clicked on this item...
-
-        A quick note: MP4 and MOV formatted video files are now allowed to be uploaded to GH.
-        Please upload if reproduction steps are hard to describe or reproduce reliably.
-  - type: textarea
-    attributes:
-      label: What you expected
-      placeholder: e.g. I expected *abc* to *xyz*
-  - type: textarea
-    attributes:
-      label: What happened instead
-      placeholder: e.g. Instead, I got *zyx* and NodeBB set fire to my house
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: Any additional context about the issue you're encountering
-  - type: markdown
-    attributes:
-      value: "**Thank you!**"

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Community Forum
-    url: https://community.nodebb.org
-    about: Github Issues are for bug reports and feature requests only, please use community forum for other support

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,24 +0,0 @@
-name: Feature Request
-description: Suggest a new feature
-labels: ["enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Github Issues are for bug reports and feature requests only
-        Please visit https://community.nodebb.org for other support
-        Found a security exploit? Please email us at security@nodebb.org instead for immediate attention
-        ### → DO NOT SUBMIT VULNERABILITIES TO THE PUBLIC BUG TRACKER ←
-  - type: textarea
-    attributes:
-      label: Description
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Community forum reference
-      description: If this feature was already discussed on the Community Forum link it here
-      placeholder: https://community.nodebb.org/topic/0/example-feature-request
-  - type: markdown
-    attributes:
-      value: "**Thank you!**"

.github/SECURITY.md

@@ -1,9 +0,0 @@
-# Reporting a security vulnerability
-
-NodeBB's security policy is based around a private bug bounty program. Users are invited to explore NodeBB for vulnerabilities, and report them to the NodeBB team so that they can be patched.
-
-If you have found a security vulnerability, **do not post it onto our GitHub tracker**. Some security vulnerabilities are quite severe and discretion is recommended. Email the NodeBB Security Team at security@nodebb.org, instead, even if you are not sure whether something qualifies.
-
-# Bug Bounty Program
-
-Security vulnerability reports may be eligible for a bounty based on severity and confirmation from NodeBB team members. For full details regarding our bug bounty program, including the bounty amounts, please consult the [dedicated page for our Bug Bounty Program](https://nodebb.org/bounty).

.github/workflows/docker.yml

@@ -1,61 +0,0 @@
-name: Run Docker
-
-# Controls when the workflow will run
-on:
-  push:
-    branches:
-      - 'master'
-      - 'v*.x'
-    tags:
-      - 'v*'
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-permissions:
-  contents: read
-  packages: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ github.repository }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}.x
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=ref,event=branch,enable=${{ github.event.repository.default_branch != github.ref }}
-
-      - name: Build and push Docker images
-        uses: docker/build-push-action@v5
-        with:
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/test.yaml

@@ -1,212 +0,0 @@
-name: Lint and test
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-    branches:
-      - master
-      - develop
-
-defaults:
-  run:
-    shell: bash
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    permissions:
-      checks: write  # for coverallsapp/github-action to create new checks
-      contents: read  # for actions/checkout to fetch code
-    name: Lint and test
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        node: [18, 20]
-        database: [mongo-dev, mongo, redis, postgres]
-        include:
-          # only run coverage once
-          - os: ubuntu-latest
-            node: 18
-            coverage: true
-          # test under development once
-          - database: mongo-dev
-            test_env: development
-          # only run eslint once
-          - os: ubuntu-latest
-            node: 18
-            database: mongo-dev
-            lint: true
-    runs-on: ${{ matrix.os }}
-    env:
-      TEST_ENV: ${{ matrix.test_env || 'production' }}
-
-    services:
-      postgres:
-        image: 'postgres:16-alpine'
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps port 5432 on service container to the host
-          - 5432:5432
-
-      redis:
-        image: 'redis:7.2.3'
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps port 6379 on service container to the host
-          - 6379:6379
-
-      mongo:
-        image: 'mongo:7.0'
-        ports:
-          # Maps port 27017 on service container to the host
-          - 27017:27017
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - run: cp install/package.json package.json
-
-      - name: Install Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-
-      - name: NPM Install
-        uses: bahmutov/npm-install@v1
-        with:
-          useLockFile: false
-
-      - name: Setup on MongoDB
-        if: startsWith(matrix.database, 'mongo')
-        env:
-          SETUP: >-
-            {
-              "url": "http://127.0.0.1:4567",
-              "secret": "abcdef",
-              "admin:username": "admin",
-              "admin:email": "test@example.org",
-              "admin:password": "hAN3Eg8W",
-              "admin:password:confirm": "hAN3Eg8W",
-
-              "database": "mongo",
-              "mongo:host": "127.0.0.1",
-              "mongo:port": 27017,
-              "mongo:username": "",
-              "mongo:password": "",
-              "mongo:database": "nodebb"
-            }
-          CI: >-
-            {
-              "host": "127.0.0.1",
-              "port": 27017,
-              "database": "ci_test"
-            }
-        run: |
-          node app --setup="${SETUP}" --ci="${CI}"
-
-      - name: Setup on PostgreSQL
-        if: startsWith(matrix.database, 'postgres')
-        env:
-          SETUP: >-
-            {
-              "url": "http://127.0.0.1:4567",
-              "secret": "abcdef",
-              "admin:username": "admin",
-              "admin:email": "test@example.org",
-              "admin:password": "hAN3Eg8W",
-              "admin:password:confirm": "hAN3Eg8W",
-
-              "database": "postgres",
-              "postgres:host": "127.0.0.1",
-              "postgres:port": 5432,
-              "postgres:username": "postgres",
-              "postgres:password": "postgres",
-              "postgres:database": "nodebb"
-            }
-          CI: >-
-            {
-              "host": "127.0.0.1",
-              "database": "ci_test",
-              "port": 5432,
-              "username": "postgres",
-              "password": "postgres"
-            }
-        run: |
-          node -e "const { Client } = require('pg'); const c = new Client({ host: '127.0.0.1', port: 5432, user: 'postgres', password: 'postgres' }); c.connect().then(() => c.query('CREATE DATABASE nodebb')).then(() => c.query('CREATE DATABASE ci_test')).then(() => c.end())"
-          node app --setup="${SETUP}" --ci="${CI}"
-
-      - name: Setup on Redis
-        if: startsWith(matrix.database, 'redis')
-        env:
-          SETUP: >-
-            {
-              "url": "http://127.0.0.1:4567/forum",
-              "secret": "abcdef",
-              "admin:username": "admin",
-              "admin:email": "test@example.org",
-              "admin:password": "hAN3Eg8W",
-              "admin:password:confirm": "hAN3Eg8W",
-
-              "database": "redis",
-              "redis:host": "127.0.0.1",
-              "redis:port": 6379,
-              "redis:password": "",
-              "redis:database": 0
-            }
-          CI: >-
-            {
-              "host": "127.0.0.1",
-              "database": 1,
-              "port": 6379
-            }
-        run: |
-          node app --setup="${SETUP}" --ci="${CI}"
-
-      - name: Run ESLint
-        if: matrix.lint
-        run: npm run lint
-
-      - name: Node tests
-        run: npm test
-
-      - name: Extract coverage info
-        run: npm run coverage
-
-      - name: Test coverage
-        uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2.2.3
-        if: matrix.coverage
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          flag-name: ${{ matrix.os }}-node-${{ matrix.node }}-db-${{ matrix.database }}
-          parallel: true
-
-  finish:
-    permissions:
-      checks: write  # for coverallsapp/github-action to create new checks
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Coveralls Finished
-        uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2.2.3
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          parallel-finished: true

.gitignore

@@ -1,4 +1,3 @@
-dist/
 yarn.lock
 npm-debug.log
 node_modules/
@@ -28,6 +27,7 @@ pidfile
 # templates
 /public/templates
 
+/public/sounds
 /public/uploads
 /test/uploads
 
@@ -40,7 +40,6 @@ pidfile
 /public/acp.min.js.map
 /public/installer.css
 /public/installer.min.js
-/public/bootstrap.min.css
 /public/logo.png
 
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
@@ -67,8 +66,3 @@ test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
 package-lock.json
 /package.json
-*.mongodb
-link-plugins.sh
-test.sh
-
-.docker/

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/commit-msg

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit $1

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx --no-install lint-staged

.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,89 @@
+{
+    // 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" : true, // true: Require all defined variables be used
+    "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
+    "mocha": true,
+
+    // 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" : {
+        "Promise": true
+    } // additional predefined global variables
+}

.mocharc.yml

@@ -1,4 +0,0 @@
-reporter: dot
-timeout: 25000
-exit: true
-bail: true

.travis.yml

@@ -0,0 +1,37 @@
+services:
+  - mongodb
+  - redis-server
+  - postgresql
+before_install:
+  - cp install/package.json package.json
+before_script:
+  - sleep 15 # wait for mongodb to be ready
+  - sh -c "if [ '$DB' = 'mongodb' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"mongo\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":0}\"; fi"
+  - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"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}\"; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database nodebb;' -U postgres; psql -c 'create database travis_ci_test;' -U postgres; node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"postgres\\\",\\\"postgres:host\\\":\\\"127.0.0.1\\\",\\\"postgres:port\\\":5432,\\\"postgres:password\\\":\\\"\\\",\\\"postgres:database\\\":\\\"nodebb\\\",\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":5432,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
+after_success:
+  - "npm run coveralls"
+language: node_js
+sudo: false
+dist: trusty
+env:
+  - CXX=g++-4.8 DB=mongodb
+  - CXX=g++-4.8 DB=redis
+  - CXX=g++-4.8 DB=postgres
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - mongodb-3.4-trusty
+    packages:
+      - g++-4.8
+      - mongodb-org-server
+  postgresql: "9.5"
+node_js:
+  - "10"
+  - "8"
+  - "6"
+branches:
+  only:
+    - master
+    - develop

Dockerfile

@@ -1,51 +1,20 @@
-FROM --platform=$BUILDPLATFORM node:lts as npm
+# The base image is the latest 8.x node (LTS)
+FROM node:8.11.4@sha256:3422df4f7532b26b55275ad7b6dc17ec35f77192b04ce22e62e43541f3d28eb3
 
-RUN mkdir -p /usr/src/build && \
+RUN mkdir -p /usr/src/app
-    chown -R node:node /usr/src/build
+WORKDIR /usr/src/app
-WORKDIR /usr/src/build
 
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
+COPY install/package.json /usr/src/app/package.json
+RUN npm install && npm cache clean --force
+COPY . /usr/src/app
 
-COPY --chown=node:node install/package.json /usr/src/build/package.json
+ENV NODE_ENV=production \
-
-USER node
-
-RUN npm install --omit=dev
-
-FROM node:lts as rebuild
-
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-
-RUN mkdir -p /usr/src/build && \
-    chown -R node:node /usr/src/build
-
-COPY --from=npm /usr/src/build /usr/src/build
-
-RUN if [ $BUILDPLATFORM != $TARGETPLATFORM ]; then \
-    npm rebuild && \
-    npm cache clean --force; fi
-
-FROM node:lts-slim as run
-
-ARG NODE_ENV
-ENV NODE_ENV=$NODE_ENV \
     daemon=false \
     silent=false
 
-RUN mkdir -p /usr/src/app && \
+CMD ./nodebb start
-    chown -R node:node /usr/src/app
-
-COPY --chown=node:node --from=rebuild /usr/src/build /usr/src/app
-
-
-WORKDIR /usr/src/app
-
-USER node
-
-COPY --chown=node:node . /usr/src/app
 
+# the default port for NodeBB is exposed outside the container
 EXPOSE 4567
-VOLUME ["/usr/src/app/node_modules", "/usr/src/app/build", "/usr/src/app/public/uploads", "/opt/config"]
-ENTRYPOINT ["./install/docker/entrypoint.sh"]

Gruntfile.js

@@ -1,201 +1,166 @@
 'use strict';
 
-const path = require('path');
+var fork = require('child_process').fork;
-const nconf = require('nconf');
+var env = process.env;
-
+var worker;
-nconf.argv().env({
+var updateWorker;
-	separator: '__',
+var initWorker;
-});
+var incomplete = [];
-const winston = require('winston');
+var running = 0;
-const { fork } = require('child_process');
-
-const { env } = process;
-let worker;
 
 env.NODE_ENV = env.NODE_ENV || 'development';
 
-const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
-const prestart = require('./src/prestart');
-
-prestart.loadConfig(configFile);
-
-const db = require('./src/database');
-const plugins = require('./src/plugins');
-
 module.exports = function (grunt) {
-	const args = [];
+	var args = [];
-
+	var initArgs = ['--build'];
 	if (!grunt.option('verbose')) {
 		args.push('--log-level=info');
-		nconf.set('log-level', 'info');
+		initArgs.push('--log-level=info');
 	}
-	prestart.setupWinston();
 
-	grunt.initConfig({
+	function update(action, filepath, target) {
-		watch: {},
+		var updateArgs = args.slice();
-	});
+		var compiling;
+		var time = Date.now();
 
-	grunt.loadNpmTasks('grunt-contrib-watch');
+		if (target === 'lessUpdated_Client') {
-
+			compiling = 'clientCSS';
-	grunt.registerTask('default', ['watch']);
+		} else if (target === 'lessUpdated_Admin') {
-
+			compiling = 'acpCSS';
-	grunt.registerTask('init', async function () {
+		} else if (target === 'clientUpdated') {
-		const done = this.async();
+			compiling = 'js';
-		let pluginList = [];
+		} else if (target === 'templatesUpdated') {
-		if (!process.argv.includes('--core')) {
+			compiling = 'tpl';
-			await db.init();
+		} else if (target === 'langUpdated') {
-			pluginList = await plugins.getActive();
+			compiling = 'lang';
-			addBaseThemes(pluginList);
+		} else if (target === 'serverUpdated') {
-			if (!pluginList.includes('nodebb-plugin-composer-default')) {
+			// Do nothing, just restart
-				pluginList.push('nodebb-plugin-composer-default');
-			}
-			if (!pluginList.includes('nodebb-theme-harmony')) {
-				pluginList.push('nodebb-theme-harmony');
-			}
 		}
 
-		const styleUpdated_Client = pluginList.map(p => `node_modules/${p}/*.scss`)
+		if (compiling && incomplete.indexOf(compiling) === -1) {
-			.concat(pluginList.map(p => `node_modules/${p}/*.css`))
+			incomplete.push(compiling);
-			.concat(pluginList.map(p => `node_modules/${p}/+(public|static|scss)/**/*.scss`))
+		}
-			.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
-		const clientUpdated = pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
+		updateArgs.push('--build');
-		const serverUpdated = pluginList.map(p => `node_modules/${p}/*.js`)
+		updateArgs.push(incomplete.join(','));
-			.concat(pluginList.map(p => `node_modules/${p}/+(lib|src)/**/*.js`));
 
-		const templatesUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
+		worker.kill();
-		const langUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
+		if (updateWorker) {
-		const interval = 100;
+			updateWorker.kill('SIGKILL');
-		grunt.config(['watch'], {
+		}
-			styleUpdated: {
+		updateWorker = fork('app.js', updateArgs, { env: env });
+		running += 1;
+		updateWorker.on('exit', function () {
+			running -= 1;
+			if (running === 0) {
+				worker = fork('app.js', args, {
+					env: env,
+				});
+				worker.on('message', function () {
+					if (incomplete.length) {
+						incomplete = [];
+
+						if (grunt.option('verbose')) {
+							grunt.log.writeln('NodeBB restarted in ' + (Date.now() - time) + ' ms');
+						}
+					}
+				});
+			}
+		});
+	}
+
+	grunt.initConfig({
+		watch: {
+			lessUpdated_Client: {
 				files: [
-					'public/scss/**/*.scss',
+					'public/less/*.less',
-					...styleUpdated_Client,
+					'!public/less/admin/**/*.less',
+					'node_modules/nodebb-*/**/*.less',
+					'!node_modules/nodebb-*/node_modules/**',
+					'!node_modules/nodebb-*/.git/**',
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
+				},
+			},
+			lessUpdated_Admin: {
+				files: [
+					'public/less/admin/**/*.less',
+					'node_modules/nodebb-*/**/*.less',
+					'!node_modules/nodebb-*/node_modules/**',
+					'!node_modules/nodebb-*/.git/**',
+				],
+				options: {
+					interval: 1000,
 				},
 			},
 			clientUpdated: {
 				files: [
 					'public/src/**/*.js',
-					'public/vendor/**/*.js',
+					'node_modules/nodebb-*/**/*.js',
-					...clientUpdated,
+					'!node_modules/nodebb-*/node_modules/**',
 					'node_modules/benchpressjs/build/benchpress.js',
+					'!node_modules/nodebb-*/.git/**',
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
 			serverUpdated: {
-				files: [
+				files: ['*.js', 'install/*.js', 'src/**/*.js'],
-					'app.js',
-					'install/*.js',
-					'src/**/*.js',
-					'public/src/modules/translator.common.js',
-					'public/src/modules/helpers.common.js',
-					'public/src/utils.common.js',
-					serverUpdated,
-					'!src/upgrades/**',
-				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
 			templatesUpdated: {
 				files: [
 					'src/views/**/*.tpl',
-					...templatesUpdated,
+					'node_modules/nodebb-*/**/*.tpl',
+					'!node_modules/nodebb-*/node_modules/**',
+					'!node_modules/nodebb-*/.git/**',
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
 			langUpdated: {
 				files: [
 					'public/language/en-GB/*.json',
 					'public/language/en-GB/**/*.json',
-					...langUpdated,
+					'node_modules/nodebb-*/**/*.json',
+					'!node_modules/nodebb-*/node_modules/**',
+					'!node_modules/nodebb-*/.git/**',
+					'!node_modules/nodebb-*/plugin.json',
+					'!node_modules/nodebb-*/package.json',
+					'!node_modules/nodebb-*/theme.json',
 				],
 				options: {
-					interval: interval,
+					interval: 1000,
 				},
 			},
-		});
+		},
-		const build = require('./src/meta/build');
-		if (!grunt.option('skip')) {
-			await build.build(true, { watch: true });
-		}
-		run();
-		done();
 	});
 
-	function run() {
+	grunt.loadNpmTasks('grunt-contrib-watch');
-		if (worker) {
-			worker.kill();
-		}
 
-		const execArgv = [];
+	grunt.registerTask('default', ['watch']);
-		const inspect = process.argv.find(a => a.startsWith('--inspect'));
+	env.NODE_ENV = 'development';
-
-		if (inspect) {
-			execArgv.push(inspect);
-		}
 
+	if (grunt.option('skip')) {
 		worker = fork('app.js', args, {
-			env,
+			env: env,
-			execArgv,
+		});
+	} else {
+		initWorker = fork('app.js', initArgs, {
+			env: env,
+		});
+
+		initWorker.on('exit', function () {
+			worker = fork('app.js', args, {
+				env: env,
+			});
 		});
 	}
 
-	grunt.task.run('init');
+	grunt.event.on('watch', update);
-
-	grunt.event.removeAllListeners('watch');
-	grunt.event.on('watch', (action, filepath, target) => {
-		let compiling;
-		if (target === 'styleUpdated') {
-			compiling = ['clientCSS', 'acpCSS'];
-		} else if (target === 'clientUpdated') {
-			compiling = ['js'];
-		} else if (target === 'templatesUpdated') {
-			compiling = ['tpl'];
-		} else if (target === 'langUpdated') {
-			compiling = ['lang'];
-		} else if (target === 'serverUpdated') {
-			// empty require cache
-			const paths = ['./src/meta/build.js', './src/meta/index.js'];
-			paths.forEach(p => delete require.cache[require.resolve(p)]);
-			return run();
-		}
-
-		require('./src/meta/build').build(compiling, { webpack: false }, (err) => {
-			if (err) {
-				winston.error(err.stack);
-			}
-			if (worker) {
-				worker.send({ compiling: compiling });
-			}
-		});
-	});
 };
-
-function addBaseThemes(pluginList) {
-	let themeId = pluginList.find(p => p.includes('nodebb-theme-'));
-	if (!themeId) {
-		return pluginList;
-	}
-	let baseTheme;
-	do {
-		try {
-			baseTheme = require(`${themeId}/theme`).baseTheme;
-		} catch (err) {
-			console.log(err);
-		}
-
-		if (baseTheme) {
-			pluginList.push(baseTheme);
-			themeId = baseTheme;
-		}
-	} while (baseTheme);
-	return pluginList;
-}

README.md

@@ -1,15 +1,21 @@
-# ![NodeBB](public/images/sm-card.png)
+# <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
 
-[![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg)](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml)
+[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
 [![Coverage Status](https://coveralls.io/repos/github/NodeBB/NodeBB/badge.svg?branch=master)](https://coveralls.io/github/NodeBB/NodeBB?branch=master)
+[![Dependency Status](https://david-dm.org/nodebb/nodebb.svg?path=install)](https://david-dm.org/nodebb/nodebb?path=install)
 [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
-[![](https://dcbadge.vercel.app/api/server/p6YKPXu7er?style=flat)](https://discord.gg/p6YKPXu7er)
 
-[**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and supports either Redis, MongoDB, or a PostgreSQL database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB takes the best of the modern web: real-time streaming discussions, mobile responsiveness, and rich RESTful read/write APIs, while staying true to the original bulletin board/forum format &rarr; categorical hierarchies, local user accounts, and asynchronous messaging.
+[**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and built on either a Redis or MongoDB database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB has many modern features out of the box such as social network integration and streaming discussions, while still making sure to be compatible with older browsers.
 
-NodeBB by itself contains a "common core" of basic functionality, while additional functionality and integrations are enabled through the use of third-party plugins.
+Additional functionality is enabled through the use of third-party plugins.
 
-### [Try it now](//try.nodebb.org) | [Documentation](//docs.nodebb.org)
+* [Demo & Meta Discussion](http://community.nodebb.org)
+* [Documentation & Installation Instructions](http://docs.nodebb.org)
+* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
+* [NodeBB Blog](http://blog.nodebb.org)
+* [Premium Hosting for NodeBB](http://www.nodebb.org/ "NodeBB")
+* [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
+* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
 
 ## Screenshots
 
@@ -24,30 +30,31 @@ NodeBB's theming engine is highly flexible and does not restrict your design cho
 [![](http://i.imgur.com/LmHtPhob.png)](http://i.imgur.com/LmHtPho.png)
 [![](http://i.imgur.com/paiJPJkb.jpg)](http://i.imgur.com/paiJPJk.jpg)
 
-Our minimalist "Harmony" theme gets you going right away, no coding experience required.
+Our minimalist "Persona" theme gets you going right away, no coding experience required.
+
+[![](http://i.imgur.com/HwNEXGu.png)](http://i.imgur.com/HwNEXGu.png)
+[![](http://i.imgur.com/II1byYs.png)](http://i.imgur.com/II1byYs.png)
+
 
-![Rendering of a NodeBB install on desktop and mobile devices](https://user-images.githubusercontent.com/923011/228570420-2a4db745-b20d-474a-a571-1b59259508ef.png)
 
 ## How can I follow along/contribute?
 
 * 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 extension of the base templates as well as styling via SCSS or CSS. NodeBB's base theme utilizes [Bootstrap 5](http://getbootstrap.com/) as a frontend toolkit.
+* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extension 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.
-* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://explore.transifex.com/nodebb/nodebb/) for internationalization.
+* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization.
 * 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 the following software to be installed:
 
-* A version of Node.js at least 16 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* A version of Node.js at least 6 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
-* MongoDB, version 3.6 or greater **or** Redis, version 2.8.9 or greater
+* Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
-* If you are using [clustering](https://docs.nodebb.org/configuring/scaling/) you need Redis installed and configured.
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
 
 ## Installation
 
-[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os).
+[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os)
-If installing via the cloud (or using Docker), [please see cloud-based installation documentation](https://docs.nodebb.org/installing/cloud/).
 
 ## Securing NodeBB
 
@@ -60,7 +67,6 @@ It is important to ensure that your NodeBB and database servers are secured. Bea
 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)
 
-
 ## Upgrading NodeBB
 
 Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/configuring/upgrade/)
@@ -70,15 +76,3 @@ Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.node
 NodeBB is licensed under the **GNU General Public License v3 (GPL-3)** (http://www.gnu.org/copyleft/gpl.html).
 
 Interested in a sublicense agreement for use of NodeBB in a non-free/restrictive environment? Contact us at sales@nodebb.org.
-
-## More Information/Links
-
-* [Demo](https://try.nodebb.org)
-* [Developer Community](http://community.nodebb.org)
-* [Documentation & Installation Instructions](https://docs.nodebb.org)
-* [Help translate NodeBB](https://explore.transifex.com/nodebb/nodebb/)
-* [NodeBB Blog](https://nodebb.org/blog)
-* [Premium Hosting for NodeBB](https://www.nodebb.org/ "NodeBB")
-* Unofficial IRC community &ndash; channel `#nodebb` on Libera.chat
-* [Follow us on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
-* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")

app.js

@@ -1,7 +1,7 @@
 /*
 	NodeBB - A better forum platform for the modern web
 	https://github.com/NodeBB/NodeBB/
-	Copyright (C) 2013-2021  NodeBB Inc.
+	Copyright (C) 2013-2017  NodeBB Inc.
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -19,37 +19,38 @@
 
 'use strict';
 
-require('./require-main');
+if (require.main !== module) {
-
+	require.main.require = function (path) {
-const nconf = require('nconf');
+		return require(path);
+	};
+}
 
+var nconf = require('nconf');
 nconf.argv().env({
 	separator: '__',
 });
 
-const winston = require('winston');
+var async = require('async');
-const path = require('path');
+var winston = require('winston');
+var path = require('path');
 
-const file = require('./src/file');
+var file = require('./src/file');
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 global.env = process.env.NODE_ENV || 'production';
 
 // Alternate configuration file support
-const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
+var	configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
 
-const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
+var configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
-
-const prestart = require('./src/prestart');
 
+var prestart = require('./src/prestart');
 prestart.loadConfig(configFile);
-prestart.setupWinston();
 prestart.versionCheck();
-winston.verbose('* using configuration stored in: %s', configFile);
+prestart.setupWinston();
 
 if (!process.send) {
 	// If run using `node app`, log GNU copyright info along with server info
-	winston.info(`NodeBB v${nconf.get('version')} Copyright (C) 2013-${(new Date()).getFullYear()} NodeBB Inc.`);
+	winston.info('NodeBB v' + nconf.get('version') + ' Copyright (C) 2013-' + (new Date()).getFullYear() + ' NodeBB 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('');
@@ -62,21 +63,33 @@ if (nconf.get('setup') || nconf.get('install')) {
 } else if (nconf.get('upgrade')) {
 	require('./src/cli/upgrade').upgrade(true);
 } else if (nconf.get('reset')) {
-	require('./src/cli/reset').reset({
+	var options = {
 		theme: nconf.get('t'),
 		plugin: nconf.get('p'),
 		widgets: nconf.get('w'),
 		settings: nconf.get('s'),
 		all: nconf.get('a'),
+	};
+
+	async.series([
+		async.apply(require('./src/cli/reset').reset, options),
+		require('./src/meta/build').buildAll,
+	], function (err) {
+		if (err) {
+			throw err;
+		}
+
+		process.exit(0);
 	});
 } else if (nconf.get('activate')) {
 	require('./src/cli/manage').activate(nconf.get('activate'));
-} else if (nconf.get('plugins') && typeof nconf.get('plugins') !== 'object') {
+} else if (nconf.get('plugins')) {
 	require('./src/cli/manage').listPlugins();
 } else if (nconf.get('build')) {
-	require('./src/cli/manage').build(nconf.get('build'));
+	require('./src/meta/build').build(nconf.get('build'));
 } else if (nconf.get('events')) {
 	require('./src/cli/manage').listEvents();
 } else {
 	require('./src/start').start();
 }
+

commitlint.config.js

@@ -1,26 +0,0 @@
-'use strict';
-
-module.exports = {
-	extends: ['@commitlint/config-angular'],
-	rules: {
-		'header-max-length': [1, 'always', 72],
-		'type-enum': [
-			2,
-			'always',
-			[
-				'breaking',
-				'build',
-				'chore',
-				'ci',
-				'docs',
-				'feat',
-				'fix',
-				'perf',
-				'refactor',
-				'revert',
-				'style',
-				'test',
-			],
-		],
-	},
-};

docker-compose.yml

@@ -1,55 +0,0 @@
-version: '3.8'
-
-services:
-  nodebb:
-    build: .
-    restart: unless-stopped
-    ports:
-      - "4567:4567/tcp" # comment this out if you don't want to expose NodeBB to the host, or change the first number to any port you want
-    # uncomment if you want to use another container as a reverse proxy
-    # expose:
-    #   - 4567
-    volumes:
-      - ./.docker/build:/usr/src/app/build
-      - ./.docker/public/uploads:/usr/src/app/public/uploads
-      - ./.docker:/opt/config
-      - ./install/docker/setup.json:/usr/src/app/setup.json
-  mongo:
-    image: "mongo:7-jammy"
-    restart: unless-stopped
-    expose:
-      - "27017"
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: nodebb
-      MONGO_INITDB_ROOT_PASSWORD: nodebb
-      MONGO_INITDB_DATABASE: nodebb
-    volumes:
-      - ./.docker/database/mongo/config:/etc/mongo
-      - ./.docker/database/mongo/data:/data/db
-      - ./install/docker/mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js
-    profiles:
-      - mongo
-  postgres:
-    image: postgres:16.1-alpine
-    restart: unless-stopped
-    expose:
-      - "5432"
-    environment:
-      POSTGRES_USER: nodebb
-      POSTGRES_PASSWORD: nodebb
-      POSTGRES_DB: nodebb
-    volumes:
-      - ./.docker/database/postgresql/data:/var/lib/postgresql/data
-    profiles:
-      - postgres
-  redis:
-    image: redis:7.2.3-alpine
-    restart: unless-stopped
-    command: ["redis-server", "--appendonly", "yes", "--loglevel", "warning"]
-    # command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF
-    expose:
-      - "6379"
-    volumes:
-      - ./.docker/database/redis:/data
-    profiles:
-      - redis

install/data/categories.json

@@ -4,7 +4,7 @@
         "description": "Announcements regarding our community",
         "descriptionParsed": "<p>Announcements regarding our community</p>\n",
         "bgColor": "#fda34b",
-        "color": "#ffffff",
+        "color": "#fff",
         "icon" : "fa-bullhorn",
         "order": 1
     },
@@ -13,7 +13,7 @@
         "description": "A place to talk about whatever you want",
         "descriptionParsed": "<p>A place to talk about whatever you want</p>\n",
         "bgColor": "#59b3d0",
-        "color": "#ffffff",
+        "color": "#fff",
         "icon" : "fa-comments-o",
         "order": 2
     },
@@ -22,7 +22,7 @@
         "description": "Blog posts from individual members",
         "descriptionParsed": "<p>Blog posts from individual members</p>\n",
         "bgColor": "#86ba4b",
-        "color": "#ffffff",
+        "color": "#fff",
         "icon" : "fa-newspaper-o",
         "order": 4
     },
@@ -31,7 +31,7 @@
         "description": "Got a question? Ask away!",
         "descriptionParsed": "<p>Got a question? Ask away!</p>\n",
         "bgColor": "#e95c5a",
-        "color": "#ffffff",
+        "color": "#fff",
         "icon" : "fa-question",
         "order": 3
     }

install/data/defaults.json

@@ -1,191 +1,51 @@
 {
     "title": "NodeBB",
     "showSiteTitle": 1,
-    "defaultLang": "en-GB",
-    "loginDays": 14,
-    "loginSeconds": 0,
-    "sessionDuration": 0,
-    "loginAttempts": 5,
-    "lockoutDuration": 60,
-    "adminReloginDuration": 60,
     "postDelay": 10,
     "initialPostDelay": 10,
     "newbiePostDelay": 120,
-    "postEditDuration": 0,
+    "newbiePostDelayThreshold": 3,
-    "newbiePostEditDuration": 3600,
-    "postDeleteDuration": 0,
-    "enablePostHistory": 1,
-    "topicBacklinks": 1,
-    "postCacheSize": 20971520,
-    "disableChat": 0,
-    "chatEditDuration": 0,
-    "chatDeleteDuration": 0,
-    "chatMessageDelay": 2000,
-    "newbieChatMessageDelay": 120000,
-    "notificationSendDelay": 60,
-    "newbieReputationThreshold": 3,
-    "postQueue": 0,
-    "postQueueReputationThreshold": 0,
-    "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
-    "groupsExemptFromNewUserRestrictions": ["administrators", "Global Moderators"],
-    "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,
-    "systemTags": "",
     "minimumTagsPerTopic": 0,
     "maximumTagsPerTopic": 5,
     "minimumTagLength": 3,
     "maximumTagLength": 15,
-    "undoTimeout": 10000,
+    "allowTopicsThumbnail": 0,
-    "allowTopicsThumbnail": 1,
     "registrationType": "normal",
-    "registrationApprovalType": "normal",
     "allowAccountDelete": 1,
-    "privateUploads": 0,
+    "allowFileUploads": 0,
-    "allowedFileExtensions": "png,jpg,bmp,txt",
+    "allowedFileExtensions": "png,jpg,bmp",
-    "uploadRateLimitThreshold": 10,
-    "uploadRateLimitCooldown": 60,
     "allowUserHomePage": 1,
-    "allowMultipleBadges": 0,
     "maximumFileSize": 2048,
-    "stripEXIFData": 1,
-    "orphanExpiryDays": 0,
-    "resizeImageWidthThreshold": 2000,
-    "resizeImageWidth": 760,
-    "rejectImageWidth": 5000,
-    "rejectImageHeight": 5000,
-    "resizeImageQuality": 80,
-    "topicThumbSize": 512,
     "minimumTitleLength": 3,
     "maximumTitleLength": 255,
     "minimumUsernameLength": 2,
     "maximumUsernameLength": 16,
     "minimumPasswordLength": 6,
-    "minimumPasswordStrength": 1,
     "maximumSignatureLength": 255,
     "maximumAboutMeLength": 1000,
-    "maximumUsersInChatRoom": 0,
     "maximumChatMessageLength": 1000,
-    "maximumChatRoomNameLength": 50,
     "maximumProfileImageSize": 256,
     "maximumCoverImageSize": 2048,
     "profileImageDimension": 200,
-    "profile:convertProfileImageToPNG": 0,
+    "requireEmailConfirmation": 0,
-    "profile:keepAllUserImages": 0,
-    "gdpr_enabled": 1,
     "allowProfileImageUploads": 1,
     "teaserPost": "last-reply",
-    "showPostPreviewsOnHover": 1,
     "allowPrivateGroups": 1,
     "unreadCutoff": 2,
     "bookmarkThreshold": 5,
     "autoDetectLang": 1,
-    "reputation:disabled": 0,
-    "downvote:disabled": 0,
-    "disableSignatures": 0,
-    "signatures:hideDuplicates": 0,
-    "upvotesPerDay": 20,
-    "upvotesPerUserPerDay": 6,
-    "downvotesPerDay": 10,
-    "downvotesPerUserPerDay": 3,
-    "min:rep:chat": 0,
-    "min:rep:downvote": 0,
-    "min:rep:upvote": 0,
-    "min:rep:post-links": 0,
     "min:rep:flag": 0,
-    "min:rep:profile-picture": 0,
-    "min:rep:cover-picture": 0,
-    "min:rep:website": 0,
-    "min:rep:aboutme": 0,
-    "min:rep:signature": 0,
-    "flags:limitPerTarget": 0,
-    "flags:autoFlagOnDownvoteThreshold": 0,
-    "flags:actionOnResolve": "rescind",
-    "flags:actionOnReject": "rescind",
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
-    "notificationType_post-edit": "notification",
     "notificationType_follow": "notification",
     "notificationType_new-chat": "notification",
-    "notificationType_new-group-chat": "notification",
     "notificationType_group-invite": "notification",
-    "notificationType_group-leave": "notification",
-    "notificationType_group-request-membership": "notification",
     "notificationType_mention": "notification",
     "notificationType_new-register": "notification",
-    "notificationType_post-queue": "notification",
+	"notificationType_post-queue": "notification",
-    "notificationType_new-post-flag": "notification",
+	"notificationType_new-post-flag": "notification",
-    "notificationType_new-user-flag": "notification",
+	"notificationType_new-user-flag": "notification"
-    "topicStaleDays": 60,
-    "maxTopicsPerPage": 20,
-    "maxPostsPerPage": 20,
-    "topicsPerPage": 20,
-    "postsPerPage": 20,
-    "categoriesPerPage": 50,
-    "userSearchResultsPerPage": 50,
-    "searchDefaultSortBy": "relevance",
-    "searchDefaultIn": "titlesposts",
-    "searchDefaultInQuick": "titles",
-    "maximumGroupNameLength": 255,
-    "maximumGroupTitleLength": 40,
-    "preventTopicDeleteAfterReplies": 0,
-    "feeds:disableSitemap": 0,
-    "feeds:disableRSS": 0,
-    "sitemapTopics": 500,
-    "maintenanceMode": 0,
-    "maintenanceModeStatus": 503,
-    "votesArePublic": 0,
-    "maximumInvites": 0,
-    "username:disableEdit": 0,
-    "email:disableEdit": 0,
-    "email:smtpTransport:pool": 0,
-    "hideFullname": 0,
-    "hideEmail": 0,
-    "showFullnameAsDisplayName": 0,
-    "allowGuestHandles": 0,
-    "guestsIncrementTopicViews": 1,
-    "allowGuestReplyNotifications": 1,
-    "incrementTopicViewsInterval": 60,
-    "recentMaxTopics": 200,
-    "disableRecentCategoryFilter": 0,
-    "maximumRelatedTopics": 0,
-    "disableEmailSubscriptions": 0,
-    "emailConfirmInterval": 10,
-    "emailConfirmExpiry": 24,
-    "removeEmailNotificationImages": 0,
-    "sendValidationEmail": 1,
-    "includeUnverifiedEmails": 0,
-    "emailPrompt": 1,
-    "sendEmailToBanned": 0,
-    "requireEmailAddress": 0,
-    "inviteExpiration": 7,
-    "dailyDigestFreq": "off",
-    "digestHour": 17,
-    "passwordExpiryDays": 0,
-    "cross-origin-embedder-policy": 0,
-    "cross-origin-opener-policy": "same-origin",
-    "cross-origin-resource-policy": "same-origin",
-    "hsts-maxage": 31536000,
-    "hsts-subdomains": 0,
-    "hsts-preload": 0,
-    "hsts-enabled": 0,
-    "eventLoopCheckEnabled": 1,
-    "eventLoopLagThreshold": 100,
-    "eventLoopInterval": 500,
-    "onlineCutoff": 30,
-    "timeagoCutoff": 30,
-    "necroThreshold": 7,
-    "categoryWatchState": "watching",
-    "submitPluginUsage": 1,
-    "showAverageApprovalTime": 1,
-    "autoApproveTime": 0,
-    "maxUserSessions": 10,
-    "useCompression": 0,
-    "updateUrlWithPostIndex": 1,
-    "composer:showHelpTab": 1,
-    "composer:allowPluginHelp": 1,
-    "maxReconnectionAttempts": 5,
-    "reconnectionDelay": 1500,
-    "disableCustomUserSkins": 0
 }

install/data/footer.json

@@ -2,7 +2,7 @@
 	{
 		"widget": "html",
 		"data" : {
-			"html": "<footer id=\"footer\" class=\"container footer d-flex flex-column align-items-center gap-1 mb-2\">\n\t<span>Powered by <a class=\"link-secondary text-decoration-underline\" target=\"_blank\" href=\"https://nodebb.org\">NodeBB</a></span>\n\t<span><a class=\"link-secondary\" target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\"><i class=\"fa fa-users\"></i> <span class=\"text-decoration-underline\">Contributors<span></a></span>\n</footer>",
+			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div>\r\n\t\tPowered by <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
 			"title":"",
 			"container":""
 		}

install/data/navigation.json

@@ -4,7 +4,7 @@
 		"title": "[[global:header.categories]]",
 		"enabled": true,
 		"iconClass": "fa-list",
-		"textClass": "d-lg-none",
+		"textClass": "visible-xs-inline",
 		"text": "[[global:header.categories]]"
 	},
 	{
@@ -13,16 +13,18 @@
 		"title": "[[global:header.unread]]",
 		"enabled": true,
 		"iconClass": "fa-inbox",
-		"textClass": "d-lg-none",
+		"textClass": "visible-xs-inline",
 		"text": "[[global:header.unread]]",
-		"groups": ["registered-users"]
+		"properties": {
+			"loggedIn": true
+		}
 	},
 	{
 		"route": "/recent",
 		"title": "[[global:header.recent]]",
 		"enabled": true,
 		"iconClass": "fa-clock-o",
-		"textClass": "d-lg-none",
+		"textClass": "visible-xs-inline",
 		"text": "[[global:header.recent]]"
 	},
 	{
@@ -30,7 +32,7 @@
 		"title": "[[global:header.tags]]",
 		"enabled": true,
 		"iconClass": "fa-tags",
-		"textClass": "d-lg-none",
+		"textClass": "visible-xs-inline",
 		"text": "[[global:header.tags]]"
 	},
 	{
@@ -38,7 +40,7 @@
 		"title": "[[global:header.popular]]",
 		"enabled": true,
 		"iconClass": "fa-fire",
-		"textClass": "d-lg-none",
+		"textClass": "visible-xs-inline",
 		"text": "[[global:header.popular]]"
 	},
 	{
@@ -46,7 +48,7 @@
 		"title": "[[global:header.users]]",
 		"enabled": true,
 		"iconClass": "fa-user",
-		"textClass": "d-lg-none",
+		"textClass": "visible-xs-inline",
 		"text": "[[global:header.users]]"
 	},
 	{
@@ -54,7 +56,7 @@
 		"title": "[[global:header.groups]]",
 		"enabled": true,
 		"iconClass": "fa-group",
-		"textClass": "d-lg-none",
+		"textClass": "visible-xs-inline",
 		"text": "[[global:header.groups]]"
 	},
 	{
@@ -62,8 +64,11 @@
 		"title": "[[global:header.admin]]",
 		"enabled": true,
 		"iconClass": "fa-cogs",
-		"textClass": "d-lg-none",
+		"textClass": "visible-xs-inline",
 		"text": "[[global:header.admin]]",
-		"groups": ["administrators"]
+		"properties": {
+			"targetBlank": false,
+			"adminOnly": true
+		}
 	}
 ]

install/data/welcome.md

@@ -1,9 +1,9 @@
-### Welcome to your brand new NodeBB forum!
+# Welcome to your brand new NodeBB forum!
 
 This is what a topic and post looks like. As an administrator, you can edit the post\'s title and content.
 To customise your forum, go to the [Administrator Control Panel](../../admin). You can modify all aspects of your forum there, including installation of third-party plugins.
 
-#### Additional Resources
+## Additional Resources
 
 * [NodeBB Documentation](https://docs.nodebb.org)
 * [Community Support Forum](https://community.nodebb.org)

install/databases.js

@@ -1,47 +1,58 @@
 'use strict';
 
-const prompt = require('prompt');
+var async = require('async');
-const winston = require('winston');
+var prompt = require('prompt');
+var winston = require('winston');
 
-const questions = {
+var questions = {
 	redis: require('../src/database/redis').questions,
 	mongo: require('../src/database/mongo').questions,
 	postgres: require('../src/database/postgres').questions,
 };
 
-module.exports = async function (config) {
+module.exports = function (config, callback) {
-	winston.info(`\nNow configuring ${config.database} database:`);
+	async.waterfall([
-	const databaseConfig = await getDatabaseConfig(config);
+		function (next) {
-	return saveDatabaseConfig(config, databaseConfig);
+			winston.info('\nNow configuring ' + config.database + ' database:');
+			getDatabaseConfig(config, next);
+		},
+		function (databaseConfig, next) {
+			saveDatabaseConfig(config, databaseConfig, next);
+		},
+	], callback);
 };
 
-async function getDatabaseConfig(config) {
+function getDatabaseConfig(config, callback) {
 	if (!config) {
-		throw new Error('invalid config, aborted');
+		return callback(new Error('aborted'));
 	}
 
 	if (config.database === 'redis') {
 		if (config['redis:host'] && config['redis:port']) {
-			return config;
+			callback(null, config);
+		} else {
+			prompt.get(questions.redis, callback);
 		}
-		return await prompt.get(questions.redis);
 	} else if (config.database === 'mongo') {
 		if ((config['mongo:host'] && config['mongo:port']) || config['mongo:uri']) {
-			return config;
+			callback(null, config);
+		} else {
+			prompt.get(questions.mongo, callback);
 		}
-		return await prompt.get(questions.mongo);
 	} else if (config.database === 'postgres') {
 		if (config['postgres:host'] && config['postgres:port']) {
-			return config;
+			callback(null, config);
+		} else {
+			prompt.get(questions.postgres, callback);
 		}
-		return await prompt.get(questions.postgres);
+	} else {
+		return callback(new Error('unknown database : ' + config.database));
 	}
-	throw new Error(`unknown database : ${config.database}`);
 }
 
-function saveDatabaseConfig(config, databaseConfig) {
+function saveDatabaseConfig(config, databaseConfig, callback) {
 	if (!databaseConfig) {
-		throw new Error('invalid config, aborted');
+		return callback(new Error('aborted'));
 	}
 
 	// Translate redis properties into redis object
@@ -72,16 +83,15 @@ function saveDatabaseConfig(config, databaseConfig) {
 			username: databaseConfig['postgres:username'],
 			password: databaseConfig['postgres:password'],
 			database: databaseConfig['postgres:database'],
-			ssl: databaseConfig['postgres:ssl'],
 		};
 	} else {
-		throw new Error(`unknown database : ${config.database}`);
+		return callback(new Error('unknown database : ' + config.database));
 	}
 
-	const allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
+	var allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
-	for (let x = 0; x < allQuestions.length; x += 1) {
+	for (var x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}
 
-	return config;
+	callback(null, config);
 }

install/docker/entrypoint.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-export CONFIG_DIR="${CONFIG_DIR:-/opt/config}"
-export CONFIG=$CONFIG_DIR/config.json
-export FORCE_BUILD_BEFORE_START="${FORCE_BUILD_BEFORE_START:-false}"
-
-# Supported verbs: install (web install), setup (interactive CLI session). Default: web install
-# TODO: constraint it using a hash set (or hash table)
-export NODEBB_INIT_VERB="${NODEBB_INIT_VERB:-install}"
-# Setup variable for backward compatibility, default: <empty>
-export SETUP="${SETUP:-}"
-
-mkdir -p $CONFIG_DIR
-
-# if the folder is mounted as a volume this can fail, the check below is to ensure there is still write access
-chmod -fR 760 $CONFIG_DIR 2> /dev/null
-
-if [[ ! -w $CONFIG_DIR ]]; then
-  echo "panic: no write permission for $CONFIG_DIR"
-  exit 1
-fi
-
-[[ -f $CONFIG_DIR/package.json ]] || cp install/package.json $CONFIG_DIR/package.json
-[[ -f $CONFIG_DIR/package-lock.json ]] || touch $CONFIG_DIR/package-lock.json
-
-ln -fs $CONFIG_DIR/package.json package.json
-ln -fs $CONFIG_DIR/package-lock.json package-lock.json
-
-npm install --omit=dev
-
-if [[ -n $SETUP ]]; then
-  echo "Setup environmental variable detected"
-  echo "Starting setup session"
-  ./nodebb setup --config=$CONFIG
-elif [ -f $CONFIG ]; then
-  echo "Config file exist at $CONFIG, assuming it is a valid config"
-  echo "Starting forum"
-  if [ "$FORCE_BUILD_BEFORE_START" = true ]; then
-    ./nodebb build --config=$CONFIG
-  fi
-  ./nodebb start --config=$CONFIG
-else
-  echo "Config file not found at $CONFIG"
-  echo "Starting installation session"
-  ./nodebb "${NODEBB_INIT_VERB}" --config=$CONFIG
-fi

install/docker/mongodb-user-init.js

@@ -1 +0,0 @@
-db.createUser( { user: 'nodebb', pwd: 'nodebb', roles: [ { role: 'readWrite', db: 'nodebb' }, { role: 'clusterMonitor', db: 'admin' } ] } )

install/docker/setup.json

@@ -1,21 +0,0 @@
-{
-    "mongo": {
-        "host": "mongo",
-        "port": 27017,
-        "database": "nodebb",
-        "username": "nodebb",
-        "password": "nodebb"
-    },
-    "redis": {
-        "host": "redis",
-        "port": 6379,
-        "database": 0
-    },
-    "postgres": {
-        "host": "postgres",
-        "port": 5432,
-        "database": "nodebb",
-        "username": "nodebb",
-        "password": "nodebb"
-    }
-}

install/package.json

@@ -2,8 +2,8 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "3.5.1",
+    "version": "1.10.2",
-    "homepage": "https://www.nodebb.org",
+    "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
         "url": "https://github.com/NodeBB/NodeBB/"
@@ -12,178 +12,135 @@
     "scripts": {
         "start": "node loader.js",
         "lint": "eslint --cache ./nodebb .",
+        "pretest": "npm run lint",
         "test": "nyc --reporter=html --reporter=text-summary mocha",
-        "coverage": "nyc report --reporter=text-lcov > ./coverage/lcov.info",
         "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
     },
-    "nyc": {
-        "exclude": [
-            "src/upgrades/*",
-            "test/*"
-        ]
-    },
-    "lint-staged": {
-        "*.js": [
-            "eslint --fix"
-        ]
-    },
     "dependencies": {
-        "@adactive/bootstrap-tagsinput": "0.8.2",
+        "ace-builds": "^1.2.9",
-        "@fontsource/inter": "5.0.15",
+        "archiver": "^3.0.0",
-        "@fontsource/poppins": "5.0.8",
+        "async": "2.6.1",
-        "@fortawesome/fontawesome-free": "6.4.2",
+        "autoprefixer": "^9.0.0",
-        "@isaacs/ttlcache": "1.4.1",
-        "@popperjs/core": "2.11.8",
-        "ace-builds": "1.31.2",
-        "archiver": "6.0.1",
-        "async": "3.2.5",
-        "autoprefixer": "10.4.16",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "2.5.1",
+        "benchpressjs": "^1.2.5",
-        "body-parser": "1.20.2",
+        "body-parser": "^1.18.2",
-        "bootbox": "6.0.0",
+        "bootstrap": "^3.3.7",
-        "bootstrap": "5.3.2",
+        "chart.js": "^2.7.1",
-        "bootswatch": "5.3.2",
+        "cli-graph": "^3.2.2",
-        "chalk": "4.1.2",
+        "clipboard": "^2.0.1",
-        "chart.js": "4.4.0",
+        "colors": "^1.1.2",
-        "cli-graph": "3.2.2",
+        "commander": "^2.12.2",
-        "clipboard": "2.0.11",
+        "compression": "^1.7.1",
-        "colors": "1.4.0",
+        "connect-ensure-login": "^0.1.1",
-        "commander": "11.1.0",
+        "connect-flash": "^0.1.1",
-        "compare-versions": "6.1.0",
+        "connect-mongo": "2.0.1",
-        "compression": "1.7.4",
+        "connect-multiparty": "^2.1.0",
-        "connect-flash": "0.1.1",
+        "connect-pg-simple": "^5.0.0",
-        "connect-mongo": "5.1.0",
+        "connect-redis": "3.4.0",
-        "connect-multiparty": "2.2.0",
+        "continuation-local-storage": "^3.2.1",
-        "connect-pg-simple": "9.0.1",
+        "cookie-parser": "^1.4.3",
-        "connect-redis": "7.1.0",
+        "cron": "^1.3.0",
-        "cookie-parser": "1.4.6",
+        "cropperjs": "^1.2.2",
-        "cron": "3.1.6",
+        "csurf": "^1.9.0",
-        "cropperjs": "1.6.1",
+        "daemon": "^1.1.0",
-        "csrf-sync": "4.0.1",
+        "diff": "^3.4.0",
-        "daemon": "1.1.0",
+        "express": "^4.16.2",
-        "diff": "5.1.0",
+        "express-session": "^1.15.6",
-        "esbuild": "0.19.5",
+        "express-useragent": "^1.0.12",
-        "express": "4.18.2",
+        "graceful-fs": "^4.1.11",
-        "express-session": "1.17.3",
+        "helmet": "^3.11.0",
-        "express-useragent": "1.0.15",
+        "html-to-text": "^4.0.0",
-        "file-loader": "6.2.0",
+        "ipaddr.js": "^1.5.4",
-        "fs-extra": "11.1.1",
+        "jquery": "^3.2.1",
-        "graceful-fs": "4.2.11",
+        "jsesc": "2.5.1",
-        "helmet": "7.1.0",
+        "json-2-csv": "^2.1.2",
-        "html-to-text": "9.0.5",
+        "less": "^2.7.3",
-        "imagesloaded": "5.0.0",
+        "lodash": "^4.17.10",
-        "ipaddr.js": "2.1.0",
+        "logrotate-stream": "^0.2.5",
-        "jquery": "3.7.1",
+        "lru-cache": "4.1.3",
-        "jquery-deserialize": "2.0.0",
+        "material-design-lite": "^1.3.0",
-        "jquery-form": "4.3.0",
+        "mime": "^2.2.0",
-        "jquery-serializeobject": "1.0.0",
+        "mkdirp": "^0.5.1",
-        "jquery-ui": "1.13.2",
+        "mongodb": "3.1.6",
-        "jsesc": "3.0.2",
+        "morgan": "^1.9.0",
-        "json2csv": "5.0.7",
+        "mousetrap": "^1.6.1",
-        "jsonwebtoken": "9.0.2",
+        "mubsub-nbb": "^1.5.0",
-        "lodash": "4.17.21",
+        "nconf": "^0.10.0",
-        "logrotate-stream": "0.2.9",
+        "nodebb-plugin-composer-default": "6.1.4",
-        "lru-cache": "10.0.2",
+        "nodebb-plugin-dbsearch": "2.0.21",
-        "mime": "3.0.0",
+        "nodebb-plugin-emoji": "^2.2.5",
-        "mkdirp": "3.0.1",
+        "nodebb-plugin-emoji-android": "2.0.0",
-        "mongodb": "6.3.0",
+        "nodebb-plugin-markdown": "8.8.0",
-        "morgan": "1.10.0",
+        "nodebb-plugin-mentions": "2.2.10",
-        "mousetrap": "1.6.5",
+        "nodebb-plugin-soundpack-default": "1.0.0",
-        "multiparty": "4.2.3",
+        "nodebb-plugin-spam-be-gone": "0.5.4",
-        "nconf": "0.12.1",
+        "nodebb-rewards-essentials": "0.0.11",
-        "nodebb-plugin-2factor": "7.4.0",
+        "nodebb-theme-lavender": "5.0.8",
-        "nodebb-plugin-composer-default": "10.2.27",
+        "nodebb-theme-persona": "9.0.42",
-        "nodebb-plugin-dbsearch": "6.2.3",
+        "nodebb-theme-slick": "1.2.11",
-        "nodebb-plugin-emoji": "5.1.13",
+        "nodebb-theme-vanilla": "10.1.6",
-        "nodebb-plugin-emoji-android": "4.0.0",
+        "nodebb-widget-essentials": "4.0.7",
-        "nodebb-plugin-markdown": "12.2.5",
+        "nodemailer": "^4.6.5",
-        "nodebb-plugin-mentions": "4.3.7",
+        "passport": "^0.4.0",
-        "nodebb-plugin-ntfy": "1.7.3",
-        "nodebb-plugin-spam-be-gone": "2.2.0",
-        "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.1.99",
-        "nodebb-theme-lavender": "7.1.5",
-        "nodebb-theme-peace": "2.1.25",
-        "nodebb-theme-persona": "13.2.47",
-        "nodebb-widget-essentials": "7.0.14",
-        "nodemailer": "6.9.7",
-        "nprogress": "0.2.0",
-        "passport": "0.6.0",
-        "passport-http-bearer": "1.0.1",
         "passport-local": "1.0.0",
-        "pg": "8.11.3",
+        "pg": "^7.4.0",
-        "pg-cursor": "2.10.3",
+        "pg-cursor": "^1.3.0",
-        "postcss": "8.4.31",
+        "postcss": "7.0.5",
-        "postcss-clean": "1.2.0",
+        "postcss-clean": "1.1.0",
-        "progress-webpack-plugin": "1.0.16",
+        "promise-polyfill": "^8.0.0",
-        "prompt": "1.3.0",
+        "prompt": "^1.0.0",
-        "ioredis": "5.3.2",
+        "redis": "2.8.0",
-        "request": "2.88.2",
+        "request": "2.88.0",
-        "request-promise-native": "1.0.9",
+        "rimraf": "2.6.2",
-        "rimraf": "5.0.5",
+        "rss": "^1.2.2",
-        "rss": "1.2.2",
+        "sanitize-html": "^1.16.3",
-        "rtlcss": "4.1.1",
+        "semver": "^5.4.1",
-        "sanitize-html": "2.11.0",
+        "serve-favicon": "^2.4.5",
-        "sass": "1.69.5",
+        "sharp": "0.21.0",
-        "semver": "7.5.4",
+        "sitemap": "^1.13.0",
-        "serve-favicon": "2.5.0",
+        "socket.io": "2.1.1",
-        "sharp": "0.32.6",
+        "socket.io-adapter-cluster": "^1.0.1",
-        "sitemap": "7.1.1",
+        "socket.io-adapter-mongo": "^2.0.1",
-        "socket.io": "4.7.2",
+        "socket.io-adapter-postgres": "^1.0.1",
-        "socket.io-client": "4.7.2",
+        "socket.io-client": "2.1.1",
-        "@socket.io/redis-adapter": "8.2.1",
+        "socket.io-redis": "5.2.0",
-        "sortablejs": "1.15.0",
+        "socketio-wildcard": "2.0.0",
-        "spdx-license-list": "6.8.0",
+        "spdx-license-list": "^4.0.0",
-        "spider-detector": "2.0.1",
+        "spider-detector": "1.0.18",
-        "terser-webpack-plugin": "5.3.9",
+        "toobusy-js": "^0.5.1",
-        "textcomplete": "0.18.2",
+        "uglify-es": "^3.3.9",
-        "textcomplete.contenteditable": "0.1.1",
+        "util.promisify": "1.0.0",
-        "timeago": "1.6.7",
+        "validator": "10.8.0",
-        "tinycon": "0.6.8",
+        "winston": "^2.4.0",
-        "toobusy-js": "0.5.1",
+        "xml": "^1.0.1",
-        "validator": "13.11.0",
+        "xregexp": "^4.1.1",
-        "webpack": "5.89.0",
+        "zxcvbn": "^4.4.2"
-        "webpack-merge": "5.10.0",
-        "winston": "3.11.0",
-        "workerpool": "8.0.0",
-        "xml": "1.0.1",
-        "xregexp": "5.1.1",
-        "yargs": "17.7.2",
-        "zxcvbn": "4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "10.1.0",
+        "coveralls": "3.0.2",
-        "@commitlint/cli": "18.4.2",
+        "eslint": "5.6.1",
-        "@commitlint/config-angular": "18.4.2",
+        "eslint-config-airbnb-base": "12.1.0",
-        "coveralls": "3.1.1",
+        "eslint-plugin-import": "2.14.0",
-        "eslint": "8.54.0",
+        "grunt": "1.0.3",
-        "eslint-config-nodebb": "0.2.1",
-        "eslint-plugin-import": "2.29.0",
-        "grunt": "1.6.1",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "8.0.3",
+        "jsdom": "12.2.0",
-        "jsdom": "22.1.0",
+        "mocha": "5.2.0",
-        "lint-staged": "15.1.0",
-        "mocha": "10.2.0",
         "mocha-lcov-reporter": "1.3.0",
-        "mockdate": "3.0.5",
+        "nyc": "13.0.1",
-        "nyc": "15.1.0",
+        "smtp-server": "3.4.7"
-        "smtp-server": "3.13.0"
-    },
-    "optionalDependencies": {
-        "sass-embedded": "1.69.5"
-    },
-    "resolutions": {
-        "*/jquery": "3.7.1"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
     "engines": {
-        "node": ">=16"
+        "node": ">=6"
     },
     "maintainers": [
+        {
+            "name": "Andrew Rodrigues",
+            "email": "andrew@nodebb.org",
+            "url": "https://github.com/psychobunny"
+        },
         {
             "name": "Julian Lam",
             "email": "julian@nodebb.org",

install/web.js

@@ -1,103 +1,78 @@
 'use strict';
 
-const winston = require('winston');
+var winston = require('winston');
-const express = require('express');
+var express = require('express');
-const bodyParser = require('body-parser');
+var bodyParser = require('body-parser');
-const fs = require('fs');
+var fs = require('fs');
-const path = require('path');
+var path = require('path');
-const childProcess = require('child_process');
+var childProcess = require('child_process');
+var less = require('less');
+var async = require('async');
+var uglify = require('uglify-es');
+var nconf = require('nconf');
+var Benchpress = require('benchpressjs');
 
-const webpack = require('webpack');
+var app = express();
-const nconf = require('nconf');
+var server;
 
-const Benchpress = require('benchpressjs');
+winston.add(winston.transports.File, {
-const { mkdirp } = require('mkdirp');
+	filename: 'logs/webinstall.log',
-const { paths } = require('../src/constants');
+	colorize: true,
-const sass = require('../src/utils').getSass();
+	timestamp: function () {
+		var date = new Date();
+		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0, 5) + ' [' + global.process.pid + ']';
+	},
+	level: 'verbose',
+});
 
-const app = express();
+var web = module.exports;
-let server;
 
-const formats = [
+var scripts = [
-	winston.format.colorize(),
+	'node_modules/jquery/dist/jquery.js',
+	'public/vendor/xregexp/xregexp.js',
+	'public/vendor/xregexp/unicode/unicode-base.js',
+	'public/src/utils.js',
+	'public/src/installer/install.js',
 ];
 
-const timestampFormat = winston.format((info) => {
+var installing = false;
-	const dateString = `${new Date().toISOString()} [${global.process.pid}]`;
+var success = false;
-	info.level = `${dateString} - ${info.level}`;
+var error = false;
-	return info;
+var launchUrl;
-});
-formats.push(timestampFormat());
-formats.push(winston.format.splat());
-formats.push(winston.format.simple());
 
-winston.configure({
+web.install = function (port) {
-	level: 'verbose',
-	format: winston.format.combine.apply(null, formats),
-	transports: [
-		new winston.transports.Console({
-			handleExceptions: true,
-		}),
-		new winston.transports.File({
-			filename: 'logs/webinstall.log',
-			handleExceptions: true,
-		}),
-	],
-});
-
-const web = module.exports;
-let installing = false;
-let success = false;
-let error = false;
-let launchUrl;
-let timeStart = 0;
-const totalTime = 1000 * 60 * 3;
-
-
-const viewsDir = path.join(paths.baseDir, 'build/public/templates');
-
-web.install = async function (port) {
 	port = port || 4567;
-	winston.info(`Launching web installer on port ${port}`);
+	winston.info('Launching web installer on port', port);
 
 	app.use(express.static('public', {}));
-	app.use('/assets', express.static(path.join(__dirname, '../build/public'), {}));
+	app.engine('tpl', function (filepath, options, callback) {
-
+		async.waterfall([
-	app.engine('tpl', (filepath, options, callback) => {
+			function (next) {
-		filepath = filepath.replace(/\.tpl$/, '.js');
+				fs.readFile(filepath, 'utf-8', next);
-
+			},
-		Benchpress.__express(filepath, options, callback);
+			function (buffer, next) {
+				Benchpress.compileParse(buffer.toString(), options, next);
+			},
+		], callback);
 	});
 	app.set('view engine', 'tpl');
-	app.set('views', viewsDir);
+	app.set('views', path.join(__dirname, '../src/views'));
 	app.use(bodyParser.urlencoded({
 		extended: true,
 	}));
-	try {
+
-		await Promise.all([
+	async.parallel([compileLess, compileJS, copyCSS, loadDefaults], function (err) {
-			compileTemplate(),
+		if (err) {
-			compileSass(),
+			winston.error(err);
-			runWebpack(),
+		}
-			copyCSS(),
-			loadDefaults(),
-		]);
 		setupRoutes();
 		launchExpress(port);
-	} catch (err) {
+	});
-		winston.error(err.stack);
-	}
 };
 
-async function runWebpack() {
-	const util = require('util');
-	const webpackCfg = require('../webpack.installer');
-	const compiler = webpack(webpackCfg);
-	const webpackRun = util.promisify(compiler.run).bind(compiler);
-	await webpackRun();
-}
 
 function launchExpress(port) {
-	server = app.listen(port, () => {
+	server = app.listen(port, function () {
 		winston.info('Web installer listening on http://%s:%s', '0.0.0.0', port);
 	});
 }
@@ -105,40 +80,21 @@ function launchExpress(port) {
 function setupRoutes() {
 	app.get('/', welcome);
 	app.post('/', install);
-	app.get('/testdb', testDatabase);
+	app.post('/launch', launch);
 	app.get('/ping', ping);
 	app.get('/sping', ping);
 }
 
-async function testDatabase(req, res) {
-	let db;
-	try {
-		const keys = Object.keys(req.query);
-		const dbName = keys[0].split(':')[0];
-		db = require(`../src/database/${dbName}`);
-
-		const opts = {};
-		keys.forEach((key) => {
-			opts[key.replace(`${dbName}:`, '')] = req.query[key];
-		});
-
-		await db.init(opts);
-		const global = await db.getObject('global');
-		await db.close();
-		res.json({ success: 1, dbfull: !!global });
-	} catch (err) {
-		res.json({ error: err.stack });
-	}
-}
-
 function ping(req, res) {
 	res.status(200).send(req.path === '/sping' ? 'healthy' : '200');
 }
 
 function welcome(req, res) {
-	const dbs = ['mongo', 'redis', 'postgres'];
+	var dbs = ['redis', 'mongo', 'postgres'];
-	const databases = dbs.map((databaseName) => {
+	var databases = dbs.map(function (databaseName) {
-		const questions = require(`../src/database/${databaseName}`).questions.filter(question => question && !question.hideOnWebInstall);
+		var questions = require('../src/database/' + databaseName).questions.filter(function (question) {
+			return question && !question.hideOnWebInstall;
+		});
 
 		return {
 			name: databaseName,
@@ -146,9 +102,10 @@ function welcome(req, res) {
 		};
 	});
 
-	const defaults = require('./data/defaults.json');
+	var defaults = require('./data/defaults');
+
 	res.render('install/index', {
-		url: nconf.get('url') || (`${req.protocol}://${req.get('host')}`),
+		url: nconf.get('url') || (req.protocol + '://' + req.get('host')),
 		launchUrl: launchUrl,
 		skipGeneralSetup: !!nconf.get('url'),
 		databases: databases,
@@ -157,9 +114,7 @@ function welcome(req, res) {
 		success: success,
 		values: req.body,
 		minimumPasswordLength: defaults.minimumPasswordLength,
-		minimumPasswordStrength: defaults.minimumPasswordStrength,
 		installing: installing,
-		percentInstalled: installing ? ((Date.now() - timeStart) / totalTime * 100).toFixed(2) : 0,
 	});
 }
 
@@ -167,153 +122,156 @@ function install(req, res) {
 	if (installing) {
 		return welcome(req, res);
 	}
-	timeStart = Date.now();
 	req.setTimeout(0);
 	installing = true;
+	var setupEnvVars = nconf.get();
+	for (var i in req.body) {
+		if (req.body.hasOwnProperty(i) && !process.env.hasOwnProperty(i)) {
+			setupEnvVars[i.replace(':', '__')] = req.body[i];
+		}
+	}
 
-	const database = nconf.get('database') || req.body.database || 'mongo';
+	// Flatten any objects in setupEnvVars
-	const setupEnvVars = {
+	const pushToRoot = function (parentKey, key) {
-		...process.env,
+		setupEnvVars[parentKey + '__' + key] = setupEnvVars[parentKey][key];
-		CONFIG: nconf.get('config'),
-		NODEBB_CONFIG: nconf.get('config'),
-		NODEBB_URL: nconf.get('url') || req.body.url || (`${req.protocol}://${req.get('host')}`),
-		NODEBB_PORT: nconf.get('port') || 4567,
-		NODEBB_ADMIN_USERNAME: nconf.get('admin:username') || req.body['admin:username'],
-		NODEBB_ADMIN_PASSWORD: nconf.get('admin:password') || req.body['admin:password'],
-		NODEBB_ADMIN_EMAIL: nconf.get('admin:email') || req.body['admin:email'],
-		NODEBB_DB: database,
-		NODEBB_DB_HOST: nconf.get(`${database}:host`) || req.body[`${database}:host`],
-		NODEBB_DB_PORT: nconf.get(`${database}:port`) || req.body[`${database}:port`],
-		NODEBB_DB_USER: nconf.get(`${database}:username`) || req.body[`${database}:username`],
-		NODEBB_DB_PASSWORD: nconf.get(`${database}:password`) || req.body[`${database}:password`],
-		NODEBB_DB_NAME: nconf.get(`${database}:database`) || req.body[`${database}:database`],
-		NODEBB_DB_SSL: nconf.get(`${database}:ssl`) || req.body[`${database}:ssl`],
-		defaultPlugins: JSON.stringify(nconf.get('defaultplugins') || nconf.get('defaultPlugins') || []),
 	};
+	for (var j in setupEnvVars) {
+		if (setupEnvVars.hasOwnProperty(j) && typeof setupEnvVars[j] === 'object' && setupEnvVars[j] !== null && !Array.isArray(setupEnvVars[j])) {
+			Object.keys(setupEnvVars[j]).forEach(pushToRoot.bind(null, j));
+			delete setupEnvVars[j];
+		} else if (Array.isArray(setupEnvVars[j])) {
+			setupEnvVars[j] = JSON.stringify(setupEnvVars[j]);
+		}
+	}
 
 	winston.info('Starting setup process');
-	launchUrl = setupEnvVars.NODEBB_URL;
+	winston.info(setupEnvVars);
+	launchUrl = setupEnvVars.url;
 
-	const child = require('child_process').fork('app', ['--setup'], {
+	var child = require('child_process').fork('app', ['--setup'], {
 		env: setupEnvVars,
 	});
-	child.on('error', (err) => {
+
-		error = true;
+	child.on('close', function (data) {
-		success = false;
+		installing = false;
-		winston.error(err.stack);
-	});
-	child.on('close', (data) => {
 		success = data === 0;
 		error = data !== 0;
-		launch();
+
+		welcome(req, res);
 	});
-	welcome(req, res);
 }
 
-async function launch() {
+function launch(req, res) {
-	try {
+	res.json({});
-		server.close();
+	server.close();
-		let child;
 
-		if (!nconf.get('launchCmd')) {
+	var child;
-			child = childProcess.spawn('node', ['loader.js'], {
-				detached: true,
-				stdio: ['ignore', 'ignore', 'ignore'],
-			});
 
-			console.log('\nStarting NodeBB');
+	if (!nconf.get('launchCmd')) {
-			console.log('    "./nodebb stop" to stop the NodeBB server');
+		child = childProcess.spawn('node', ['loader.js'], {
-			console.log('    "./nodebb log" to view server output');
+			detached: true,
-			console.log('    "./nodebb restart" to restart NodeBB');
+			stdio: ['ignore', 'ignore', 'ignore'],
-		} else {
+		});
-			// Use launchCmd instead, if specified
-			child = childProcess.exec(nconf.get('launchCmd'), {
-				detached: true,
-				stdio: ['ignore', 'ignore', 'ignore'],
-			});
-		}
 
-		const filesToDelete = [
+		console.log('\nStarting NodeBB');
-			path.join(__dirname, '../public', 'installer.css'),
+		console.log('    "./nodebb stop" to stop the NodeBB server');
-			path.join(__dirname, '../public', 'bootstrap.min.css'),
+		console.log('    "./nodebb log" to view server output');
-			path.join(__dirname, '../build/public', 'installer.min.js'),
+		console.log('    "./nodebb restart" to restart NodeBB');
-		];
+	} else {
-		try {
+		// Use launchCmd instead, if specified
-			await Promise.all(
+		child = childProcess.exec(nconf.get('launchCmd'), {
-				filesToDelete.map(
+			detached: true,
-					filename => fs.promises.unlink(filename)
+			stdio: ['ignore', 'ignore', 'ignore'],
-				)
+		});
-			);
+	}
-		} catch (err) {
+
-			console.log(err.stack);
+	var filesToDelete = [
+		'installer.css',
+		'installer.min.js',
+		'bootstrap.min.css',
+	];
+
+	async.each(filesToDelete, function (filename, next) {
+		fs.unlink(path.join(__dirname, '../public', filename), next);
+	}, function (err) {
+		if (err) {
+			winston.warn('Unable to remove installer files');
 		}
 
 		child.unref();
 		process.exit(0);
-	} catch (err) {
+	});
-		winston.error(err.stack);
+}
-		throw err;
+
-	}
+function compileLess(callback) {
-}
+	fs.readFile(path.join(__dirname, '../public/less/install.less'), function (err, style) {
-
+		if (err) {
-// this is necessary because otherwise the compiled templates won't be available on a clean install
+			return winston.error('Unable to read LESS install file: ', err);
-async function compileTemplate() {
+		}
-	const sourceFile = path.join(__dirname, '../src/views/install/index.tpl');
+
-	const destTpl = path.join(viewsDir, 'install/index.tpl');
+		less.render(style.toString(), function (err, css) {
-	const destJs = path.join(viewsDir, 'install/index.js');
+			if (err) {
-
+				return winston.error('Unable to compile LESS: ', err);
-	const source = await fs.promises.readFile(sourceFile, 'utf8');
+			}
-
+
-	const [compiled] = await Promise.all([
+			fs.writeFile(path.join(__dirname, '../public/installer.css'), css.css, callback);
-		Benchpress.precompile(source, { filename: 'install/index.tpl' }),
+		});
-		mkdirp(path.dirname(destJs)),
+	});
-	]);
+}
-
+
-	await Promise.all([
+function compileJS(callback) {
-		fs.promises.writeFile(destJs, compiled),
+	var code = '';
-		fs.promises.writeFile(destTpl, source),
+	async.eachSeries(scripts, function (srcPath, next) {
-	]);
+		fs.readFile(path.join(__dirname, '..', srcPath), function (err, buffer) {
-}
+			if (err) {
-
+				return next(err);
-async function compileSass() {
+			}
-	try {
+
-		const installSrc = path.join(__dirname, '../public/scss/install.scss');
+			code += buffer.toString();
-		const style = await fs.promises.readFile(installSrc);
+			next();
-		const scssOutput = sass.compileString(String(style), {
+		});
-			loadPaths: [
+	}, function (err) {
-				path.join(__dirname, '../public/scss'),
+		if (err) {
-			],
+			return callback(err);
-		});
+		}
-
+		try {
-		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), scssOutput.css.toString());
+			var minified = uglify.minify(code, {
-	} catch (err) {
+				compress: false,
-		winston.error(`Unable to compile SASS: \n${err.stack}`);
+			});
-		throw err;
+			if (!minified.code) {
-	}
+				return callback(new Error('[[error:failed-to-minify]]'));
-}
+			}
-
+			fs.writeFile(path.join(__dirname, '../public/installer.min.js'), minified.code, callback);
-async function copyCSS() {
+		} catch (e) {
-	await fs.promises.copyFile(
+			callback(e);
-		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'),
+		}
-		path.join(__dirname, '../public/bootstrap.min.css'),
+	});
-	);
+}
-}
+
-
+function copyCSS(next) {
-async function loadDefaults() {
+	async.waterfall([
-	const setupDefaultsPath = path.join(__dirname, '../setup.json');
+		function (next) {
-	try {
+			fs.readFile(path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8', next);
-		// eslint-disable-next-line no-bitwise
+		},
-		await fs.promises.access(setupDefaultsPath, fs.constants.F_OK | fs.constants.R_OK);
+		function (src, next) {
-	} catch (err) {
+			fs.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src, next);
-		// setup.json not found or inaccessible, proceed with no defaults
+		},
-		if (err.code !== 'ENOENT') {
+	], next);
-			throw err;
+}
-		}
+
-
+function loadDefaults(next) {
-		return;
+	var setupDefaultsPath = path.join(__dirname, '../setup.json');
-	}
+	fs.access(setupDefaultsPath, fs.constants.F_OK | fs.constants.R_OK, function (err) {
-	winston.info('[installer] Found setup.json, populating default values');
+		if (err) {
-	nconf.file({
+			// setup.json not found or inaccessible, proceed with no defaults
-		file: setupDefaultsPath,
+			return setImmediate(next);
+		}
+
+		winston.info('[installer] Found setup.json, populating default values');
+		nconf.file({
+			file: setupDefaultsPath,
+		});
+
+		next();
 	});
 }

loader.js

@@ -1,61 +1,74 @@
 'use strict';
 
-const nconf = require('nconf');
+var	nconf = require('nconf');
-const fs = require('fs');
+var fs = require('fs');
-const url = require('url');
+var url = require('url');
-const path = require('path');
+var path = require('path');
-const { fork } = require('child_process');
+var fork = require('child_process').fork;
-const logrotate = require('logrotate-stream');
+var async = require('async');
-const { mkdirp } = require('mkdirp');
+var logrotate = require('logrotate-stream');
 
-const file = require('./src/file');
+var file = require('./src/file');
-const pkg = require('./package.json');
+var pkg = require('./package.json');
 
-const pathToConfig = path.resolve(__dirname, process.env.CONFIG || 'config.json');
+var pathToConfig = path.resolve(__dirname, process.env.CONFIG || 'config.json');
 
 nconf.argv().env().file({
 	file: pathToConfig,
 });
 
-const pidFilePath = path.join(__dirname, 'pidfile');
+var	pidFilePath = path.join(__dirname, 'pidfile');
+var outputLogFilePath = path.join(__dirname, 'logs/output.log');
+var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
+var silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false;
+var numProcs;
+var workers = [];
+var Loader = {
+	timesStarted: 0,
+};
+var appPath = path.join(__dirname, 'app.js');
 
-const outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');
+Loader.init = function (callback) {
-
-const logDir = path.dirname(outputLogFilePath);
-if (!fs.existsSync(logDir)) {
-	mkdirp.sync(path.dirname(outputLogFilePath));
-}
-
-const output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
-const silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false;
-let numProcs;
-const workers = [];
-const Loader = {};
-const appPath = path.join(__dirname, 'app.js');
-
-Loader.init = function () {
 	if (silent) {
-		console.log = (...args) => {
+		console.log = function () {
-			output.write(`${args.join(' ')}\n`);
+			var args = Array.prototype.slice.call(arguments);
+			output.write(args.join(' ') + '\n');
 		};
 	}
 
 	process.on('SIGHUP', Loader.restart);
 	process.on('SIGTERM', Loader.stop);
+	callback();
 };
 
-Loader.displayStartupMessages = function () {
+Loader.displayStartupMessages = function (callback) {
 	console.log('');
-	console.log(`NodeBB v${pkg.version} Copyright (C) 2013-${(new Date()).getFullYear()} NodeBB Inc.`);
+	console.log('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 NodeBB Inc.');
 	console.log('This program comes with ABSOLUTELY NO WARRANTY.');
 	console.log('This is free software, and you are welcome to redistribute it under certain conditions.');
 	console.log('For the full license, please visit: http://www.gnu.org/copyleft/gpl.html');
 	console.log('');
+	callback();
 };
 
 Loader.addWorkerEvents = function (worker) {
-	worker.on('exit', (code, signal) => {
+	worker.on('exit', function (code, signal) {
-		console.log(`[cluster] Child Process (${worker.pid}) has exited (code: ${code}, signal: ${signal})`);
+		if (code !== 0) {
+			if (Loader.timesStarted < numProcs * 3) {
+				Loader.timesStarted += 1;
+				if (Loader.crashTimer) {
+					clearTimeout(Loader.crashTimer);
+				}
+				Loader.crashTimer = setTimeout(function () {
+					Loader.timesStarted = 0;
+				}, 10000);
+			} else {
+				console.log((numProcs * 3) + ' restarts in 10 seconds, most likely an error on startup. Halting.');
+				process.exit();
+			}
+		}
+
+		console.log('[cluster] Child Process (' + worker.pid + ') has exited (code: ' + code + ', signal: ' + signal + ')');
 		if (!(worker.suicide || code === 0)) {
 			console.log('[cluster] Spinning up another process...');
 
@@ -63,52 +76,56 @@ Loader.addWorkerEvents = function (worker) {
 		}
 	});
 
-	worker.on('message', (message) => {
+	worker.on('message', function (message) {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
-				case 'restart':
+			case 'restart':
-					console.log('[cluster] Restarting...');
+				console.log('[cluster] Restarting...');
-					Loader.restart();
+				Loader.restart();
-					break;
+				break;
-				case 'pubsub':
+			case 'pubsub':
-					workers.forEach((w) => {
+				workers.forEach(function (w) {
+					w.send(message);
+				});
+				break;
+			case 'socket.io':
+				workers.forEach(function (w) {
+					if (w !== worker) {
 						w.send(message);
-					});
+					}
-					break;
+				});
-				case 'socket.io':
+				break;
-					workers.forEach((w) => {
-						if (w !== worker) {
-							w.send(message);
-						}
-					});
-					break;
 			}
 		}
 	});
 };
 
-Loader.start = function () {
+Loader.start = function (callback) {
 	numProcs = getPorts().length;
-	console.log(`Clustering enabled: Spinning up ${numProcs} process(es).\n`);
+	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');
 
-	for (let x = 0; x < numProcs; x += 1) {
+	for (var x = 0; x < numProcs; x += 1) {
 		forkWorker(x, x === 0);
 	}
+
+	if (callback) {
+		callback();
+	}
 };
 
 function forkWorker(index, isPrimary) {
-	const ports = getPorts();
+	var ports = getPorts();
-	const args = [];
+	var args = [];
 
 	if (!ports[index]) {
-		return console.log(`[cluster] invalid port for worker : ${index} ports: ${ports.length}`);
+		return console.log('[cluster] invalid port for worker : ' + index + ' ports: ' + ports.length);
 	}
 
 	process.env.isPrimary = isPrimary;
 	process.env.isCluster = nconf.get('isCluster') || ports.length > 1;
 	process.env.port = ports[index];
 
-	const worker = fork(appPath, args, {
+	var worker = fork(appPath, args, {
 		silent: silent,
 		env: process.env,
 	});
@@ -121,20 +138,20 @@ function forkWorker(index, isPrimary) {
 	Loader.addWorkerEvents(worker);
 
 	if (silent) {
-		const output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
+		var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
 		worker.stdout.pipe(output);
 		worker.stderr.pipe(output);
 	}
 }
 
 function getPorts() {
-	const _url = nconf.get('url');
+	var _url = nconf.get('url');
 	if (!_url) {
 		console.log('[cluster] url is undefined, please check your config.json');
 		process.exit();
 	}
-	const urlObject = url.parse(_url);
+	var urlObject = url.parse(_url);
-	let port = nconf.get('PORT') || nconf.get('port') || urlObject.port || 4567;
+	var port = nconf.get('PORT') || nconf.get('port') || urlObject.port || 4567;
 	if (!Array.isArray(port)) {
 		port = [port];
 	}
@@ -147,13 +164,13 @@ Loader.restart = function () {
 	nconf.remove('file');
 	nconf.use('file', { file: pathToConfig });
 
-	fs.readFile(pathToConfig, { encoding: 'utf-8' }, (err, configFile) => {
+	fs.readFile(pathToConfig, { encoding: 'utf-8' }, function (err, configFile) {
 		if (err) {
 			console.error('Error reading config');
 			throw err;
 		}
 
-		const conf = JSON.parse(configFile);
+		var conf = JSON.parse(configFile);
 
 		nconf.stores.env.readOnly = false;
 		nconf.set('url', conf.url);
@@ -176,57 +193,46 @@ Loader.stop = function () {
 };
 
 function killWorkers() {
-	workers.forEach((worker) => {
+	workers.forEach(function (worker) {
 		worker.suicide = true;
 		worker.kill();
 	});
 }
 
-fs.open(pathToConfig, 'r', (err) => {
+fs.open(pathToConfig, 'r', function (err) {
-	if (err) {
+	if (!err) {
-		// No config detected, kickstart web installer
+		if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
-		fork('app');
+			if (file.existsSync(pidFilePath)) {
-		return;
+				try {
-	}
+					var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
-
-	if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
-		if (file.existsSync(pidFilePath)) {
-			let pid = 0;
-			try {
-				pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
-				if (pid) {
 					process.kill(pid, 0);
-					console.info(`Process "${pid}" from pidfile already running, exiting`);
 					process.exit();
-				} else {
+				} catch (e) {
-					console.info(`Invalid pid "${pid}" from pidfile, deleting pidfile`);
 					fs.unlinkSync(pidFilePath);
 				}
-			} catch (err) {
-				if (err.code === 'ESRCH') {
-					console.info(`Process "${pid}" from pidfile not found, deleting pidfile`);
-					fs.unlinkSync(pidFilePath);
-				} else {
-					console.error(err.stack);
-					throw err;
-				}
 			}
+
+			require('daemon')({
+				stdout: process.stdout,
+				stderr: process.stderr,
+				cwd: process.cwd(),
+			});
+
+			fs.writeFileSync(pidFilePath, process.pid);
 		}
 
-		require('daemon')({
+		async.series([
-			stdout: process.stdout,
+			Loader.init,
-			stderr: process.stderr,
+			Loader.displayStartupMessages,
-			cwd: process.cwd(),
+			Loader.start,
+		], function (err) {
+			if (err) {
+				console.error('[loader] Error during startup');
+				throw err;
+			}
 		});
-
+	} else {
-		fs.writeFileSync(pidFilePath, String(process.pid));
+		// No config detected, kickstart web installer
-	}
+		fork('app');
-	try {
-		Loader.init();
-		Loader.displayStartupMessages();
-		Loader.start();
-	} catch (err) {
-		console.error('[loader] Error during startup');
-		throw err;
 	}
 });

nodebb.bat

@@ -1 +1 @@
-@echo off && cd %~dp0 && node ./nodebb %*
+@echo off && cd %~dp0 && node ./src/cli %*

public/.eslintrc

@@ -1,3 +1,57 @@
 {
-	"extends": "nodebb/public"
+	"globals": {
+		"app": true,
+		"io": true,
+		"socket": true,
+		"ajaxify": true,
+		"config": true,
+		"RELATIVE_PATH": true,
+		"utils": true,
+		"overrides": true,
+		"componentHandler": true,
+		"bootbox": true,
+		"Visibility": true,
+		"Tinycon": true,
+		"Promise": true
+	},
+	"env": {
+		"jquery": true,
+		"amd": true,
+		"browser": true,
+		"es6": false
+	},
+	"rules": {
+		"no-dupe-class-members": "off",
+		"no-var": "off",
+		"object-shorthand": "off",
+		"prefer-arrow-callback": "off",
+		"prefer-spread": "off",
+		"prefer-reflect": "off",
+		"prefer-template": "off"
+	},
+	"parserOptions": {
+		"ecmaVersion": 5,
+		"ecmaFeatures": {
+			"arrowFunctions": false,
+			"classes": false,
+			"defaultParams": false,
+			"destructuring": false,
+			"experimentalObjectRestSpread": false,
+			"blockBindings": false,
+			"forOf": false,
+			"generators": false,
+			"globalReturn": false,
+			"jsx": false,
+			"modules": false,
+			"objectLiteralComputedProperties": false,
+			"objectLiteralDuplicateProperties": false,
+			"objectLiteralShorthandMethods": false,
+			"objectLiteralShorthandProperties": false,
+			"impliedStrict": false,
+			"restParams": false,
+			"spread": false,
+			"superInFunctions": false,
+			"templateStrings": false
+		}
+	}
 }

public/.jshintrc

@@ -0,0 +1,84 @@
+{
+    "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" : true, // true: Require all defined variables be used
+    "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
+
+	"globals": {
+		"app": true,
+		"io": true,
+		"socket": true,
+		"ajaxify": true,
+		"config": true,
+		"RELATIVE_PATH": true,
+		"utils": true,
+		"overrides": true,
+		"componentHandler": true,
+		"bootbox": true,
+		"templates": true,
+		"Visibility": true,
+		"Tinycon": true,
+		"require": true,
+		"define": true,
+        "ace": true,
+		"Sortable": true,
+		"Slideout": true,
+		"NProgress": true
+	},
+
+	"jquery": true,
+    "browser": true
+}

public/503.html

@@ -1,12 +1,13 @@
 <html>
 <head>
 	<title>Excessive Load Warning</title>
+	<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<style type="text/css">
 	body {
 		background: #00A9EA;
 		color: white;
-		font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+		font-family: 'Ubuntu', sans-serif;
 		text-align: center;
 		-webkit-transform-style: preserve-3d;
 		-moz-transform-style: preserve-3d;

public/images/logo.svg

@@ -1,16 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="321" height="75" viewBox="0 0 321 75">
-  <defs>
-    <radialGradient id="nodebb-a" cx="65.599%" cy="0%" r="169.036%" fx="65.599%" fy="0%" gradientTransform="matrix(-.5183 .5916 -.38031 -.80624 .996 -.388)">
-      <stop offset="0%" stop-color="#2A6CBE"/>
-      <stop offset="38.688%" stop-color="#2062BC"/>
-      <stop offset="49.182%" stop-color="#1F5FBC"/>
-      <stop offset="66.583%" stop-color="#1C5ABD"/>
-      <stop offset="85.354%" stop-color="#1956BC"/>
-      <stop offset="100%" stop-color="#1851BE"/>
-    </radialGradient>
-  </defs>
-  <g fill="none" transform="translate(1 1)">
-    <path fill="#000306" stroke="#000306" stroke-width=".275" d="M195.810017,20 C210.691849,20 221.256813,28.7272272 221.484017,45.845679 C221.490864,46.3615394 221.461776,47.1194739 221.396754,48.1194827 C221.328352,49.1714504 220.455158,49.9897119 219.400969,49.9897119 L179.110557,49.9897119 C179.110557,56.6336943 182.723978,64.2757202 196.378026,64.2757202 C204.088827,64.2757202 211.625406,61.928339 218.987763,57.2335766 L219.553745,56.8677968 C220.246813,56.4139645 221.17656,56.6079034 221.630392,57.3009716 C221.757029,57.4943637 221.837254,57.7144077 221.864806,57.943925 C222.131013,60.1615294 222.004084,61.5832211 221.484017,62.2089999 C220.452051,63.4507301 210.901843,73 196.378026,73 C180.58738,73 169,61.8765432 169,46.3909465 C169,31.3415638 180.019372,20 195.810017,20 Z M162.92733,0 C164.031899,-4.2495073e-16 164.92733,0.8954305 164.92733,2 L164.928075,44.1266361 C164.975781,44.8118124 165,45.5058194 165,46.2079256 C165,61.5334332 153.460581,73 138,73 C122.427386,73 111,61.5334332 111,46.2079256 C111,30.882418 122.427386,19.4158511 138,19.4158511 C144.981278,19.4158511 151.163029,21.7538895 155.843826,25.7295173 L155.843557,4.54188628 C155.843557,2.03347175 157.877029,4.60788274e-16 160.385444,0 L162.92733,0 Z M81,20 C96.4605809,20 108,31.3415638 108,46.5 C108,61.6584362 96.4605809,73 81,73 C65.4273859,73 54,61.6584362 54,46.5 C54,31.3415638 65.4273859,20 81,20 Z M27.324263,20 C41.6099773,20 50,29.1649049 50,41.7801268 L50,67.5 C50,69.4329966 48.4329966,71 46.5,71 L42.2494331,71 C41.1448636,71 40.2494331,70.1045695 40.2494331,69 L40.2494331,42.5348837 C40.2494331,34.3403805 35.8276644,28.6257928 26.3038549,28.6257928 C10.0816327,28.6257928 9.75718821,35.7795705 9.75069932,44.6831843 L9.75056689,71 L2,71 C0.8954305,71 1.3527075e-16,70.1045695 0,69 L0,35.2932975 L0,35.2932975 C0,24.3935718 19.1609977,20 27.324263,20 Z M81,28.7242798 C70.8049793,28.7242798 63.6348548,36.4670782 63.6348548,46.5 C63.6348548,56.3148148 70.8049793,64.2757202 81,64.2757202 C91.1950207,64.2757202 98.3651452,56.3148148 98.3651452,46.5 C98.3651452,36.4670782 91.1950207,28.7242798 81,28.7242798 Z M138,28.2362872 C127.804979,28.2362872 120.634855,36.0644241 120.634855,46.2079256 C120.634855,56.1309161 127.804979,64.179564 138,64.179564 C148.195021,64.179564 155.365145,56.1309161 155.365145,46.2079256 C155.365145,36.0644241 148.195021,28.2362872 138,28.2362872 Z M195.810017,28.7242798 C186.721876,28.7242798 180.473779,33.9588477 179.224159,41.8106996 L211.259858,41.8106996 C210.010238,33.9588477 204.443752,28.7242798 195.810017,28.7242798 Z"/>
-    <path fill="url(#nodebb-a)" d="M277,19 L276.999615,57.7303365 C276.99251,64.180962 276.88949,68.6242617 276.88949,73 L276.88949,73 L255.649055,73 C242.962262,73 236,67.06 236,57.7257143 C236,51.4771429 239.558488,46.9257143 245.1283,45.0742857 C240.564149,43.1457143 237.779243,38.8257143 237.779243,33.5028571 C237.779243,24.8628571 244.664149,19 256.732074,19 L256.732074,19 L277,19 Z M299.267926,19 C311.335851,19 318.220757,24.8628571 318.220757,33.5028571 C318.220757,38.8257143 315.435851,43.1457143 310.8717,45.0742857 C316.441512,46.9257143 320,51.4771429 320,57.7257143 C320,67.06 313.037738,73 300.350945,73 L279.11051,73 L279.11051,73 C279.11051,68.6242617 279.00749,64.180962 279.000385,57.7303365 L279,19 L299.267926,19 Z M266.092452,49.8571429 L256.499999,49.8571429 C250.156602,49.8571429 246.984904,52.2485714 246.984904,56.9542857 C246.984904,61.8914286 249.924527,64.36 255.726414,64.36 L255.726414,64.36 L260.754716,64.36 C264.777358,64.36 266.092452,62.4314286 266.092452,56.5685714 L266.092452,56.5685714 L266.092452,49.8571429 Z M299.500001,49.8571429 L289.907548,49.8571429 L289.907548,56.5685714 C289.907548,62.4314286 291.222642,64.36 295.245284,64.36 L300.273586,64.36 C306.075473,64.36 309.015096,61.8914286 309.015096,56.9542857 C309.015096,52.2485714 305.843398,49.8571429 299.500001,49.8571429 Z M266.169811,27.64 L257.350942,27.64 C251.703772,27.64 248.764149,30.1857143 248.764149,34.5057143 C248.764149,38.8257143 251.703772,41.3714286 257.350942,41.3714286 L257.350942,41.3714286 L266.169811,41.3714286 L266.169811,27.64 Z M298.649058,27.64 L289.830189,27.64 L289.830189,41.3714286 L298.649058,41.3714286 C304.296228,41.3714286 307.235851,38.8257143 307.235851,34.5057143 C307.235851,30.1857143 304.296228,27.64 298.649058,27.64 Z"/>
-  </g>
-</svg>

public/js-enabled.css

@@ -0,0 +1,7 @@
+/*
+    The following stylesheet is only included on pages that can execute javascript
+*/
+
+.page-topic [component="post/content"] img:not(.not-responsive):not([data-state]) {
+	display: none !important;
+}

public/language/README.md

@@ -1,14 +0,0 @@
-# Important note about localising NodeBB
-
-The files here are read-only and overwritten daily (if there are changes) by the
-helper bot [Misty](https://github.com/nodebb-misty).
-
-Our localisation efforts are handled via [our Transifex Project](https://explore.transifex.com/nodebb/nodebb/),
-and any pull requests made to this directory will be automatically closed because
-localisations can go out-of-sync when edited directly.
-
-If there are non-localised strings and you cannot find them in Transifex, please
-[open a new issue on our bug tracker](https://github.com/NodeBB/NodeBB/issues/new)
-so we can take a look.
-
-Thank you for helping localise NodeBB!

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/_DO_NOT_EDIT_FILES_HERE.md

@@ -1,3 +0,0 @@
-# The files here are not meant to be edited directly
-
-Please see the → [Internalization README](../README.md).

public/language/ar/admin/admin.json

@@ -1,18 +1,7 @@
 {
-	"alert.confirm-rebuild-and-restart": "هل أنت متأكد إنك تريد إعادة بناء وتشغيل الـ NodeBB؟",
+	"alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?",
 	"alert.confirm-restart": "هل تريد بالتأكيد إعادة تشغيل NodeBB؟",
 
 	"acp-title": "لوحة تحكم إدارة NodeBB | %1",
-	"settings-header-contents": "محتويات",
+	"settings-header-contents": "محتويات"
-	"changes-saved": "Changes Saved",
-	"changes-saved-message": "Your changes to the NodeBB configuration have been saved.",
-	"changes-not-saved": "لم يتم حفظ التغييرات",
-	"changes-not-saved-message": "حدثت مشكلة أثناء حفظ التغييرات في NodeBB. (%1)",
-	"save-changes": "Save changes",
-	"min": "Min:",
-	"max": "Max:",
-	"view": "View",
-	"edit": "Edit",
-	"add": "Add",
-	"select-icon": "Select Icon"
 }

public/language/ar/admin/advanced/cache.json

@@ -1,10 +1,11 @@
 {
-	"cache": "Cache",
 	"post-cache": "التخزين المؤقت للمشاركات",
-	"group-cache": "التخزين المؤقت للمجموعات",
+	"posts-in-cache": "المشاركات المخزنة مؤقتاً",
-	"local-cache": "تخزين مؤقت محلي",
+	"average-post-size": "متوسط ​​حجم المشاركة",
-	"object-cache": "تخزين مؤقت للأشياء",
+	"length-to-max": "الطول / أقصى حد",
-	"percent-full": "1% كاملة",
+	"percent-full": "%1% Full",
 	"post-cache-size": "حجم التخزين المؤقت للمشاركات",
-	"items-in-cache": "العناصر في التخزين المؤقت"
+	"items-in-cache": "العناصر في التخزين المؤقت",
+	"control-panel": "لوحة التحكم",
+	"update-settings": "تحديث إعدادات التخزين المؤقت"
 }

public/language/ar/admin/advanced/database.json

@@ -1,52 +1,40 @@
 {
-	"x-b": "٪1 بايت",
+	"x-b": "%1 b",
-	"x-mb": "٪1 ميقا بايت",
+	"x-mb": "%1 mb",
-	"x-gb": "٪1 قيقا بايت",
+	"x-gb": "%1 gb",
-	"uptime-seconds": "مدة التشغيل بالثواني",
+	"uptime-seconds": "Uptime in Seconds",
-	"uptime-days": "مدة التشغيل بالأيام",
+	"uptime-days": "Uptime in Days",
 
-	"mongo": "MongoDB",
+	"mongo": "Mongo",
-	"mongo.version": "اصدار MongoDB",
+	"mongo.version": "MongoDB Version",
-	"mongo.storage-engine": "محرك التخزين",
+	"mongo.storage-engine": "Storage Engine",
-	"mongo.collections": "التجميعات",
+	"mongo.collections": "Collections",
-	"mongo.objects": "العناصر",
+	"mongo.objects": "Objects",
-	"mongo.avg-object-size": "معدل حجم العناصر",
+	"mongo.avg-object-size": "Avg. Object Size",
-	"mongo.data-size": "حجم البيانات",
+	"mongo.data-size": "Data Size",
-	"mongo.storage-size": "حجم التخرين",
+	"mongo.storage-size": "Storage Size",
-	"mongo.index-size": "حجم الفهرس",
+	"mongo.index-size": "Index Size",
-	"mongo.file-size": "حجم الملف",
+	"mongo.file-size": "File Size",
-	"mongo.resident-memory": "الذاكرة الساكنة",
+	"mongo.resident-memory": "Resident Memory",
 	"mongo.virtual-memory": "الذاكرة الإفتراضية",
 	"mongo.mapped-memory": "Mapped Memory",
-	"mongo.bytes-in": "البايتات الواردة",
+	"mongo.raw-info": "MongoDB Raw Info",
-	"mongo.bytes-out": "البايتات الصادرة",
-	"mongo.num-requests": "عدد الطلبات",
-	"mongo.raw-info": "معلومات MongoDB الأولية",
-	"mongo.unauthorized": "لم يستطع NodeBB من الاستعلام عن احصاءات قواعد البيانات ل MongoDB. الرجاء التأكد من أن المستخدم في NodeBB يحتوي على دور "clusterMonitor" ال "admin" لقواعد البيانات.",
 
 	"redis": "Redis",
-	"redis.version": "إصدار Redis",
+	"redis.version": "Redis Version",
-	"redis.keys": "المفاتيح",
+	"redis.connected-clients": "Connected Clients",
-	"redis.expires": "ينتهي ",
+	"redis.connected-slaves": "Connected Slaves",
-	"redis.avg-ttl": "متوسط وقت الانعاش",
+	"redis.blocked-clients": "Blocked Clients",
-	"redis.connected-clients": "العميل المتصل",
-	"redis.connected-slaves": "البدلاء المتصلين",
-	"redis.blocked-clients": "العملاء المحظورون",
 	"redis.used-memory": "الذاكرة المستخدمة",
-	"redis.memory-frag-ratio": "نسبة تجزئة الذاكرة",
+	"redis.memory-frag-ratio": "Memory Fragmentation Ratio",
 	"redis.total-connections-recieved": "إجمالي الاتصالات المستلمة",
 	"redis.total-commands-processed": "إجمالي الأوامر التي تمت معالجتها",
-	"redis.iops": "العمليات اللحظية في الثانية",
+	"redis.iops": "Instantaneous Ops. Per Second",
-	"redis.iinput": "الإدخال الفوري في الثانية",
+	"redis.keyspace-hits": "Keyspace Hits",
-	"redis.ioutput": "المخرجات الفورية في الثانية",
+	"redis.keyspace-misses": "Keyspace Misses",
-	"redis.total-input": "مجموع المدخلات",
+	"redis.raw-info": "Redis Raw Info",
-	"redis.total-output": "مجموع المخرجات",
-
-	"redis.keyspace-hits": "المفاتيح المضغوطة",
-	"redis.keyspace-misses": "المفاتيح المخفقة",
-	"redis.raw-info": "معلومات Redis الأولية",
 
 	"postgres": "Postgres",
-	"postgres.version": "إصدار PostgreSQL",
+	"postgres.version": "PostgreSQL Version",
-	"postgres.raw-info": "معلومات Postgres الأولية"
+	"postgres.raw-info": "Postgres Raw Info"
 }

public/language/ar/admin/advanced/errors.json

@@ -1,5 +1,4 @@
 {
-	"errors": "Errors",
 	"figure-x": "شكل %1",
 	"error-events-per-day": "<code>%1</code> حدث كل يوم ",
 	"error.404": "404 لم يتم العثور",

public/language/ar/admin/advanced/events.json

@@ -2,12 +2,5 @@
 	"events": "أحداث",
 	"no-events": "لا توجد أحداث",
 	"control-panel": "لوحة تحكم الأحداث",
-	"delete-events": "حذف الاحداث",
+	"delete-events": "حذف الأحداث"
-	"confirm-delete-all-events": "هل أنت متاكد أنك تريد حذف كل سجل اﻻحداث؟",
-	"filters": "تصفية",
-	"filters-apply": "تطبيق التصفية",
-	"filter-type": "نوع الحدث",
-	"filter-start": "تاريخ البدء",
-	"filter-end": "تاريخ الانتهاء",
-	"filter-per-page": "لكل صفحة"
 }

public/language/ar/admin/appearance/customise.json

@@ -1,20 +1,16 @@
 {
-	"customise": "Customise",
+	"custom-css": "Custom CSS/LESS",
-	"custom-css": "Custom CSS/SASS",
+	"custom-css.description": "Enter your own CSS/LESS declarations here, which will be applied after all other styles.",
-	"custom-css.description": "Enter your own CSS/SASS declarations here, which will be applied after all other styles.",
+	"custom-css.enable": "Enable Custom CSS/LESS",
-	"custom-css.enable": "Enable Custom CSS/SASS",
 
 	"custom-js": "Javascript مخصصة",
 	"custom-js.description": "أدخل Javascript الخاص بك هنا. سيتم تنفيذها بعد تحميل الصفحة بالكامل.",
 	"custom-js.enable": "تفعيل Javascript المخصصة",
 
 	"custom-header": "ترويسة مخصصة",
-	"custom-header.description": "أدخل وسوم HTML المخصصة هنا (مثل: Meta Tags, وغيرها)، والتي سيتم تضمينها لجزئية <code>&lt;head&gt;</code> من ترميز المنتدى. يُسمح بعلامات البرمجة النصية، ولكن لا يُنصح بها ، نظرًا لأن علامة التبويب <a href=\"#custom-js\" data-toggle=\"tab\"> Custom Javascript </a> متاحة.",
+	"custom-header.description": "أدخل HTML الخاصة بك هنا (مثل العلامات الوصفية، وما إلى ذلك)، والتي سيتم إلحاقها الى<code>&lt;head&gt;</code> في تصميم المنتدى. يسمح باستخدام علامات النص البرمجي، ولكن سيتم تعطيلها؛ لتوفر تبويبة\n<a href=\"#custom-header\" data-toggle=\"tab\">Javascript المخصصة</a>",
 	"custom-header.enable": "تفعيل الترويسة المخصصة",
 
 	"custom-css.livereload": "تفعيل إعادة التحميل المباشرة",
-	"custom-css.livereload.description": "فعل هذا الخيار لإجبار جميع الجلسات في الأجهزة التي قمت بتسجيل الدخول فيها  بحسابك على التحديث عند النقر على زر الحفظ",
+	"custom-css.livereload.description": "فعل هذا الخيار لإجبار جميع الجلسات في الأجهزة التي قمت بتسجيل الدخول فيها  بحسابك على التحديث عند النقر على زر الحفظ"
-	"bsvariables": "_variables.scss",
-	"bsvariables.description": "Override bootstrap variables here. You can also use a tool like <a href=\"https://bootstrap.build/app\">bootstrap.build</a> and paste the output here.<br/>Changes require a rebuild & restart.",
-	"bsvariables.enable": "Enable _variables.scss"
 }

public/language/ar/admin/appearance/skins.json

@@ -1,16 +1,7 @@
 {
-	"skins": "Skins",
-	"bootswatch-skins": "Bootswatch Skins",
-	"custom-skins": "Custom Skins",
-	"add-skin": "Add Skin",
-	"save-custom-skins": "Save Custom Skins",
-	"save-custom-skins-success": "Custom skins saved successfully",
-	"custom-skin-name": "Custom Skin Name",
-	"custom-skin-variables": "Custom Skin Variables",
 	"loading": "جاري تحميل السمات...",
 	"homepage": "الصفحة الرئيسية",
 	"select-skin": "إختيار السمة",
-	"revert-skin": "Revert Skin",
 	"current-skin": "السمة الحالية",
 	"skin-updated": "تم تحديث السمة",
 	"applied-success": "تم تطبيق السمة %1 بنجاح",

public/language/ar/admin/appearance/themes.json

@@ -1,13 +1,11 @@
 {
-    "themes": "Themes",
     "checking-for-installed": "جاري التحقق من القوالب المثبتة...",
     "homepage": "الصفحة الرئيسية",
     "select-theme": "إختيار القالب",
-    "revert-theme": "Revert Theme",
     "current-theme": "القالب المستخدم حالياً",
     "no-themes": "لم يتم العثور على قوالب مثبتة",
     "revert-confirm": "هل أنت متأكد من أنك ترغب في استعادة قااب NodeBB الافتراضي؟",
     "theme-changed": "تم تغيير القالب",
     "revert-success": "لقد قمت بنجاح بإستعادة القالب الأساسي لـNodeBB",
-    "restart-to-activate": "يرجى إعادة بناء وإعادة تشغيل NodeBB لتنشيط هذا الثيم."
+    "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme."
 }

public/language/ar/admin/dashboard.json

@@ -1,98 +0,0 @@
-{
-	"forum-traffic": "حركة المنتدى",
-	"page-views": "مشاهدات الصفحات",
-	"unique-visitors": "زائرين فريدين",
-	"logins": "عمليات تسجيل الدخول",
-	"new-users": "مستخدم جديد",
-	"posts": "مشاركات",
-	"topics": "مواضيع",
-	"page-views-seven": "آخر 7 ايام",
-	"page-views-thirty": "آخر 30 يوماً",
-	"page-views-last-day": "آخر 24 ساعة",
-	"page-views-custom": "مدة زمنية مخصصة",
-	"page-views-custom-start": "بداية المدة",
-	"page-views-custom-end": "نهاية المده",
-	"page-views-custom-help": "أدخل نطاقا زمنيا لمرات مشاهدة الصفحات التي ترغب في عرضها. إذا لم يظهر منتقي التاريخ، فإن التنسيق المقبول هو <code>YYYY-MM-DD</code>",
-	"page-views-custom-error": "الرجاء إدخال نطاق تاريخ صالح بالتنسيق <code>YYYY-MM-DD</code>",
-
-	"stats.yesterday": "الأمس",
-	"stats.today": "اليوم",
-	"stats.last-week": "الاسبوع الماضي",
-	"stats.this-week": "هذا الاسبوع",
-	"stats.last-month": "الشهر الماضي",
-	"stats.this-month": "هذا الشهر",
-	"stats.all": "كل الوقت",
-
-	"updates": "تحديثات",
-	"running-version": "المنتدى يعمل حاليا على <strong>NodeBB الإصدار<span id=\"version\">%1</span></strong>.",
-	"keep-updated": "تأكد دائما من أن NodeBB يعمل على احدث إصدار للحصول على أحدث التصحيحات الأمنية وإصلاحات الأخطاء.",
-	"up-to-date": "You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i>",
-	"upgrade-available": "A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.",
-	"prerelease-upgrade-available": "This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.",
-	"prerelease-warning": "This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i>",
-	"fallback-emailer-not-found": "مرسل البريد الإلكتروني الاحتياطي غير موجود!",
-	"running-in-development": "Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator",
-	"latest-lookup-failed": "Failed to look up latest available version of NodeBB",
-
-	"notices": "إشعارات",
-	"restart-not-required": "إعادة التشغيل غير مطلوب",
-	"restart-required": "إعادة التشغيل مطلوبة",
-	"search-plugin-installed": "إضافة البحث منصبة",
-	"search-plugin-not-installed": "إضافة البحث غير منصبة",
-	"search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث",
-
-	"control-panel": "التحكم بالنظام",
-	"rebuild-and-restart": "أعد البناء &amp; وأعد التشغيل",
-	"restart": "أعد التشغيل",
-	"restart-warning": "ستؤدي إعادة بناء أو إعادة تشغيل NodeBB إلى إنقطاع الاتصال بالمنتدى لبضع ثوان.",
-	"restart-disabled": "تم تعطيل إعادة بناء NodeBB وإعادة تشغيله حيث لا يبدو أنك تقوم بتشغيله عبر البرنامج الخفي المناسب.",
-	"maintenance-mode": "وضع الصيانة",
-	"maintenance-mode-title": "انقر هنا لإعداد وضع الصيانة لـNodeBB",
-	"dark-mode": "Dark Mode",
-	"realtime-chart-updates": "التحديث الفوري للرسم البياني",
-
-	"active-users": "المستخدمين النشطين",
-	"active-users.users": "الأعضاء",
-	"active-users.guests": "الزوار",
-	"active-users.total": "المجموع",
-	"active-users.connections": "روابط الاتصال",
-
-	"guest-registered-users": "الزائر مقابل المستخدمين المسجلين",
-	"guest": "الزائر",
-	"registered": "مسجل",
-
-	"user-presence": "تواجد المستخدمين",
-	"on-categories": "في قائمة الأقسام",
-	"reading-posts": "قراءة المشاركات",
-	"browsing-topics": "تصفح المواضيع",
-	"recent": "الأخيرة",
-	"unread": "غير مقروء",
-
-	"high-presence-topics": "مواضيع ذات حضور قوي",
-	"popular-searches": "عمليات البحث الشائعة",
-
-	"graphs.page-views": "مشاهدات الصفحة",
-	"graphs.page-views-registered": "زيارات الصفحات المسجلة",
-	"graphs.page-views-guest": "زيارات الصفحات للزوار",
-	"graphs.page-views-bot": "زيارات الصفحات الآلية",
-	"graphs.unique-visitors": "زوار فريدين",
-	"graphs.registered-users": "مستخدمين مسجلين",
-	"graphs.guest-users": "المستخدمين الزوار",
-	"last-restarted-by": "آخر إعادة تشغيل بواسطة",
-	"no-users-browsing": "لا يوجد مستخدمين يتصفحون",
-
-	"back-to-dashboard": "العودة للوحة التحكم",
-	"details.no-users": "لم ينضم أي مستخدم خلال الإطار الزمني المحدد",
-	"details.no-topics": "لم يتم نشر أي مواضيع خلال الإطار الزمني المحدد",
-	"details.no-searches": "لم يتم إجراء أي بحث خلال الإطار الزمني المحدد",
-	"details.no-logins": "لم يوثق أي تسجيل دخول خلال الإطار الزمني المحدد",
-	"details.logins-static": "يقوم NodeBB بحفظ بيانات الجلسة لمدة ٪1 يوم/أيام فقط، ولذا فإن هذا الجدول أدناه سيعرض فقط أحدث الجلسات النشطة",
-	"details.logins-login-time": "وقت تسجيل الدخول",
-	"start": "بدء",
-	"end": "إنهاء",
-	"filter": "تصفية",
-	"view-as-json": "View as JSON",
-	"expand-analytics": "Expand analytics",
-	"clear-search-history": "Clear Search History",
-	"clear-search-history-confirm": "Are you sure you want to clear entire search history?"
-}

public/language/ar/admin/development/info.json

@@ -1,20 +1,13 @@
 {
-	"you-are-on": "أنت في <strong> %1:%2 </strong>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"ip": "رقم الآي بي <strong> %1 </strong>",
+	"nodes-responded": "%1 nodes responded within %2ms!",
-	"nodes-responded": "عدد %1 نقطة/نقاط استجابوا خلال %2 جزء من الثانية.",
+	"host": "host",
-	"host": "المضيف",
-	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
 	"git": "git",
-	"process-memory": "process memory",
+	"memory": "memory",
-	"system-memory": "system memory",
+	"load": "load",
-	"used-memory-process": "Used memory by process",
-	"used-memory-os": "Used system memory",
-	"total-memory-os": "Total system memory",
-	"load": "system load",
-	"cpu-usage": "cpu usage",
 	"uptime": "uptime",
 
 	"registered": "Registered",

public/language/ar/admin/development/logger.json

@@ -1,13 +1,12 @@
 {
-	"logger": "Logger",
+	"logger-settings": "Logger Settings",
-	"logger-settings": "إعدادات المسجِّل",
+	"description": "By enabling the check boxes, you will receive logs to your terminal. If you specify a path, logs will then be saved to a file instead. HTTP logging is useful for collecting statistics about who, when, and what people access on your forum. In addition to logging HTTP requests, we can also log socket.io events. Socket.io logging, in combination with redis-cli monitor, can be very helpful for learning NodeBB's internals.",
-	"description": "من خلال تمكين مربعات الاختيار ، ستتلقى سجلات إلى جهازك الطرفي. إذا حددت مسارًا ، فسيتم بعد ذلك حفظ السجلات في ملف بدلاً من ذلك. يعد تسجيل HTTP مفيدًا لجمع الإحصائيات حول من ومتى وماذا يصل الأشخاص في المنتدى. بالإضافة إلى تسجيل طلبات HTTP ، يمكننا أيضًا تسجيل أحداث socket.io. يمكن أن يكون تسجيل Socket.io ، جنبًا إلى جنب مع شاشة redis-cli ، مفيدًا جدًا في تعلم العناصر الداخلية لـ NodeBB.",
+	"explanation": "Simply check/uncheck the logging settings to enable or disable logging on the fly. No restart needed.",
-	"explanation": "ما عليك سوى تحديدأو/ إلغاء تحديد إعدادات التسجيل لتمكين أو تعطيل التسجيل أثناء التنقل. لا حاجة لإعادة التشغيل.",
+	"enable-http": "Enable HTTP logging",
-	"enable-http": "تمكين سجلات HTTP",
+	"enable-socket": "Enable socket.io event logging",
-	"enable-socket": "تفعيل تسجيل أحداث socket.io",
+	"file-path": "Path to log file",
-	"file-path": "مسار ملف السجل",
+	"file-path-placeholder": "/path/to/log/file.log ::: leave blank to log to your terminal",
-	"file-path-placeholder": "/path/to/log/file.log ::: اتركه فارغا لاظهار السجلات لنافذة الطرفية",
 
-	"control-panel": "لوحة تحكم المسجل",
+	"control-panel": "Logger Control Panel",
-	"update-settings": "تحديث إعدادات المسجل"
+	"update-settings": "Update Logger Settings"
 }

public/language/ar/admin/extend/plugins.json

@@ -1,6 +1,4 @@
 {
-	"plugins": "Plugins",
-	"trending": "Trending",
 	"installed": "منصبة",
 	"active": "مفعلة",
 	"inactive": "معطلة",
@@ -11,7 +9,6 @@
 
 	"plugin-search": "البحث عن الإضافات",
 	"plugin-search-placeholder": "جاري البحث عن الإضافات...",
-	"submit-anonymous-usage": "Submit anonymous plugin usage data.",
 	"reorder-plugins": "إعادة ترتيب الإضافات",
 	"order-active": "ترتيب الإضافات المفعلة",
 	"dev-interested": "هل انته مهتم ببرمجة إضافات لـNodeBB؟",
@@ -32,15 +29,13 @@
 	"plugin-item.more-info": "لمزيد من المعلومات:",
 	"plugin-item.unknown": "غير معروف",
 	"plugin-item.unknown-explanation": "تعذر تحديد حالة هذه الإضافة، ربما بسبب خطأ في الإعدادات.",
-	"plugin-item.compatible": "This plugin works on NodeBB %1",
-	"plugin-item.not-compatible": "This plugin has no compatibility data, make sure it works before installing on your production environment.",
 
 	"alert.enabled": "الإضافة مفعلة",
 	"alert.disabled": "الإضافة معطلة",
 	"alert.upgraded": "الإضافة مرقاة",
 	"alert.installed": "الإضافة منصبة",
 	"alert.uninstalled": "تم إلغاء تنصيب الإضافة",
-	"alert.activate-success": "Please rebuild and restart your NodeBB to fully activate this plugin",
+	"alert.activate-success": "يرجى إعادة تشغيل NodeBB لتنشيط الإضافة بشكل بالكامل",
 	"alert.deactivate-success": "تم تعطيل الإضافة بنجاح",
 	"alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.",
 	"alert.install-success": "تم تثبيت الإضافة بنجاح، يرجى تفعيلها.",

public/language/ar/admin/extend/rewards.json

@@ -1,17 +1,17 @@
 {
-	"rewards": "المكافآت",
+	"rewards": "Rewards",
-	"add-reward": "Add reward",
+	"condition-if-users": "If User's",
-	"condition-if-users": "إذا كان للمستخدم",
+	"condition-is": "Is:",
-	"condition-is": "يكون: ",
+	"condition-then": "Then:",
-	"condition-then": "عندئذ:",
+	"max-claims": "Amount of times reward is claimable",
-	"max-claims": "عدد المرات التي يمكن فيها المطالبة بالمكافأة",
+	"zero-infinite": "Enter 0 for infinite",
-	"zero-infinite": "أدخل 0 للقيمة اللانهائية",
+	"delete": "Delete",
-	"select-reward": "Select reward",
+	"enable": "Enable",
-	"delete": "احذف",
+	"disable": "Disable",
-	"enable": "مكّن",
+	"control-panel": "Rewards Control",
-	"disable": "عطّل",
+	"new-reward": "New Reward",
 
-	"alert.delete-success": "المكافآت المحذوفة بنجاح",
+	"alert.delete-success": "Successfully deleted reward",
-	"alert.no-inputs-found": "مكافأة غير قانونية - لم يتم العثور على مدخلات!",
+	"alert.no-inputs-found": "Illegal reward - no inputs found!",
-	"alert.save-success": "المكافآت المحفوظة بنجاح"
+	"alert.save-success": "Successfully saved rewards"
 }

public/language/ar/admin/extend/widgets.json

@@ -1,17 +1,16 @@
 {
-	"widgets": "Widgets",
 	"available": "Available Widgets",
 	"explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.",
-	"none-installed": "No widgets found! Activate the widget essentials plugin in the <a href=\"%1\">plugins</a> control panel.",
+	"none-installed": "No widgets found! Activate the essential widgets plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"clone-from": "Clone widgets from",
 	"containers.available": "Available Containers",
-	"containers.explanation": "Drag and drop on top of any widget",
+	"containers.explanation": "Drag and drop on top of any active widget",
 	"containers.none": "None",
 	"container.well": "Well",
 	"container.jumbotron": "Jumbotron",
-	"container.card": "Card",
+	"container.panel": "Panel",
-	"container.card-header": "Card Header",
+	"container.panel-header": "Panel Header",
-	"container.card-body": "Card Body",
+	"container.panel-body": "Panel Body",
 	"container.alert": "Alert",
 
 	"alert.confirm-delete": "Are you sure you wish to delete this widget?",
@@ -19,17 +18,5 @@
 	"alert.update-success": "Successfully updated widgets",
 	"alert.clone-success": "Successfully cloned widgets",
 
-	"error.select-clone": "Please select a page to clone from",
+	"error.select-clone": "Please select a page to clone from"
-
-	"title": "Title",
-	"title.placeholder": "Title (only shown on some containers)",
-	"container": "Container",
-	"container.placeholder": "Drag and drop a container or enter HTML here.",
-	"show-to-groups": "Show to groups",
-	"hide-from-groups": "Hide from groups",
-	"start-date": "Start date",
-	"end-date": "End date",
-	"hide-on-mobile": "Hide on mobile",
-	"hide-drafts": "Hide drafts",
-	"show-drafts": "Show drafts"
 }

public/language/ar/admin/general/dashboard.json

@@ -0,0 +1,73 @@
+{
+	"forum-traffic": "Forum Traffic",
+	"page-views": "مشاهدات الصفحات",
+	"unique-visitors": "زائرين فريدين",
+	"users": "أعضاء",
+	"posts": "مشاركات",
+	"topics": "مواضيع",
+	"page-views-seven": "آخر 7 ايام",
+	"page-views-thirty": "آخر 30 يوماً",
+	"page-views-last-day": "آخر 24 ساعة",
+	"page-views-custom": "مدة زمنية مخصصة",
+	"page-views-custom-start": "بداية المدة",
+	"page-views-custom-end": "نهاية المده",
+	"page-views-custom-help": "أدخل نطاقا زمنيا لمرات مشاهدة الصفحات التي ترغب في عرضها. إذا لم يظهر منتقي التاريخ، فإن التنسيق المقبول هو <code>YYYY-MM-DD</code>",
+	"page-views-custom-error": "الرجاء إدخال نطاق تاريخ صالح بالتنسيق <code>YYYY-MM-DD</code>",
+
+	"stats.day": "يوم",
+	"stats.week": "إسبوع",
+	"stats.month": "شهر",
+	"stats.all": "كل الوقت",
+
+	"updates": "تحديثات",
+	"running-version": "المنتدى يعمل حاليا على <strong>NodeBB الإصدار<span id=\"version\">%1</span></strong>.",
+	"keep-updated": "تأكد دائما من أن NodeBB يعمل على احدث إصدار للحصول على أحدث التصحيحات الأمنية وإصلاحات الأخطاء.",
+	"up-to-date": "<p>المنتدى <strong>يعمل على أحدث إصدار</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">upgrading your NodeBB</a>.</p>",
+	"prerelease-warning": "<p>هذه نسخة <strong>ماقبل الإصدار</strong> من NodeBB. قد تحدث أخطاء غير مقصودة. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"running-in-development": "المنتدى قيد التشغيل في وضع \"المطورين\". وقد تكون هناك ثغرات أمنية مفتوحة؛ من فضلك تواصل مع مسؤول نظامك.",
+	"latest-lookup-failed": "<p>Failed to look up latest available version of NodeBB</p>",
+
+	"notices": "إشعارات",
+	"restart-not-required": "إعادة التشغيل غير مطلوب",
+	"restart-required": "إعادة التشغيل مطلوبة",
+	"search-plugin-installed": "إضافة البحث منصبة",
+	"search-plugin-not-installed": "إضافة البحث غير منصبة",
+	"search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث",
+
+	"control-panel": "التحكم بالنظام",
+	"rebuild-and-restart": "Rebuild &amp; Restart",
+	"restart": "Restart",
+	"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
+	"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
+	"maintenance-mode": "وضع الصيانة",
+	"maintenance-mode-title": "انقر هنا لإعداد وضع الصيانة لـNodeBB",
+	"realtime-chart-updates": "التحديث الفوري للرسم البياني",
+
+	"active-users": "المستخدمين النشطين",
+	"active-users.users": "الأعضاء",
+	"active-users.guests": "الزوار",
+	"active-users.total": "المجموع",
+	"active-users.connections": "Connections",
+
+	"anonymous-registered-users": "المجهولين مقابل المستخدمين المسجلين",
+	"anonymous": "مجهول",
+	"registered": "مسجل",
+
+	"user-presence": "تواجد المستخدمين",
+	"on-categories": "في قائمة الأقسام",
+	"reading-posts": "قراءة المشاركات",
+	"browsing-topics": "تصفح المواضيع",
+	"recent": "الأخيرة",
+	"unread": "غير مقروء",
+
+	"high-presence-topics": "مواضيع ذات حضور قوي",
+
+	"graphs.page-views": "مشاهدات الصفحة",
+	"graphs.unique-visitors": "زوار فريدين",
+	"graphs.registered-users": "مستخدمين مسجلين",
+	"graphs.anonymous-users": "مستخدمين مجهولين",
+	"last-restarted-by": "Last restarted by",
+	"no-users-browsing": "No users browsing"
+}

public/language/ar/admin/general/navigation.json

@@ -1,19 +1,18 @@
 {
-	"navigation": "Navigation",
 	"icon": "Icon:",
 	"change-icon": "change",
 	"route": "Route:",
 	"tooltip": "Tooltip:",
 	"text": "Text:",
 	"text-class": "Text Class: <small>optional</small>",
-	"class": "Class: <small>optional</small>",
 	"id": "ID: <small>optional</small>",
 
 	"properties": "Properties:",
-	"groups": "Groups:",
+	"only-admins": "Only display to Admins",
+	"only-global-mods-and-admins": "Only display to Global Moderators and Admins",
+	"only-logged-in": "Only display to logged in users",
+	"only-guest": "Only display to guests",
 	"open-new-window": "Open in a new window",
-	"dropdown": "Dropdown",
-	"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a class=&quot;dropdown-item&quot; href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
 
 	"btn.delete": "Delete",
 	"btn.disable": "Disable",

public/language/ar/admin/general/social.json

@@ -1,4 +1,5 @@
 {
 	"post-sharing": "Post Sharing",
-	"info-plugins-additional": "Plugins can add additional networks for sharing posts."
+	"info-plugins-additional": "Plugins can add additional networks for sharing posts.",
+	"save-success": "Successfully saved Post Sharing Networks!"
 }

public/language/ar/admin/manage/admins-mods.json

@@ -1,11 +1,8 @@
 {
-    "manage-admins-and-mods": "Manage Admins & Mods",
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "view-children": "View children (%1)",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/ar/admin/manage/categories.json

@@ -1,11 +1,7 @@
 {
-	"manage-categories": "Manage Categories",
-	"add-category": "Add category",
-	"jump-to": "Jump to...",
 	"settings": "اعدادات القسم",
-	"edit-category": "Edit Category",
 	"privileges": "الصلاحيات",
-	"back-to-categories": "Back to categories",
+
 	"name": "Category Name",
 	"description": "Category Description",
 	"bg-color": "Background Colour",
@@ -14,20 +10,13 @@
 	"custom-class": "Custom Class",
 	"num-recent-replies": "# of Recent Replies",
 	"ext-link": "External Link",
-	"subcategories-per-page": "Subcategories per page",
 	"is-section": "Treat this category as a section",
-	"post-queue": "Post queue",
-	"tag-whitelist": "Tag Whitelist",
 	"upload-image": "Upload Image",
-	"upload": "Upload",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
-	"image-and-icon": "Image & Icon",
 	"parent-category": "Parent Category",
 	"optional-parent-category": "(Optional) Parent Category",
-	"top-level": "Top Level",
 	"parent-category-none": "(None)",
-	"copy-parent": "Copy Parent",
 	"copy-settings": "Copy Settings From",
 	"optional-clone-settings": "(Optional) Clone Settings From Category",
 	"clone-children": "Clone Children Categories And Settings",
@@ -36,38 +25,24 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
-	"analytics": "Analytics",
-
-	"view-category": "View category",
-	"set-order": "Set order",
-	"set-order-help": "Setting the order of the category will move this category to that order and update the order of other categories as necessary. Minimum order is 1 which puts the category at the top.",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
 
-	"privileges.description": "You can configure the access control privileges for portions of the site in this section. Privileges can be granted on a per-user or a per-group basis. Select the domain of effect from the dropdown below.",
+	"privileges.description": "You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or a per-group basis. You can add a new user to this table by searching for them in the form below.",
-	"privileges.category-selector": "Configuring privileges for ",
 	"privileges.warning": "<strong>Note</strong>: Privilege settings take effect immediately. It is not necessary to save the category after adjusting these settings.",
 	"privileges.section-viewing": "Viewing Privileges",
 	"privileges.section-posting": "Posting Privileges",
 	"privileges.section-moderation": "Moderation Privileges",
-	"privileges.section-other": "Other",
 	"privileges.section-user": "User",
 	"privileges.search-user": "Add User",
 	"privileges.no-users": "No user-specific privileges in this category.",
 	"privileges.section-group": "Group",
 	"privileges.group-private": "This group is private",
-  	"privileges.inheritance-exception": "This group does not inherit privileges from registered-users group",
-  	"privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group",
 	"privileges.search-group": "Add Group",
 	"privileges.copy-to-children": "Copy to Children",
 	"privileges.copy-from-category": "Copy from Category",
-	"privileges.copy-privileges-to-all-categories": "Copy to All Categories",
-	"privileges.copy-group-privileges-to-children": "Copy this group's privileges to the children of this category.",
-	"privileges.copy-group-privileges-to-all-categories": "Copy this group's privileges to all categories.",
-	"privileges.copy-group-privileges-from": "Copy this group's privileges from another category.",
 	"privileges.inherit": "If the <code>registered-users</code> group is granted a specific privilege, all other groups receive an <strong>implicit privilege</strong>, even if they are not explicitly defined/checked. This implicit privilege is shown to you because all users are part of the <code>registered-users</code> user group, and so, privileges for additional groups need not be explicitly granted.",
-	"privileges.copy-success": "Privileges copied!",
 
 	"analytics.back": "Back to Categories List",
 	"analytics.title": "Analytics for \"%1\" category",
@@ -80,6 +55,7 @@
 	"alert.create-success": "Category successfully created!",
 	"alert.none-active": "You have no active categories.",
 	"alert.create": "Create a Category",
+	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
 	"alert.purge-success": "Category purged!",
 	"alert.copy-success": "Settings Copied!",
@@ -91,9 +67,7 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
-	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create",
+	"disable-on-create": "Disable on create"
-	"no-matches": "No matches"
 }

public/language/ar/admin/manage/digest.json

@@ -1,22 +0,0 @@
-{
-	"lead": "A listing of digest delivery stats and times is displayed below.",
-	"disclaimer": "Please be advised that email delivery is not guaranteed, due to the nature of email technology. Many variables factor into whether an email sent to the recipient server is ultimately delivered into the user's inbox, including server reputation, blacklisted IP addresses, and whether DKIM/SPF/DMARC is configured.",
-	"disclaimer-continued": "A successful delivery means the message was sent successfully by NodeBB and acknowledged by the recipient server. It does not mean the email landed in the inbox. For best results, we recommend using a third-party email delivery service such as <a href=\"https://sendgrid.com/why-sendgrid/\">SendGrid</a>.",
-
-	"user": "User",
-	"subscription": "Subscription Type",
-	"last-delivery": "Last successful delivery",
-	"default": "System default",
-	"default-help": "<em>System default</em> means the user has not explicitly overridden the global forum setting for digests, which is currently: &quot;<strong>%1</strong>&quot;",
-	"resend": "Resend Digest",
-	"resend-all-confirm": "Are you sure you wish to manually execute this digest run?",
-	"resent-single": "Manual digest resend completed",
-	"resent-day": "Daily digest resent",
-	"resent-week": "Weekly digest resent",
-	"resent-biweek": "Bi-Weekly digest resent",
-	"resent-month": "Monthly digest resent",
-	"null": "<em>Never</em>",
-	"manual-run": "Manual digest run:",
-
-	"no-delivery-data": "No delivery data found"
-}

public/language/ar/admin/manage/groups.json

@@ -1,22 +1,9 @@
 {
-	"manage-groups": "Manage Groups",
-	"add-group": "Add group",
-	"edit-group": "Edit Group",
-	"back-to-groups": "Back to groups",
-	"view-group": "View group",
-	"icon-and-title": "Icon & Title",
 	"name": "اسم المجموعة",
-	"badge": "Badge",
-	"properties": "Properties",
 	"description": "Group Description",
 	"member-count": "Member Count",
-	"system": "System",
+	"system": "System Group",
-	"hidden": "Hidden",
-	"private": "Private",
 	"edit": "Edit",
-	"delete": "Delete",
-	"privileges": "Privileges",
-	"members-csv": "Members (CSV)",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",
@@ -30,12 +17,10 @@
 	"edit.user-title": "Title of Members",
 	"edit.icon": "Group Icon",
 	"edit.label-color": "Group Label Color",
-	"edit.text-color": "Group Text Color",
 	"edit.show-badge": "Show Badge",
 	"edit.private-details": "If enabled, joining of groups requires approval from a group owner.",
 	"edit.private-override": "Warning: Private groups is disabled at system level, which overrides this option.",
-	"edit.disable-join": "Disable join requests",
+	"edit.disable-requests": "Disable join requests",
-	"edit.disable-leave": "Disallow users from leaving the group",
 	"edit.hidden": "Hidden",
 	"edit.hidden-details": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
 	"edit.add-user": "Add User to Group",
@@ -45,5 +30,6 @@
 	"revert": "Revert",
 
 	"edit.no-users-found": "No Users Found",
-	"edit.confirm-remove-user": "Are you sure you want to remove this user?"
+	"edit.confirm-remove-user": "Are you sure you want to remove this user?",
+	"edit.save-success": "Changes saved!"
 }