feat: pass in all query params to category search filter

https://github.com/julianlam/nodebb-plugin-mentions/issues/156

.codeclimate.yml

@@ -10,13 +10,21 @@ checks:
       threshold: 500
   method-lines:
     config:
-      threshold: 50
+      threshold: 75
   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/*"

.eslintrc

@@ -1,140 +1,3 @@
 {
-	"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-return-await": "off",
-		"no-constant-condition": "off",
-		"no-empty": ["error", { "allowEmptyCatch": true }],
-		"no-underscore-dangle": "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", { "SwitchCase": 1 }],
-		"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
-		}],
-		"no-else-return": [ "error", { "allowElseIf": true } ],
-		"operator-linebreak": [ "error", "after" ],
-		"arrow-parens": ["error", "as-needed", { "requireForBlockBody": 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"
-	}
+	"extends": "nodebb"
 }

.github/ISSUE_TEMPLATE.md

@@ -9,6 +9,7 @@
 
 - **NodeBB version:** 
 - **NodeBB git hash:** 
+- **NodeJS version:**
 <!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
 - **Installed NodeBB Plugins:** 
 <!-- (to find installed plugins run ./nodebb plugins) -->
@@ -19,6 +20,9 @@
 <!--
 	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.
 -->
 - **What you expected:**
 <!-- e.g. I expected *abc* to *xyz* -->

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: "/install"
+    schedule:
+      interval: daily

.github/workflows/docker.yml

@@ -0,0 +1,51 @@
+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
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: nodebb/docker
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/test.yaml

@@ -0,0 +1,204 @@
+name: Lint and test
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    branches:
+      - master
+      - develop
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  test:
+    name: Lint and test
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node: [12, 14, 16]
+        database: [mongo-dev, mongo, redis, postgres]
+        include:
+          # only run coverage once
+          - os: ubuntu-latest
+            node: 14
+            coverage: true
+          # test under development once
+          - database: mongo-dev
+            test_env: development
+          # only run eslint once
+          - os: ubuntu-latest
+            node: 14
+            database: mongo-dev
+            lint: true
+    runs-on: ${{ matrix.os }}
+    env:
+      TEST_ENV: ${{ matrix.test_env || 'production' }}
+
+    services:
+      postgres:
+        image: 'postgres:10-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:2.8.9'
+        # 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:3.2'
+        ports:
+          # Maps port 27017 on service container to the host
+          - 27017:27017
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: cp install/package.json package.json
+
+      - name: Install Node
+        uses: actions/setup-node@v2
+        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@1.1.3
+        if: matrix.coverage
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: ${{ matrix.os }}-node-${{ matrix.node }}-db-${{ matrix.database }}
+          parallel: true
+
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@1.1.3
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

.gitignore

@@ -40,6 +40,7 @@ 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

.husky/.gitignore

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

.husky/commit-msg

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

.husky/pre-commit

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

.jsbeautifyrc

@@ -1,17 +0,0 @@
-{
-    "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

@@ -1,91 +0,0 @@
-{
-    // JSHint Default Configuration File (as on JSHint website)
-    // See http://jshint.com/docs/ for more details
-
-    "maxerr" : 50, // {int} Maximum error before stopping
-
-    "esversion": 6,
-
-    // 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
-}

.travis.yml

@@ -1,47 +0,0 @@
-services:
-  - mongodb
-  - redis-server
-  - postgresql
-before_install:
-  - cp install/package.json package.json
-  - sudo apt-get update
-  - sudo apt-get --yes remove postgresql\*
-  - sudo apt-get install -y postgresql-12 postgresql-client-12
-  - sudo cp /etc/postgresql/{9.6,12}/main/pg_hba.conf
-  - sudo service postgresql restart 12
-before_script:
-  - sleep 15 # wait for mongodb to be ready
-  - "mongo mydb_test --eval 'db.createUser({user:\"travis\", pwd: \"test\", roles: []});'"
-  - 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\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
-  - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567/forum\\\",\\\"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\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":1}\"; 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\\\":5433,\\\"postgres:password\\\":\\\"\\\",\\\"postgres:database\\\":\\\"nodebb\\\",\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":5433,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
-after_success:
-  - "npm run coveralls"
-language: node_js
-sudo: false
-dist: xenial
-env:
-  global:
-    - PGUSER=postgres
-    - PGPORT=5433
-    - CXX=g++-4.8
-  jobs:
-    - "DB=mongodb TEST_ENV=production"
-    - "DB=mongodb TEST_ENV=development"
-    - "DB=redis TEST_ENV=production"
-    - "DB=postgres TEST_ENV=production"
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-      - mongodb-4.0-xenial
-    packages:
-      - g++-4.8
-      - mongodb-org-server
-node_js:
-  - "14"
-  - "12"
-branches:
-  only:
-    - master
-    - develop

.tx/config

@@ -1000,6 +1000,56 @@ trans.zh_CN = public/language/zh-CN/tags.json
 trans.zh_TW = public/language/zh-TW/tags.json
 type = KEYVALUEJSON
 
+[nodebb.top]
+file_filter = public/language/<lang>/top.json
+source_file = public/language/en-GB/top.json
+source_lang = en_GB
+trans.ar = public/language/ar/top.json
+trans.bg = public/language/bg/top.json
+trans.bn = public/language/bn/top.json
+trans.cs = public/language/cs/top.json
+trans.da = public/language/da/top.json
+trans.de = public/language/de/top.json
+trans.el = public/language/el/top.json
+trans.en@pirate = public/language/en-x-pirate/top.json
+trans.en_US = public/language/en-US/top.json
+trans.es = public/language/es/top.json
+trans.et = public/language/et/top.json
+trans.fa_IR = public/language/fa-IR/top.json
+trans.fi = public/language/fi/top.json
+trans.fr = public/language/fr/top.json
+trans.gl = public/language/gl/top.json
+trans.he = public/language/he/top.json
+trans.hr = public/language/hr/top.json
+trans.hu = public/language/hu/top.json
+trans.id = public/language/id/top.json
+trans.it = public/language/it/top.json
+trans.ja = public/language/ja/top.json
+trans.ko = public/language/ko/top.json
+trans.lt = public/language/lt/top.json
+trans.lv = public/language/lv/top.json
+trans.ms = public/language/ms/top.json
+trans.nb = public/language/nb/top.json
+trans.nl = public/language/nl/top.json
+trans.pl = public/language/pl/top.json
+trans.pt_BR = public/language/pt-BR/top.json
+trans.pt_PT = public/language/pt-PT/top.json
+trans.ro = public/language/ro/top.json
+trans.ru = public/language/ru/top.json
+trans.rw = public/language/rw/top.json
+trans.sc = public/language/sc/top.json
+trans.sk = public/language/sk/top.json
+trans.sl = public/language/sl/top.json
+trans.sr = public/language/sr/top.json
+trans.sv = public/language/sv/top.json
+trans.th = public/language/th/top.json
+trans.tr = public/language/tr/top.json
+trans.uk = public/language/uk/top.json
+trans.vi = public/language/vi/top.json
+trans.zh_CN = public/language/zh-CN/top.json
+trans.zh_TW = public/language/zh-TW/top.json
+type = KEYVALUEJSON
+
 [nodebb.email]
 file_filter = public/language/<lang>/email.json
 source_file = public/language/en-GB/email.json
@@ -3300,6 +3350,56 @@ trans.zh_CN = public/language/zh-CN/admin/settings/notifications.json
 trans.zh_TW = public/language/zh-TW/admin/settings/notifications.json
 type = KEYVALUEJSON
 
+[nodebb.admin-settings-api]
+file_filter = public/language/<lang>/admin/settings/api.json
+source_file = public/language/en-GB/admin/settings/api.json
+source_lang = en_GB
+trans.ar = public/language/ar/admin/settings/api.json
+trans.bg = public/language/bg/admin/settings/api.json
+trans.bn = public/language/bn/admin/settings/api.json
+trans.cs = public/language/cs/admin/settings/api.json
+trans.da = public/language/da/admin/settings/api.json
+trans.de = public/language/de/admin/settings/api.json
+trans.el = public/language/el/admin/settings/api.json
+trans.en@pirate = public/language/en-x-pirate/admin/settings/api.json
+trans.en_US = public/language/en-US/admin/settings/api.json
+trans.es = public/language/es/admin/settings/api.json
+trans.et = public/language/et/admin/settings/api.json
+trans.fa_IR = public/language/fa-IR/admin/settings/api.json
+trans.fi = public/language/fi/admin/settings/api.json
+trans.fr = public/language/fr/admin/settings/api.json
+trans.gl = public/language/gl/admin/settings/api.json
+trans.he = public/language/he/admin/settings/api.json
+trans.hr = public/language/hr/admin/settings/api.json
+trans.hu = public/language/hu/admin/settings/api.json
+trans.id = public/language/id/admin/settings/api.json
+trans.it = public/language/it/admin/settings/api.json
+trans.ja = public/language/ja/admin/settings/api.json
+trans.ko = public/language/ko/admin/settings/api.json
+trans.lt = public/language/lt/admin/settings/api.json
+trans.lv = public/language/lv/admin/settings/api.json
+trans.ms = public/language/ms/admin/settings/api.json
+trans.nb = public/language/nb/admin/settings/api.json
+trans.nl = public/language/nl/admin/settings/api.json
+trans.pl = public/language/pl/admin/settings/api.json
+trans.pt_BR = public/language/pt-BR/admin/settings/api.json
+trans.pt_PT = public/language/pt-PT/admin/settings/api.json
+trans.ro = public/language/ro/admin/settings/api.json
+trans.ru = public/language/ru/admin/settings/api.json
+trans.rw = public/language/rw/admin/settings/api.json
+trans.sc = public/language/sc/admin/settings/api.json
+trans.sk = public/language/sk/admin/settings/api.json
+trans.sl = public/language/sl/admin/settings/api.json
+trans.sr = public/language/sr/admin/settings/api.json
+trans.sv = public/language/sv/admin/settings/api.json
+trans.th = public/language/th/admin/settings/api.json
+trans.tr = public/language/tr/admin/settings/api.json
+trans.uk = public/language/uk/admin/settings/api.json
+trans.vi = public/language/vi/admin/settings/api.json
+trans.zh_CN = public/language/zh-CN/admin/settings/api.json
+trans.zh_TW = public/language/zh-TW/admin/settings/api.json
+type = KEYVALUEJSON
+
 [nodebb.admin-settings-post]
 file_filter = public/language/<lang>/admin/settings/post.json
 source_file = public/language/en-GB/admin/settings/post.json

Dockerfile

@@ -1,17 +1,20 @@
 FROM node:lts
 
-RUN mkdir -p /usr/src/app
+RUN mkdir -p /usr/src/app && \
+    chown -R node:node /usr/src/app
 WORKDIR /usr/src/app
 
 ARG NODE_ENV
 ENV NODE_ENV $NODE_ENV
 
-COPY install/package.json /usr/src/app/package.json
+COPY --chown=node:node install/package.json /usr/src/app/package.json
+
+USER node
 
 RUN npm install --only=prod && \
     npm cache clean --force
-    
-COPY . /usr/src/app
+
+COPY --chown=node:node . /usr/src/app
 
 ENV NODE_ENV=production \
     daemon=false \

Gruntfile.js

@@ -2,24 +2,27 @@
 
 const path = require('path');
 const nconf = require('nconf');
+
 nconf.argv().env({
 	separator: '__',
 });
 const winston = require('winston');
-const fork = require('child_process').fork;
-const env = process.env;
-var worker;
+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);
 
-var db = require('./src/database');
+const db = require('./src/database');
 
 module.exports = function (grunt) {
-	var args = [];
+	const args = [];
 
 	if (!grunt.option('verbose')) {
 		args.push('--log-level=info');
@@ -36,7 +39,7 @@ module.exports = function (grunt) {
 	grunt.registerTask('default', ['watch']);
 
 	grunt.registerTask('init', async function () {
-		var done = this.async();
+		const done = this.async();
 		let plugins = [];
 		if (!process.argv.includes('--core')) {
 			await db.init();
@@ -50,22 +53,22 @@ module.exports = function (grunt) {
 			}
 		}
 
-		const styleUpdated_Client = plugins.map(p => 'node_modules/' + p + '/*.less')
-			.concat(plugins.map(p => 'node_modules/' + p + '/*.css'))
-			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static|less)/**/*.less'))
-			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.css'));
+		const styleUpdated_Client = plugins.map(p => `node_modules/${p}/*.less`)
+			.concat(plugins.map(p => `node_modules/${p}/*.css`))
+			.concat(plugins.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
+			.concat(plugins.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
-		const styleUpdated_Admin = plugins.map(p => 'node_modules/' + p + '/*.less')
-			.concat(plugins.map(p => 'node_modules/' + p + '/*.css'))
-			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static|less)/**/*.less'))
-			.concat(plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.css'));
+		const styleUpdated_Admin = plugins.map(p => `node_modules/${p}/*.less`)
+			.concat(plugins.map(p => `node_modules/${p}/*.css`))
+			.concat(plugins.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
+			.concat(plugins.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
 
-		const clientUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static)/**/*.js');
-		const serverUpdated = plugins.map(p => 'node_modules/' + p + '/*.js')
-			.concat(plugins.map(p => 'node_modules/' + p + '/+(lib|src)/**/*.js'));
+		const clientUpdated = plugins.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
+		const serverUpdated = plugins.map(p => `node_modules/${p}/*.js`)
+			.concat(plugins.map(p => `node_modules/${p}/+(lib|src)/**/*.js`));
 
-		const templatesUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static|templates)/**/*.tpl');
-		const langUpdated = plugins.map(p => 'node_modules/' + p + '/+(public|static|languages)/**/*.json');
+		const templatesUpdated = plugins.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
+		const langUpdated = plugins.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
 
 		grunt.config(['watch'], {
 			styleUpdated_Client: {
@@ -89,6 +92,7 @@ module.exports = function (grunt) {
 			clientUpdated: {
 				files: [
 					'public/src/**/*.js',
+					'public/vendor/**/*.js',
 					...clientUpdated,
 					'node_modules/benchpressjs/build/benchpress.js',
 				],
@@ -143,16 +147,25 @@ module.exports = function (grunt) {
 		if (worker) {
 			worker.kill();
 		}
+
+		const execArgv = [];
+		const inspect = process.argv.find(a => a.startsWith('--inspect'));
+
+		if (inspect) {
+			execArgv.push(inspect);
+		}
+
 		worker = fork('app.js', args, {
-			env: env,
+			env,
+			execArgv,
 		});
 	}
 
 	grunt.task.run('init');
 
 	grunt.event.removeAllListeners('watch');
-	grunt.event.on('watch', function update(action, filepath, target) {
-		var compiling;
+	grunt.event.on('watch', (action, filepath, target) => {
+		let compiling;
 		if (target === 'styleUpdated_Client') {
 			compiling = 'clientCSS';
 		} else if (target === 'styleUpdated_Admin') {
@@ -170,7 +183,7 @@ module.exports = function (grunt) {
 			return run();
 		}
 
-		require('./src/meta/build').build([compiling], function (err) {
+		require('./src/meta/build').build([compiling], (err) => {
 			if (err) {
 				winston.error(err.stack);
 			}
@@ -189,7 +202,7 @@ function addBaseThemes(plugins) {
 	let baseTheme;
 	do {
 		try {
-			baseTheme = require(themeId + '/theme').baseTheme;
+			baseTheme = require(`${themeId}/theme`).baseTheme;
 		} catch (err) {
 			console.log(err);
 		}

README.md

@@ -1,19 +1,20 @@
-# <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
+# ![NodeBB](public/images/logo.svg)
 
-[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
+[![Workflow](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml/badge.svg)](https://github.com/NodeBB/NodeBB/actions/workflows/test.yaml)
 [![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)
 
-[**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 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 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.
 
 Additional functionality is enabled through the use of third-party plugins.
 
-* [Demo & Meta Discussion](http://community.nodebb.org)
+* [Demo](https://try.nodebb.org)
+* [Developer Community](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")
+* 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")
 
@@ -50,6 +51,7 @@ NodeBB requires the following software to be installed:
 
 * A version of Node.js at least 12 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
 * MongoDB, version 2.6 or greater **or** Redis, version 2.8.9 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

app.js

@@ -22,6 +22,7 @@
 require('./require-main');
 
 const nconf = require('nconf');
+
 nconf.argv().env({
 	separator: '__',
 });
@@ -40,6 +41,7 @@ const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'c
 const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
 
 const prestart = require('./src/prestart');
+
 prestart.loadConfig(configFile);
 prestart.setupWinston();
 prestart.versionCheck();
@@ -47,7 +49,7 @@ winston.verbose('* using configuration stored in: %s', configFile);
 
 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('');

commitlint.config.js

@@ -3,6 +3,7 @@
 module.exports = {
 	extends: ['@commitlint/config-angular'],
 	rules: {
+		'header-max-length': [1, 'always', 72],
 		'type-enum': [
 			2,
 			'always',

install/data/categories.json

@@ -4,7 +4,7 @@
         "description": "Announcements regarding our community",
         "descriptionParsed": "<p>Announcements regarding our community</p>\n",
         "bgColor": "#fda34b",
-        "color": "#fff",
+        "color": "#ffffff",
         "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": "#fff",
+        "color": "#ffffff",
         "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": "#fff",
+        "color": "#ffffff",
         "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": "#fff",
+        "color": "#ffffff",
         "icon" : "fa-question",
         "order": 3
     }

install/data/defaults.json

@@ -14,26 +14,33 @@
     "newbiePostEditDuration": 3600,
     "postDeleteDuration": 0,
     "enablePostHistory": 1,
+    "topicBacklinks": 1,
     "postCacheSize": 10485760,
     "disableChat": 0,
     "chatEditDuration": 0,
     "chatDeleteDuration": 0,
     "chatMessageDelay": 200,
+    "notificationSendDelay": 60,
     "newbiePostDelayThreshold": 3,
+    "postQueue": 0,
     "postQueueReputationThreshold": 0,
     "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,
+    "systemTags": "",
     "minimumTagsPerTopic": 0,
     "maximumTagsPerTopic": 5,
     "minimumTagLength": 3,
     "maximumTagLength": 15,
-    "allowTopicsThumbnail": 0,
+    "undoTimeout": 10000,
+    "allowTopicsThumbnail": 1,
     "registrationType": "normal",
     "registrationApprovalType": "normal",
     "allowAccountDelete": 1,
     "privateUploads": 0,
     "allowedFileExtensions": "png,jpg,bmp,txt",
+    "uploadRateLimitThreshold": 10,
+    "uploadRateLimitCooldown": 60,
     "allowUserHomePage": 1,
     "allowMultipleBadges": 0,
     "maximumFileSize": 2048,
@@ -43,7 +50,7 @@
     "rejectImageWidth": 5000,
     "rejectImageHeight": 5000,
     "resizeImageQuality": 80,
-    "topicThumbSize": 120,
+    "topicThumbSize": 512,
     "minimumTitleLength": 3,
     "maximumTitleLength": 255,
     "minimumUsernameLength": 2,
@@ -59,10 +66,10 @@
     "profileImageDimension": 200,
     "profile:convertProfileImageToPNG": 0,
     "profile:keepAllUserImages": 0,
-    "requireEmailConfirmation": 0,
     "gdpr_enabled": 1,
     "allowProfileImageUploads": 1,
     "teaserPost": "last-reply",
+    "showPostPreviewsOnHover": 1,
     "allowPrivateGroups": 1,
     "unreadCutoff": 2,
     "bookmarkThreshold": 5,
@@ -86,7 +93,9 @@
     "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",
@@ -98,11 +107,16 @@
     "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,
@@ -110,16 +124,24 @@
     "maximumInvites": 0,
     "username:disableEdit": 0,
     "email:disableEdit": 0,
-    "email:smtpTransport:pool": false,
+    "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,
+    "removeEmailNotificationImages": 0,
+    "includeUnverifiedEmails": 0,
+    "emailPrompt": 1,
     "inviteExpiration": 7,
+    "dailyDigestFreq": "off",
     "digestHour": 17,
     "passwordExpiryDays": 0,
     "hsts-maxage": 31536000,
@@ -133,5 +155,14 @@
     "timeagoCutoff": 30,
     "necroThreshold": 7,
     "categoryWatchState": "watching",
-    "submitPluginUsage": 1
+    "submitPluginUsage": 1,
+    "showAverageApprovalTime": 1,
+    "autoApproveTime": 0,
+    "maxUserSessions": 10,
+    "useCompression": 0,
+    "updateUrlWithPostIndex": 1,
+    "composer:showHelpTab": 1,
+    "composer:allowPluginHelp": 1,
+    "maxReconnectionAttempts": 5,
+    "reconnectionDelay": 1500
 }

install/databases.js

@@ -3,10 +3,6 @@
 const prompt = require('prompt');
 const winston = require('winston');
 
-const util = require('util');
-
-const promptGet = util.promisify((schema, callback) => prompt.get(schema, callback));
-
 const questions = {
 	redis: require('../src/database/redis').questions,
 	mongo: require('../src/database/mongo').questions,
@@ -14,7 +10,7 @@ const questions = {
 };
 
 module.exports = async function (config) {
-	winston.info('\nNow configuring ' + config.database + ' database:');
+	winston.info(`\nNow configuring ${config.database} database:`);
 	const databaseConfig = await getDatabaseConfig(config);
 	return saveDatabaseConfig(config, databaseConfig);
 };
@@ -28,19 +24,19 @@ async function getDatabaseConfig(config) {
 		if (config['redis:host'] && config['redis:port']) {
 			return config;
 		}
-		return await promptGet(questions.redis);
+		return await prompt.get(questions.redis);
 	} else if (config.database === 'mongo') {
 		if ((config['mongo:host'] && config['mongo:port']) || config['mongo:uri']) {
 			return config;
 		}
-		return await promptGet(questions.mongo);
+		return await prompt.get(questions.mongo);
 	} else if (config.database === 'postgres') {
 		if (config['postgres:host'] && config['postgres:port']) {
 			return config;
 		}
-		return await promptGet(questions.postgres);
+		return await prompt.get(questions.postgres);
 	}
-	throw new Error('unknown database : ' + config.database);
+	throw new Error(`unknown database : ${config.database}`);
 }
 
 function saveDatabaseConfig(config, databaseConfig) {
@@ -79,11 +75,11 @@ function saveDatabaseConfig(config, databaseConfig) {
 			ssl: databaseConfig['postgres:ssl'],
 		};
 	} else {
-		throw new Error('unknown database : ' + config.database);
+		throw new Error(`unknown database : ${config.database}`);
 	}
 
 	const allQuestions = questions.redis.concat(questions.mongo).concat(questions.postgres);
-	for (var x = 0; x < allQuestions.length; x += 1) {
+	for (let x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}
 

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.15.0-beta.29",
+    "version": "1.18.6",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -11,150 +11,159 @@
     "main": "app.js",
     "scripts": {
         "start": "node loader.js",
-        "lint": "npx eslint --cache ./nodebb .",
-        "pretest": "npm run lint",
-        "test": "npx nyc --reporter=html --reporter=text-summary npx mocha",
+        "lint": "eslint --cache ./nodebb .",
+        "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"
     },
-    "husky": {
-        "hooks": {
-            "pre-commit": "npx lint-staged",
-            "commit-msg": "npx commitlint -E HUSKY_GIT_PARAMS"
-        }
+    "nyc": {
+        "exclude": [
+            "src/upgrades/*",
+            "test/*"
+        ]
     },
     "lint-staged": {
         "*.js": [
-            "eslint --fix",
-            "git add"
+            "eslint --fix"
         ]
     },
     "dependencies": {
-        "ace-builds": "^1.4.9",
-        "archiver": "^5.0.0",
+        "@adactive/bootstrap-tagsinput": "^0.8.2",
+        "ace-builds": "^1.4.12",
+        "archiver": "^5.2.0",
         "async": "^3.2.0",
-        "autoprefixer": "^10.0.0",
+        "autoprefixer": "10.4.0",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "2.0.4",
+        "benchpressjs": "2.4.3",
         "body-parser": "^1.19.0",
+        "bootbox": "5.5.2",
         "bootstrap": "^3.4.1",
-        "chart.js": "^2.9.3",
+        "chart.js": "^2.9.4",
         "cli-graph": "^3.2.2",
         "clipboard": "^2.0.6",
         "colors": "^1.4.0",
-        "commander": "^6.0.0",
+        "commander": "^7.1.0",
+        "compare-versions": "3.6.0",
         "compression": "^1.7.4",
-        "connect-ensure-login": "^0.1.1",
         "connect-flash": "^0.1.1",
-        "connect-mongo": "3.2.0",
+        "connect-mongo": "4.6.0",
         "connect-multiparty": "^2.2.0",
-        "connect-pg-simple": "^6.1.0",
-        "connect-redis": "5.0.0",
+        "connect-pg-simple": "^7.0.0",
+        "connect-redis": "6.0.0",
         "cookie-parser": "^1.4.5",
         "cron": "^1.8.2",
-        "cropperjs": "^1.5.6",
+        "cropperjs": "^1.5.11",
         "csurf": "^1.11.0",
         "daemon": "^1.1.0",
-        "diff": "^4.0.2",
+        "diff": "^5.0.0",
         "express": "^4.17.1",
-        "express-session": "^1.17.0",
-        "express-useragent": "^1.0.13",
-        "graceful-fs": "^4.2.3",
-        "helmet": "^4.0.0",
-        "html-to-text": "^5.1.1",
+        "express-session": "^1.17.1",
+        "express-useragent": "^1.0.15",
+        "graceful-fs": "^4.2.6",
+        "helmet": "^4.4.1",
+        "html-to-text": "8.1.0",
         "ipaddr.js": "^2.0.0",
-        "jquery": "3.5.1",
-        "jsesc": "3.0.1",
-        "json2csv": "5.0.3",
+        "jquery": "3.6.0",
+        "jquery-deserialize": "2.0.0",
+        "jquery-form": "4.3.0",
+        "jquery-serializeobject": "1.0.0",
+        "jquery-ui": "1.13.0",
+        "jsesc": "3.0.2",
+        "json2csv": "5.0.6",
         "jsonwebtoken": "^8.5.1",
         "less": "^3.11.1",
-        "lodash": "^4.17.15",
-        "logrotate-stream": "^0.2.6",
+        "lodash": "^4.17.21",
+        "logrotate-stream": "^0.2.7",
         "lru-cache": "6.0.0",
         "material-design-lite": "^1.3.0",
-        "mime": "^2.4.4",
+        "mime": "^2.5.2",
         "mkdirp": "^1.0.4",
-        "mongodb": "3.6.2",
+        "mongodb": "4.1.4",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
+        "multiparty": "4.2.2",
         "@nodebb/bootswatch": "3.4.2",
-        "@nodebb/mubsub": "1.7.0",
-        "@nodebb/socket.io-adapter-mongo": "3.1.0",
-        "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.4.2",
-        "nodebb-plugin-dbsearch": "4.1.2",
-        "nodebb-plugin-emoji": "^3.3.0",
-        "nodebb-plugin-emoji-android": "2.0.0",
-        "nodebb-plugin-markdown": "8.12.1",
-        "nodebb-plugin-mentions": "2.11.0",
-        "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.7.2",
-        "nodebb-rewards-essentials": "0.1.3",
-        "nodebb-theme-lavender": "5.0.13",
-        "nodebb-theme-persona": "10.2.51",
-        "nodebb-theme-slick": "1.2.36",
-        "nodebb-theme-vanilla": "11.2.20",
-        "nodebb-widget-essentials": "4.1.2",
-        "nodemailer": "^6.4.6",
-        "passport": "^0.4.1",
+        "nconf": "^0.11.2",
+        "nodebb-plugin-composer-default": "7.0.14",
+        "nodebb-plugin-dbsearch": "5.1.0",
+        "nodebb-plugin-emoji": "^3.5.0",
+        "nodebb-plugin-emoji-android": "2.0.5",
+        "nodebb-plugin-markdown": "8.14.4",
+        "nodebb-plugin-mentions": "3.0.3",
+        "nodebb-plugin-spam-be-gone": "0.7.11",
+        "nodebb-rewards-essentials": "0.2.0",
+        "nodebb-theme-lavender": "5.3.1",
+        "nodebb-theme-persona": "11.2.21",
+        "nodebb-theme-slick": "1.4.16",
+        "nodebb-theme-vanilla": "12.1.9",
+        "nodebb-widget-essentials": "5.0.4",
+        "nodemailer": "^6.5.0",
+        "nprogress": "0.2.0",
+        "passport": "^0.5.0",
         "passport-http-bearer": "^1.0.1",
         "passport-local": "1.0.0",
-        "pg": "^8.0.2",
-        "pg-cursor": "^2.1.9",
-        "postcss": "8.0.6",
-        "postcss-clean": "1.1.0",
-        "promise-polyfill": "^8.1.3",
-        "prompt": "^1.0.0",
-        "redis": "3.0.2",
+        "pg": "^8.7.1",
+        "pg-cursor": "^2.7.1",
+        "postcss": "8.3.11",
+        "postcss-clean": "1.2.0",
+        "prompt": "^1.1.0",
+        "ioredis": "4.28.0",
         "request": "2.88.2",
-        "request-promise-native": "^1.0.8",
+        "request-promise-native": "^1.0.9",
+        "requirejs": "2.3.6",
         "rimraf": "3.0.2",
         "rss": "^1.2.2",
-        "sanitize-html": "^2.0.0",
-        "semver": "^7.2.1",
+        "sanitize-html": "^2.3.2",
+        "semver": "^7.3.4",
         "serve-favicon": "^2.5.0",
-        "sharp": "0.26.1",
-        "sitemap": "^6.1.0",
-        "socket.io": "2.3.0",
+        "sharp": "0.29.2",
+        "sitemap": "^7.0.0",
+        "slideout": "1.0.1",
+        "socket.io": "4.3.2",
         "socket.io-adapter-cluster": "^1.0.1",
-        "socket.io-adapter-postgres": "^1.2.1",
-        "socket.io-client": "2.3.0",
-        "socket.io-redis": "5.4.0",
-        "socketio-wildcard": "2.0.0",
-        "spdx-license-list": "^6.1.0",
+        "socket.io-client": "4.3.2",
+        "@socket.io/redis-adapter": "7.0.0",
+        "sortablejs": "1.14.0",
+        "spdx-license-list": "^6.4.0",
         "spider-detector": "2.0.0",
-        "textcomplete": "^0.17.1",
+        "textcomplete": "^0.18.0",
         "textcomplete.contenteditable": "^0.1.1",
+        "timeago": "^1.6.7",
+        "tinycon": "0.6.8",
         "toobusy-js": "^0.5.1",
         "uglify-es": "^3.3.9",
-        "validator": "13.1.17",
+        "validator": "13.7.0",
+        "visibilityjs": "2.0.2",
         "winston": "3.3.3",
         "xml": "^1.0.1",
-        "xregexp": "^4.3.0",
+        "xregexp": "^5.0.1",
+        "yargs": "17.2.1",
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "10.0.2",
-        "@commitlint/cli": "9.1.2",
-        "@commitlint/config-angular": "9.1.2",
-        "coveralls": "3.1.0",
-        "eslint": "7.10.0",
-        "eslint-config-airbnb-base": "14.2.0",
-        "eslint-plugin-import": "2.22.1",
-        "grunt": "1.3.0",
+        "@apidevtools/swagger-parser": "10.0.3",
+        "@commitlint/cli": "14.1.0",
+        "@commitlint/config-angular": "14.1.0",
+        "coveralls": "3.1.1",
+        "eslint": "7.32.0",
+        "eslint-config-nodebb": "0.0.3",
+        "eslint-plugin-import": "2.25.3",
+        "grunt": "1.4.1",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "4.3.0",
-        "jsdom": "16.4.0",
-        "lint-staged": "10.4.0",
-        "mocha": "8.1.3",
+        "husky": "7.0.4",
+        "jsdom": "18.0.1",
+        "lint-staged": "11.2.6",
+        "mocha": "9.1.3",
         "mocha-lcov-reporter": "1.3.0",
+        "mockdate": "3.0.5",
         "nyc": "15.1.0",
-        "smtp-server": "3.7.0"
+        "smtp-server": "3.9.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
     "engines": {
-        "node": ">=10"
+        "node": ">=12"
     },
     "maintainers": [
         {
@@ -173,4 +182,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

install/web.js

@@ -1,27 +1,30 @@
 'use strict';
 
-var winston = require('winston');
-var express = require('express');
-var bodyParser = require('body-parser');
-var fs = require('fs');
-var path = require('path');
-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 winston = require('winston');
+const express = require('express');
+const bodyParser = require('body-parser');
+const fs = require('fs');
+const path = require('path');
+const childProcess = require('child_process');
+const less = require('less');
 
-var app = express();
-var server;
+const uglify = require('uglify-es');
+const nconf = require('nconf');
 
-var formats = [
+const Benchpress = require('benchpressjs');
+const mkdirp = require('mkdirp');
+const { paths } = require('../src/constants');
+
+const app = express();
+let server;
+
+const formats = [
 	winston.format.colorize(),
 ];
 
 const timestampFormat = winston.format((info) => {
-	var dateString = new Date().toISOString() + ' [' + global.process.pid + ']';
-	info.level = dateString + ' - ' + info.level;
+	const dateString = `${new Date().toISOString()} [${global.process.pid}]`;
+	info.level = `${dateString} - ${info.level}`;
 	return info;
 });
 formats.push(timestampFormat());
@@ -42,55 +45,57 @@ winston.configure({
 	],
 });
 
-var web = module.exports;
+const web = module.exports;
 
-var scripts = [
+const scripts = [
 	'node_modules/jquery/dist/jquery.js',
-	'public/vendor/xregexp/xregexp.js',
-	'public/vendor/xregexp/unicode/unicode-base.js',
+	'node_modules/xregexp/xregexp-all.js',
+	'public/src/modules/slugify.js',
 	'public/src/utils.js',
 	'public/src/installer/install.js',
 	'node_modules/zxcvbn/dist/zxcvbn.js',
 ];
 
-var installing = false;
-var success = false;
-var error = false;
-var launchUrl;
+let installing = false;
+let success = false;
+let error = false;
+let launchUrl;
 
-web.install = function (port) {
+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.engine('tpl', function (filepath, options, callback) {
-		async.waterfall([
-			function (next) {
-				fs.readFile(filepath, 'utf-8', next);
-			},
-			function (buffer, next) {
-				Benchpress.compileParse(buffer.toString(), options, next);
-			},
-		], callback);
+	app.engine('tpl', (filepath, options, callback) => {
+		filepath = filepath.replace(/\.tpl$/, '.js');
+
+		Benchpress.__express(filepath, options, callback);
 	});
 	app.set('view engine', 'tpl');
-	app.set('views', path.join(__dirname, '../src/views'));
+	app.set('views', viewsDir);
 	app.use(bodyParser.urlencoded({
 		extended: true,
 	}));
-
-	async.parallel([compileLess, compileJS, copyCSS, loadDefaults], function (err) {
-		if (err) {
-			winston.error(err.stack);
-		}
+	try {
+		await Promise.all([
+			compileTemplate(),
+			compileLess(),
+			compileJS(),
+			copyCSS(),
+			loadDefaults(),
+		]);
 		setupRoutes();
 		launchExpress(port);
-	});
+	} catch (err) {
+		winston.error(err.stack);
+	}
 };
 
 
 function launchExpress(port) {
-	server = app.listen(port, function () {
+	server = app.listen(port, () => {
 		winston.info('Web installer listening on http://%s:%s', '0.0.0.0', port);
 	});
 }
@@ -108,11 +113,9 @@ function ping(req, res) {
 }
 
 function welcome(req, res) {
-	var dbs = ['redis', 'mongo', 'postgres'];
-	var databases = dbs.map(function (databaseName) {
-		var questions = require('../src/database/' + databaseName).questions.filter(function (question) {
-			return question && !question.hideOnWebInstall;
-		});
+	const dbs = ['redis', 'mongo', 'postgres'];
+	const databases = dbs.map((databaseName) => {
+		const questions = require(`../src/database/${databaseName}`).questions.filter(question => question && !question.hideOnWebInstall);
 
 		return {
 			name: databaseName,
@@ -120,10 +123,10 @@ function welcome(req, res) {
 		};
 	});
 
-	var defaults = require('./data/defaults');
+	const defaults = require('./data/defaults.json');
 
 	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,
@@ -143,23 +146,23 @@ function install(req, res) {
 	}
 	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 setupEnvVars = nconf.get();
+	for (const [key, value] of Object.entries(req.body)) {
+		if (!process.env.hasOwnProperty(key)) {
+			setupEnvVars[key.replace(':', '__')] = value;
 		}
 	}
 
 	// Flatten any objects in setupEnvVars
 	const pushToRoot = function (parentKey, key) {
-		setupEnvVars[parentKey + '__' + key] = setupEnvVars[parentKey][key];
+		setupEnvVars[`${parentKey}__${key}`] = setupEnvVars[parentKey][key];
 	};
-	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]);
+	for (const [parentKey, value] of Object.entries(setupEnvVars)) {
+		if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+			Object.keys(value).forEach(key => pushToRoot(parentKey, key));
+			delete setupEnvVars[parentKey];
+		} else if (Array.isArray(value)) {
+			setupEnvVars[parentKey] = JSON.stringify(value);
 		}
 	}
 
@@ -167,11 +170,11 @@ function install(req, res) {
 	winston.info(setupEnvVars);
 	launchUrl = setupEnvVars.url;
 
-	var child = require('child_process').fork('app', ['--setup'], {
+	const child = require('child_process').fork('app', ['--setup'], {
 		env: setupEnvVars,
 	});
 
-	child.on('close', function (data) {
+	child.on('close', (data) => {
 		installing = false;
 		success = data === 0;
 		error = data !== 0;
@@ -180,120 +183,116 @@ function install(req, res) {
 	});
 }
 
-function launch(req, res) {
-	res.json({});
-	server.close();
-	req.setTimeout(0);
-	var child;
+async function launch(req, res) {
+	try {
+		res.json({});
+		server.close();
+		req.setTimeout(0);
+		let child;
 
-	if (!nconf.get('launchCmd')) {
-		child = childProcess.spawn('node', ['loader.js'], {
-			detached: true,
-			stdio: ['ignore', 'ignore', 'ignore'],
-		});
+		if (!nconf.get('launchCmd')) {
+			child = childProcess.spawn('node', ['loader.js'], {
+				detached: true,
+				stdio: ['ignore', 'ignore', 'ignore'],
+			});
 
-		console.log('\nStarting NodeBB');
-		console.log('    "./nodebb stop" to stop the NodeBB server');
-		console.log('    "./nodebb log" to view server output');
-		console.log('    "./nodebb restart" to restart NodeBB');
-	} else {
-		// Use launchCmd instead, if specified
-		child = childProcess.exec(nconf.get('launchCmd'), {
-			detached: true,
-			stdio: ['ignore', 'ignore', 'ignore'],
-		});
-	}
-
-	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');
+			console.log('\nStarting NodeBB');
+			console.log('    "./nodebb stop" to stop the NodeBB server');
+			console.log('    "./nodebb log" to view server output');
+			console.log('    "./nodebb restart" to restart NodeBB');
+		} else {
+			// Use launchCmd instead, if specified
+			child = childProcess.exec(nconf.get('launchCmd'), {
+				detached: true,
+				stdio: ['ignore', 'ignore', 'ignore'],
+			});
 		}
 
+		const filesToDelete = [
+			'installer.css',
+			'installer.min.js',
+			'bootstrap.min.css',
+		];
+		await Promise.all(
+			filesToDelete.map(
+				filename => fs.promises.unlink(path.join(__dirname, '../public', filename))
+			)
+		);
 		child.unref();
 		process.exit(0);
-	});
-}
-
-function compileLess(callback) {
-	var installSrc = path.join(__dirname, '../public/less/install.less');
-	fs.readFile(installSrc, function (err, style) {
-		if (err) {
-			return winston.error('Unable to read LESS install file: ', err.stack);
-		}
-
-		less.render(style.toString(), {
-			filename: path.resolve(installSrc),
-		}, function (err, css) {
-			if (err) {
-				return winston.error('Unable to compile LESS: ', err.stack);
-			}
-
-			fs.writeFile(path.join(__dirname, '../public/installer.css'), css.css, callback);
-		});
-	});
-}
-
-function compileJS(callback) {
-	var code = '';
-	async.eachSeries(scripts, function (srcPath, next) {
-		fs.readFile(path.join(__dirname, '..', srcPath), function (err, buffer) {
-			if (err) {
-				return next(err);
-			}
-
-			code += buffer.toString();
-			next();
-		});
-	}, function (err) {
-		if (err) {
-			return callback(err);
-		}
-		try {
-			var minified = uglify.minify(code, {
-				compress: false,
-			});
-			if (!minified.code) {
-				return callback(new Error('[[error:failed-to-minify]]'));
-			}
-			fs.writeFile(path.join(__dirname, '../public/installer.min.js'), minified.code, callback);
-		} catch (e) {
-			callback(e);
-		}
-	});
-}
-
-function copyCSS(next) {
-	async.waterfall([
-		function (next) {
-			fs.readFile(path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8', next);
-		},
-		function (src, next) {
-			fs.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src, next);
-		},
-	], next);
-}
-
-function loadDefaults(next) {
-	var setupDefaultsPath = path.join(__dirname, '../setup.json');
-	fs.access(setupDefaultsPath, fs.constants.F_OK | fs.constants.R_OK, function (err) {
-		if (err) {
-			// setup.json not found or inaccessible, proceed with no defaults
-			return setImmediate(next);
-		}
-
-		winston.info('[installer] Found setup.json, populating default values');
-		nconf.file({
-			file: setupDefaultsPath,
-		});
-
-		next();
+	} catch (err) {
+		winston.error(err.stack);
+		throw err;
+	}
+}
+
+// this is necessary because otherwise the compiled templates won't be available on a clean install
+async function compileTemplate() {
+	const sourceFile = path.join(__dirname, '../src/views/install/index.tpl');
+	const destTpl = path.join(viewsDir, 'install/index.tpl');
+	const destJs = path.join(viewsDir, 'install/index.js');
+
+	const source = await fs.promises.readFile(sourceFile, 'utf8');
+
+	const [compiled] = await Promise.all([
+		Benchpress.precompile(source, { filename: 'install/index.tpl' }),
+		mkdirp(path.dirname(destJs)),
+	]);
+
+	await Promise.all([
+		fs.promises.writeFile(destJs, compiled),
+		fs.promises.writeFile(destTpl, source),
+	]);
+}
+
+async function compileLess() {
+	try {
+		const installSrc = path.join(__dirname, '../public/less/install.less');
+		const style = await fs.promises.readFile(installSrc);
+		const css = await less.render(String(style), { filename: path.resolve(installSrc) });
+		await fs.promises.writeFile(path.join(__dirname, '../public/installer.css'), css.css);
+	} catch (err) {
+		winston.error(`Unable to compile LESS: \n${err.stack}`);
+		throw err;
+	}
+}
+
+async function compileJS() {
+	let code = '';
+
+	for (const srcPath of scripts) {
+		// eslint-disable-next-line no-await-in-loop
+		const buffer = await fs.promises.readFile(path.join(__dirname, '..', srcPath));
+		code += buffer.toString();
+	}
+	const minified = uglify.minify(code, {
+		compress: false,
+	});
+	if (!minified.code) {
+		throw new Error('[[error:failed-to-minify]]');
+	}
+	await fs.promises.writeFile(path.join(__dirname, '../public/installer.min.js'), minified.code);
+}
+
+async function copyCSS() {
+	const src = await fs.promises.readFile(
+		path.join(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.min.css'), 'utf8'
+	);
+	await fs.promises.writeFile(path.join(__dirname, '../public/bootstrap.min.css'), src);
+}
+
+async function loadDefaults() {
+	const setupDefaultsPath = path.join(__dirname, '../setup.json');
+	try {
+		await fs.promises.access(setupDefaultsPath, fs.constants.F_OK + fs.constants.R_OK);
+	} catch (err) {
+		// setup.json not found or inaccessible, proceed with no defaults
+		if (err.code !== 'ENOENT') {
+			throw err;
+		}
+	}
+	winston.info('[installer] Found setup.json, populating default values');
+	nconf.file({
+		file: setupDefaultsPath,
 	});
 }

loader.js

@@ -1,82 +1,78 @@
 'use strict';
 
-var	nconf = require('nconf');
-var fs = require('fs');
-var url = require('url');
-var path = require('path');
-var fork = require('child_process').fork;
-var async = require('async');
-var logrotate = require('logrotate-stream');
-var mkdirp = require('mkdirp');
+const nconf = require('nconf');
+const fs = require('fs');
+const url = require('url');
+const path = require('path');
+const { fork } = require('child_process');
+const logrotate = require('logrotate-stream');
+const mkdirp = require('mkdirp');
 
-var file = require('./src/file');
-var pkg = require('./package.json');
+const file = require('./src/file');
+const pkg = require('./package.json');
 
-var pathToConfig = path.resolve(__dirname, process.env.CONFIG || 'config.json');
+const pathToConfig = path.resolve(__dirname, process.env.CONFIG || 'config.json');
 
 nconf.argv().env().file({
 	file: pathToConfig,
 });
 
-var	pidFilePath = path.join(__dirname, 'pidfile');
+const pidFilePath = path.join(__dirname, 'pidfile');
 
-var outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');
+const outputLogFilePath = path.join(__dirname, nconf.get('logFile') || 'logs/output.log');
 
-var logDir = path.dirname(outputLogFilePath);
+const logDir = path.dirname(outputLogFilePath);
 if (!fs.existsSync(logDir)) {
 	mkdirp.sync(path.dirname(outputLogFilePath));
 }
 
-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 = {
+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 = {
 	timesStarted: 0,
 };
-var appPath = path.join(__dirname, 'app.js');
+const appPath = path.join(__dirname, 'app.js');
 
-Loader.init = function (callback) {
+Loader.init = function () {
 	if (silent) {
-		console.log = function () {
-			var args = Array.prototype.slice.call(arguments);
-			output.write(args.join(' ') + '\n');
+		console.log = (...args) => {
+			output.write(`${args.join(' ')}\n`);
 		};
 	}
 
 	process.on('SIGHUP', Loader.restart);
 	process.on('SIGTERM', Loader.stop);
-	callback();
 };
 
-Loader.displayStartupMessages = function (callback) {
+Loader.displayStartupMessages = function () {
 	console.log('');
-	console.log('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 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', function (code, signal) {
+	worker.on('exit', (code, signal) => {
 		if (code !== 0) {
 			if (Loader.timesStarted < numProcs * 3) {
 				Loader.timesStarted += 1;
 				if (Loader.crashTimer) {
 					clearTimeout(Loader.crashTimer);
 				}
-				Loader.crashTimer = setTimeout(function () {
+				Loader.crashTimer = setTimeout(() => {
 					Loader.timesStarted = 0;
 				}, 10000);
 			} else {
-				console.log((numProcs * 3) + ' restarts in 10 seconds, most likely an error on startup. Halting.');
+				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 + ')');
+		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...');
 
@@ -84,7 +80,7 @@ Loader.addWorkerEvents = function (worker) {
 		}
 	});
 
-	worker.on('message', function (message) {
+	worker.on('message', (message) => {
 		if (message && typeof message === 'object' && message.action) {
 			switch (message.action) {
 				case 'restart':
@@ -92,12 +88,12 @@ Loader.addWorkerEvents = function (worker) {
 					Loader.restart();
 					break;
 				case 'pubsub':
-					workers.forEach(function (w) {
+					workers.forEach((w) => {
 						w.send(message);
 					});
 					break;
 				case 'socket.io':
-					workers.forEach(function (w) {
+					workers.forEach((w) => {
 						if (w !== worker) {
 							w.send(message);
 						}
@@ -108,32 +104,28 @@ Loader.addWorkerEvents = function (worker) {
 	});
 };
 
-Loader.start = function (callback) {
+Loader.start = function () {
 	numProcs = getPorts().length;
-	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');
+	console.log(`Clustering enabled: Spinning up ${numProcs} process(es).\n`);
 
-	for (var x = 0; x < numProcs; x += 1) {
+	for (let x = 0; x < numProcs; x += 1) {
 		forkWorker(x, x === 0);
 	}
-
-	if (callback) {
-		callback();
-	}
 };
 
 function forkWorker(index, isPrimary) {
-	var ports = getPorts();
-	var args = [];
+	const ports = getPorts();
+	const 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];
 
-	var worker = fork(appPath, args, {
+	const worker = fork(appPath, args, {
 		silent: silent,
 		env: process.env,
 	});
@@ -146,20 +138,20 @@ function forkWorker(index, isPrimary) {
 	Loader.addWorkerEvents(worker);
 
 	if (silent) {
-		var output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
+		const output = logrotate({ file: outputLogFilePath, size: '1m', keep: 3, compress: true });
 		worker.stdout.pipe(output);
 		worker.stderr.pipe(output);
 	}
 }
 
 function getPorts() {
-	var _url = nconf.get('url');
+	const _url = nconf.get('url');
 	if (!_url) {
 		console.log('[cluster] url is undefined, please check your config.json');
 		process.exit();
 	}
-	var urlObject = url.parse(_url);
-	var port = nconf.get('PORT') || nconf.get('port') || urlObject.port || 4567;
+	const urlObject = url.parse(_url);
+	let port = nconf.get('PORT') || nconf.get('port') || urlObject.port || 4567;
 	if (!Array.isArray(port)) {
 		port = [port];
 	}
@@ -172,13 +164,13 @@ Loader.restart = function () {
 	nconf.remove('file');
 	nconf.use('file', { file: pathToConfig });
 
-	fs.readFile(pathToConfig, { encoding: 'utf-8' }, function (err, configFile) {
+	fs.readFile(pathToConfig, { encoding: 'utf-8' }, (err, configFile) => {
 		if (err) {
 			console.error('Error reading config');
 			throw err;
 		}
 
-		var conf = JSON.parse(configFile);
+		const conf = JSON.parse(configFile);
 
 		nconf.stores.env.readOnly = false;
 		nconf.set('url', conf.url);
@@ -201,13 +193,13 @@ Loader.stop = function () {
 };
 
 function killWorkers() {
-	workers.forEach(function (worker) {
+	workers.forEach((worker) => {
 		worker.suicide = true;
 		worker.kill();
 	});
 }
 
-fs.open(pathToConfig, 'r', function (err) {
+fs.open(pathToConfig, 'r', (err) => {
 	if (err) {
 		// No config detected, kickstart web installer
 		fork('app');
@@ -217,7 +209,7 @@ fs.open(pathToConfig, 'r', function (err) {
 	if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
 		if (file.existsSync(pidFilePath)) {
 			try {
-				var	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+				const	pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
 				process.kill(pid, 0);
 				process.exit();
 			} catch (e) {
@@ -233,15 +225,12 @@ fs.open(pathToConfig, 'r', function (err) {
 
 		fs.writeFileSync(pidFilePath, String(process.pid));
 	}
-
-	async.series([
-		Loader.init,
-		Loader.displayStartupMessages,
-		Loader.start,
-	], function (err) {
-		if (err) {
-			console.error('[loader] Error during startup');
-			throw err;
-		}
-	});
+	try {
+		Loader.init();
+		Loader.displayStartupMessages();
+		Loader.start();
+	} catch (err) {
+		console.error('[loader] Error during startup');
+		throw err;
+	}
 });

public/.eslintrc

@@ -1,54 +1,3 @@
 {
-	"globals": {
-		"app": true,
-		"io": true,
-		"socket": true,
-		"ajaxify": true,
-		"config": true,
-		"utils": true,
-		"overrides": true,
-		"componentHandler": true,
-		"bootbox": true,
-		"Visibility": true,
-		"Tinycon": true,
-		"Promise": true
-	},
-	"env": {
-		"jquery": true,
-		"amd": true,
-		"browser": true,
-		"es6": true
-	},
-	"rules": {
-		"block-scoped-var": "off",
-		"no-dupe-class-members": "off",
-		"no-var": "off",
-		"object-shorthand": "off",
-		"prefer-arrow-callback": "off",
-		"prefer-spread": "off",
-		"prefer-object-spread": "off",
-		"prefer-reflect": "off",
-		"prefer-template": "off"
-	},
-	"parserOptions": {
-		"ecmaVersion": 6,
-		"ecmaFeatures": {
-			"classes": false,
-			"defaultParams": 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,
-			"superInFunctions": false
-		}
-	}
+	"extends": "nodebb/public"
 }

public/.jshintrc

@@ -1,6 +1,8 @@
 {
     "maxerr" : 50, // {int} Maximum error before stopping
 
+    "esversion": 9,
+
     // Enforcing
     "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
     "camelcase" : false, // true: Identifiers must be in camelCase
@@ -42,7 +44,7 @@
     "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')
+    "globalstrict" : true, // 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
@@ -66,7 +68,6 @@
 		"utils": true,
 		"overrides": true,
 		"componentHandler": true,
-		"bootbox": true,
 		"templates": true,
 		"Visibility": true,
 		"Tinycon": true,

public/images/logo.svg

@@ -0,0 +1,16 @@
+<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/language/ar/admin/advanced/cache.json

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

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

@@ -2,11 +2,12 @@
 	"events": "أحداث",
 	"no-events": "لا توجد أحداث",
 	"control-panel": "لوحة تحكم الأحداث",
-	"delete-events": "Delete Events",
-	"filters": "Filters",
-	"filters-apply": "Apply Filters",
-	"filter-type": "Event Type",
-	"filter-start": "Start Date",
-	"filter-end": "End Date",
-	"filter-perPage": "Per Page"
+	"delete-events": "حذف الاحداث",
+	"confirm-delete-all-events": "Are you sure you want to delete all logged events?",
+	"filters": "تصفية",
+	"filters-apply": "تطبيق التصفية",
+	"filter-type": "نوع الحدث",
+	"filter-start": "تاريخ البدء",
+	"filter-end": "تاريخ الانتهاء",
+	"filter-perPage": "لكل صفحة"
 }

public/language/ar/admin/dashboard.json

@@ -2,6 +2,7 @@
 	"forum-traffic": "Forum Traffic",
 	"page-views": "مشاهدات الصفحات",
 	"unique-visitors": "زائرين فريدين",
+	"logins": "Logins",
 	"new-users": "New Users",
 	"posts": "مشاركات",
 	"topics": "مواضيع",
@@ -29,6 +30,7 @@
 	"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>",
+	"fallback-emailer-not-found": "Fallback emailer not found!",
 	"running-in-development": "المنتدى قيد التشغيل في وضع \"المطورين\". وقد تكون هناك ثغرات أمنية مفتوحة؛ من فضلك تواصل مع مسؤول نظامك.",
 	"latest-lookup-failed": "<p>Failed to look up latest available version of NodeBB</p>",
 
@@ -54,8 +56,8 @@
 	"active-users.total": "المجموع",
 	"active-users.connections": "Connections",
 
-	"anonymous-registered-users": "المجهولين مقابل المستخدمين المسجلين",
-	"anonymous": "مجهول",
+	"guest-registered-users": "Guest vs Registered Users",
+	"guest": "Guest",
 	"registered": "مسجل",
 
 	"user-presence": "تواجد المستخدمين",
@@ -66,6 +68,7 @@
 	"unread": "غير مقروء",
 
 	"high-presence-topics": "مواضيع ذات حضور قوي",
+	"popular-searches": "Popular Searches",
 
 	"graphs.page-views": "مشاهدات الصفحة",
 	"graphs.page-views-registered": "Page Views Registered",
@@ -73,7 +76,15 @@
 	"graphs.page-views-bot": "Page Views Bot",
 	"graphs.unique-visitors": "زوار فريدين",
 	"graphs.registered-users": "مستخدمين مسجلين",
-	"graphs.anonymous-users": "مستخدمين مجهولين",
+	"graphs.guest-users": "Guest Users",
 	"last-restarted-by": "Last restarted by",
-	"no-users-browsing": "No users browsing"
+	"no-users-browsing": "No users browsing",
+
+	"back-to-dashboard": "Back to Dashboard",
+	"details.no-users": "No users have joined within the selected timeframe",
+	"details.no-topics": "No topics have been posted within the selected timeframe",
+	"details.no-searches": "No searches have been made yet",
+	"details.no-logins": "No logins have been recorded within the selected timeframe",
+	"details.logins-static": "NodeBB only saves session data for %1 days, and so this table below will only show the most recently active sessions",
+	"details.logins-login-time": "Login Time"
 }

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

@@ -8,7 +8,11 @@
 	"nodejs": "nodejs",
 	"online": "online",
 	"git": "git",
-	"memory": "memory",
+	"process-memory": "process memory",
+	"system-memory": "system memory",
+	"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",

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

@@ -39,7 +39,7 @@
 	"alert.upgraded": "الإضافة مرقاة",
 	"alert.installed": "الإضافة منصبة",
 	"alert.uninstalled": "تم إلغاء تنصيب الإضافة",
-	"alert.activate-success": "يرجى إعادة تشغيل NodeBB لتنشيط الإضافة بشكل بالكامل",
+	"alert.activate-success": "Please rebuild and restart your NodeBB to fully activate this plugin",
 	"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

@@ -8,8 +8,6 @@
 	"delete": "Delete",
 	"enable": "Enable",
 	"disable": "Disable",
-	"control-panel": "Rewards Control",
-	"new-reward": "New Reward",
 
 	"alert.delete-success": "Successfully deleted reward",
 	"alert.no-inputs-found": "Illegal reward - no inputs found!",

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

@@ -1,79 +0,0 @@
-{
-	"forum-traffic": "Forum Traffic",
-	"page-views": "مشاهدات الصفحات",
-	"unique-visitors": "زائرين فريدين",
-	"new-users": "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": "Yesterday",
-	"stats.today": "Today",
-	"stats.last-week": "Last Week",
-	"stats.this-week": "This Week",
-	"stats.last-month": "Last Month",
-	"stats.this-month": "This 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.page-views-registered": "Page Views Registered",
-	"graphs.page-views-guest": "Page Views Guest",
-	"graphs.page-views-bot": "Page Views Bot",
-	"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/homepage.json

@@ -1,8 +0,0 @@
-{
-	"home-page": "Home Page",
-	"description": "Choose what page is shown when users navigate to the root URL of your forum.",
-	"home-page-route": "Home Page Route",
-	"custom-route": "Custom Route",
-	"allow-user-home-pages": "Allow User Home Pages",
-	"home-page-title": "Title of the home page (default \"Home\")"
-}

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

@@ -1,6 +0,0 @@
-{
-	"language-settings": "اعدادات اللغة",
-	"description": "تُحدد اللغة الافتراضية إعدادات اللغة لجميع المستخدمين الذين يزورون المنتدى. <br />يمكن للأعضاء تجاوز اللغة الافتراضية من خلال صفحة إعدادات الحساب الخاصة بهم.",
-	"default-language": "اللغة الافتراضية",
-	"auto-detect": "الكشف عن إعدادات اللغة للزوار بشكل آلي"
-}

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

@@ -1,23 +0,0 @@
-{
-	"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:",
-	"open-new-window": "Open in a new window",
-
-	"btn.delete": "Delete",
-	"btn.disable": "Disable",
-	"btn.enable": "Enable",
-
-	"available-menu-items": "Available Menu Items",
-	"custom-route": "Custom Route",
-	"core": "core",
-	"plugin": "plugin"
-}

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

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

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

@@ -1,9 +0,0 @@
-{
-	"notifications": "التنبيهات",
-	"chat-messages": "Chat Messages",
-	"play-sound": "Play",
-	"incoming-message": "Incoming Message",
-	"outgoing-message": "Outgoing Message",
-	"upload-new-sound": "Upload New Sound",
-	"saved": "Settings Saved"
-}

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

@@ -10,13 +10,16 @@
 	"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",
 	"delete-image": "Remove",
 	"category-image": "Category Image",
 	"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",
@@ -29,6 +32,8 @@
 	"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",
@@ -45,6 +50,8 @@
 	"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",

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

@@ -13,6 +13,7 @@
 	"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:",

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

@@ -4,11 +4,13 @@
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
 	"edit-privileges": "Edit Privileges",
+  	"select-clear-all": "Select/Clear All",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",
+	"invite": "Invite",
 	"search-content": "Search Content",
 	"search-users": "Search Users",
 	"search-tags": "Search Tags",
@@ -23,6 +25,7 @@
 	"access-topics": "Access Topics",
 	"create-topics": "Create Topics",
 	"reply-to-topics": "Reply to Topics",
+	"schedule-topics": "Schedule Topics",
 	"tag-topics": "Tag Topics",
 	"edit-posts": "Edit Posts",
 	"view-edit-history": "View Edit History",
@@ -37,16 +40,24 @@
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",
 	"admin-users": "Users",
+	"admin-admins-mods": "Admins & Mods",
+	"admin-groups": "Groups",
+	"admin-tags": "Tags",
 	"admin-settings": "Settings",
 
 	"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-admins-mods": "<strong>Are you sure you wish to grant the &quot;Admins &amp; Mods&quot; privilege to this user/group?</strong> Users with this privilege are able to promote and demote other users into privileged positions, <em>including super administrator</em>",
 	"alert.confirm-save": "Please confirm your intention to save these privileges",
 	"alert.saved": "Privilege changes saved and applied",
 	"alert.confirm-discard": "Are you sure you wish to discard your privilege changes?",
 	"alert.discarded": "Privilege changes discarded",
-	"alert.confirm-copyToAll": "Are you sure you wish to apply this privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's privilege set to <strong>all categories</strong>?",
-	"alert.confirm-copyToChildren": "Are you sure you wish to apply this privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's privilege set to <strong>all descendant (child) categories</strong>?",
-	"alert.no-undo": "<em>This action cannot be undone.</em>"
+	"alert.confirm-copyToAll": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToAllGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all categories</strong>?",
+	"alert.confirm-copyToChildren": "Are you sure you wish to apply this set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.confirm-copyToChildrenGroup": "Are you sure you wish to apply this group's set of <strong>%1</strong> to <strong>all descendant (child) categories</strong>?",
+	"alert.no-undo": "<em>This action cannot be undone.</em>",
+	"alert.admin-warning": "Administrators implicitly get all privileges",
+  	"alert.copyPrivilegesFrom-title": "Select a category to copy from",
+  	"alert.copyPrivilegesFrom-warning": "This will copy <strong>%1</strong> from the selected category.",
+  	"alert.copyPrivilegesFromGroup-warning": "This will copy this group's set of <strong>%1</strong> from the selected category."
 }

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

@@ -2,7 +2,6 @@
 	"none": "Your forum does not have any topics with tags yet.",
 	"bg-color": "Background Colour",
 	"text-color": "Text Colour",
-	"create-modify": "Create & Modify Tags",
 	"description": "Select tags by clicking or dragging, use <code>CTRL</code> to select multiple tags.",
 	"create": "Create Tag",
 	"modify": "Modify Tags",
@@ -14,5 +13,6 @@
 
 	"alerts.editing": "Editing tag(s)",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
-	"alerts.update-success": "Tag Updated!"
+	"alerts.update-success": "Tag Updated!",
+	"reset-colors": "Reset colors"
 }

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

@@ -5,5 +5,7 @@
     "orphaned": "Orphaned",
     "size/filecount": "Size / Filecount",
     "confirm-delete": "Do you really want to delete this file?",
-    "filecount": "%1 files"
+    "filecount": "%1 files",
+    "new-folder": "New Folder",
+    "name-new-folder": "Enter a name for new the folder"
 }

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

@@ -1,6 +1,6 @@
 {
 	"users": "المستخدمين",
-	"edit": "تحرير",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -20,16 +20,10 @@
 	"add-group": "Add Group",
 	"invite": "Invite",
 	"new": "New User",
-
-	"pills.latest": "Latest Users",
+	"filter-by": "Filter by",
 	"pills.unvalidated": "Not Validated",
-	"pills.no-posts": "No Posts",
-	"pills.top-posters": "Top Posters",
-	"pills.top-rep": "Most Reputation",
-	"pills.inactive": "Inactive",
-	"pills.flagged": "Most Flagged",
+	"pills.validated": "Validated",
 	"pills.banned": "Banned",
-	"pills.search": "User Search",
 
 	"50-per-page": "50 per page",
 	"100-per-page": "100 per page",
@@ -53,6 +47,8 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.no-email": "(no email)",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",
@@ -108,5 +104,7 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)",
+	"export-users-started": "Exporting users as csv, this might take a while. You will receive a notification when it is complete.",
+	"export-users-completed": "Users exported as csv, click here to download."
 }

public/language/ar/admin/menu.json

@@ -1,5 +1,10 @@
 {
-	"dashboard": "Dashboard",
+	"section-dashboard": "Dashboards",
+	"dashboard/overview": "Overview",
+	"dashboard/logins": "Logins",
+	"dashboard/users": "Users",
+	"dashboard/topics": "Topics",
+	"dashboard/searches": "Searches",
 	"section-general": "عام",
 
 	"section-manage": "إدارة",
@@ -31,6 +36,7 @@
 	"settings/pagination": "ترقيم الصفحات",
 	"settings/tags": "الكلمات المفتاحية",
 	"settings/notifications": "التنبيهات",
+	"settings/api": "API Access",
 	"settings/sounds": "Sounds",
 	"settings/social": "Social",
 	"settings/cookies": "Cookies",

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

@@ -36,5 +36,8 @@
 
 	"analytics.settings": "Analytics Settings",
 	"analytics.max-cache": "Analytics Cache Max Value",
-	"analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)"
+	"analytics.max-cache-help": "On high-traffic installs, the cache could be exhausted continuously if there are more concurrent active users than the Max Cache value. (Restart required)",
+	"compression.settings": "Compression Settings",
+	"compression.enable": "Enable Compression",
+	"compression.help": "This setting enables gzip compression. For a high-traffic website in production, the best way to put compression in place is to implement it at a reverse proxy level. You can enable it here for testing purposes."
 }

public/language/ar/admin/settings/api.json

@@ -0,0 +1,16 @@
+{
+	"tokens": "Tokens",
+	"settings": "Settings",
+	"lead-text": "From this page you can configure access to the Write API in NodeBB.",
+	"intro": "By default, the Write API authenticates users based on their session cookie, but NodeBB also supports Bearer authentication via tokens generated via this page.",
+	"docs": "Click here to access the full API specification",
+
+	"require-https": "Require API usage via HTTPS only",
+	"require-https-caveat": "<strong>Note</strong>: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.",
+
+	"uid": "User ID",
+	"uid-help-text": "Specify a User ID to associate with this token. If the user ID is <code>0</code>, it will be considered a <em>master</em> token, which can assume the identity of other users based on the <code>_uid</code> parameter",
+	"description": "Description",
+	"no-description": "No description specified.",
+	"token-on-save": "Token will be generated once form is saved"
+}

public/language/ar/admin/settings/cookies.json

@@ -8,5 +8,6 @@
 	"consent.blank-localised-default": "Leave blank to use NodeBB localised defaults",
 	"settings": "Settings",
 	"cookie-domain": "Session cookie domain",
+	"max-user-sessions": "Max active sessions per user",
 	"blank-default": "Leave blank for default"
 }

public/language/ar/admin/settings/email.json

@@ -4,9 +4,9 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	
+
 	"smtp-transport": "SMTP Transport",
-	"smtp-transport.enabled": "Use an external email server to send emails",
+	"smtp-transport.enabled": "Enable SMTP Transport",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
 	"smtp-transport.service": "Select a service",
 	"smtp-transport.service-custom": "Custom Service",
@@ -35,5 +35,12 @@
 	"subscriptions": "Email Digests",
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
-	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
-}
+	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
+	"notifications.remove-images": "Remove images from email notifications",
+	"require-email-address": "Require new users to specify an email address",
+	"require-email-address-warning": "By default, users can opt-out of entering an email address. Enabling this option means they have to enter an email address in order to proceed with registration. <strong>It does not ensure user will enter a real email address, nor even an address they own.</strong>",
+	"include-unverified-emails": "Send emails to recipients who have not explicitly confirmed their emails",
+	"include-unverified-warning": "By default, users with emails associated with their account have already been verified, but there are situations where this is not the case (e.g. SSO logins, grandfathered users, etc). <strong>Enable this setting at your own risk</strong> &ndash; sending emails to unverified addresses may be a violation of regional anti-spam laws.",
+	"prompt": "Prompt users to enter or confirm their emails",
+	"prompt-help": "If a user does not have an email set, or their email is not confirmed, a warning will be shown on screen."
+}

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

@@ -3,9 +3,9 @@
 	"title": "عنوان الموقع",
 	"title.short": "عنوان قصير",
 	"title.short-placeholder": "ان لم تقم بكتابة عنوان مختصر, سيتم استخدام عنوان الموقع الكلي",
-	"title.url": "الرابط",
+	"title.url": "Title Link URL",
 	"title.url-placeholder": "The URL of the site title",
-	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
+	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index. <br> Note: This is not the external URL used in emails, etc. That is set by the <code>url</code> property in config.json",
 	"title.name": "اسم المنتدي",
 	"title.show-in-header": "Show Site Title in Header",
 	"browser-title": "عنوان المتصفح",
@@ -20,9 +20,9 @@
 	"logo.image": "صورة",
 	"logo.image-placeholder": "Path to a logo to display on forum header",
 	"logo.upload": "رفع",
-	"logo.url": "الرابط",
+	"logo.url": "Logo Link URL",
 	"logo.url-placeholder": "The URL of the site logo",
-	"logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.",
+	"logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index. <br> Note: This is not the external URL used in emails, etc. That is set by the <code>url</code> property in config.json",
 	"logo.alt-text": "نص بديل",
 	"log.alt-text-placeholder": "Alternative text for accessibility",
 	"favicon": "صورة المفضله",
@@ -35,10 +35,16 @@
 	"maskable-icon.help": "Recommended size and format: 512x512, PNG format only. If no maskable icon is specified, NodeBB will fall back to the Touch Icon.",
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
-	"search-default-sort-by": "الترتيب الافتراضي للبحث",
+	"search": "Search",
+	"search-default-in": "Search In",
+	"search-default-in-quick": "Quick Search In",
+	"search-default-sort-by": "Sort by",
 	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
 	"site-colors": "Site Color Metadata",
 	"theme-color": "لون الثيم",
 	"background-color": "لون الخلفية",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
-}
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
+}

public/language/ar/admin/settings/guest.json

@@ -1,5 +1,7 @@
 {
-	"handles": "Guest Handles",
+	"settings": "Settings",
 	"handles.enabled": "Allow guest handles",
-	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\""
+	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
+	"topic-views.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

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

@@ -11,6 +11,8 @@
 	"properties": "Properties:",
 	"groups": "Groups:",
 	"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 href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
 
 	"btn.delete": "Delete",
 	"btn.disable": "Disable",
@@ -20,4 +22,4 @@
 	"custom-route": "Custom Route",
 	"core": "core",
 	"plugin": "plugin"
-}
+}

public/language/ar/admin/settings/notifications.json

@@ -2,5 +2,6 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)"
+	"welcome-notification-uid": "Welcome Notification User (UID)",
+	"post-queue-notification-uid": "Post Queue User (UID)"
 }

public/language/ar/admin/settings/pagination.json

@@ -1,10 +1,12 @@
 {
 	"pagination": "Pagination Settings",
 	"enable": "Paginate topics and posts instead of using infinite scroll.",
+	"posts": "Post Pagination",
 	"topics": "Topic Pagination",
 	"posts-per-page": "Posts per Page",
 	"max-posts-per-page": "Maximum posts per page",
 	"categories": "Category Pagination",
 	"topics-per-page": "Topics per Page",
-	"max-topics-per-page": "Maximum topics per page"
+	"max-topics-per-page": "Maximum topics per page",
+	"categories-per-page": "Categories per page"
 }

public/language/ar/admin/settings/post.json

@@ -34,10 +34,13 @@
 	"timestamp.cut-off-help": "Dates &amp; times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
 	"timestamp.necro-threshold": "Necro Threshold (in days)",
 	"timestamp.necro-threshold-help": "A message will be shown between posts if the time between them is longer than the necro threshold. (Default: <code>7</code>, or one week). Set to 0 to disable.</em>",
+	"timestamp.topic-views-interval": "Increment topic views interval (in minutes)",
+	"timestamp.topic-views-interval-help": "Topic views will only increment once every X minutes as defined by this setting.",
 	"teaser": "Teaser Post",
 	"teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies",
 	"teaser.last-reply": "Last &ndash; Show the latest reply, or a \"No replies\" placeholder if no replies",
 	"teaser.first": "First",
+	"showPostPreviewsOnHover": "Show a preview of posts when mouse overed",
 	"unread": "Unread Settings",
 	"unread.cutoff": "Unread cutoff days",
 	"unread.min-track-last": "Minimum posts in topic before tracking last read",
@@ -54,6 +57,9 @@
 	"composer.show-help": "Show \"Help\" tab",
 	"composer.enable-plugin-help": "Allow plugins to add content to the help tab",
 	"composer.custom-help": "Custom Help Text",
+	"backlinks": "Backlinks",
+	"backlinks.enabled": "Enable topic backlinks",
+	"backlinks.help": "If a post references another topic, a link back to the post will be inserted into the referenced topic at that point in time.",
 	"ip-tracking": "IP Tracking",
 	"ip-tracking.each-post": "Track IP Address for each post",
 	"enable-post-history": "Enable Post History"

public/language/ar/admin/settings/reputation.json

@@ -16,5 +16,7 @@
 
 	"flags": "Flag Settings",
 	"flags.limit-per-target": "Maximum number of times something can be flagged",
-	"flags.limit-per-target-placeholder": "Default: 0"
+	"flags.limit-per-target-placeholder": "Default: 0",
+	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
+	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
 }

public/language/ar/admin/settings/tags.json

@@ -1,6 +1,8 @@
 {
     "tag": "Tag Settings",
     "link-to-manage": "Manage Tags",
+    "system-tags": "System Tags",
+    "system-tags-help": "Only privileged users will be able to use these tags.",
     "min-per-topic": "Minimum Tags per Topic",
     "max-per-topic": "Maximum Tags per Topic",
     "min-length": "Minimum Tag Length",

public/language/ar/admin/settings/uploads.json

@@ -21,6 +21,9 @@
 	"topic-thumb-size": "حجم الصورة المصغرة للموضوع",
 	"allowed-file-extensions": "إمتدادات الملفات المسموح بها",
 	"allowed-file-extensions-help": "أدخل قائمة بامتدادات الملفات مفصولة بفواصل (مثال: <code>pdf,xls,doc</code>). القائمة الفارغة تعني أن كل الامتدادات مسموح بها.",
+	"upload-limit-threshold": "Rate limit user uploads to:",
+	"upload-limit-threshold-per-minute": "Per %1 Minute",
+	"upload-limit-threshold-per-minutes": "Per %1 Minutes",
 	"profile-avatars": "الصورة الرمزية للملف الشخصي",
 	"allow-profile-image-uploads": "السماح للأعضاء برفع الصور الرمزية",
 	"convert-profile-image-png": "تحويل إمتداد الصور الرمزية المرفوعه الى PNG",

public/language/ar/admin/settings/user.json

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "السماح بحذف الحساب",
 	"hide-fullname": "إخفاء الإسم الكامل عن المستخدمين",
 	"hide-email": "إخفاء البريد الإلكتروني عن المستخدمين",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "القوالب",
 	"disable-user-skins": "منع المستخدمين من اختيار سمة مخصص",
 	"account-protection": "حماية الحساب",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "لا يوجد تسجيل",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
 	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites-help": "0  لعدم تحديد قيود، الإدارة تحصل على دعوات لامحدودة <br> هذا الخيار يعمل فقط عند تحديد خيار \"بالدعوات فقط\"",
@@ -62,10 +66,12 @@
 	"restrict-chat": "السماح فقط برسائل الدردشة من المستخدمين الذين أتبعهم",
 	"outgoing-new-tab": "Open outgoing links in new tab",
 	"topic-search": "Enable In-Topic Searching",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Subscribe to Digest",
 	"digest-freq.off": "Off",
 	"digest-freq.daily": "Daily",
 	"digest-freq.weekly": "Weekly",
+	"digest-freq.biweekly": "Bi-Weekly",
 	"digest-freq.monthly": "Monthly",
 	"email-chat-notifs": "Send an email if a new chat message arrives and I am not online",
 	"email-post-notif": "Send an email when replies are made to topics I am subscribed to",

public/language/ar/category.json

@@ -18,5 +18,6 @@
     "watching.message": "You are now watching updates from this category and all subcategories",
     "notwatching.message": "You are not watching updates from this category and all subcategories",
     "ignoring.message": "You are now ignoring updates from this category and all subcategories",
-    "watched-categories": "الأقسام المُتابعة"
+    "watched-categories": "الأقسام المُتابعة",
+    "x-more-categories": "%1 more categories"
 }

public/language/ar/email.json

@@ -6,7 +6,9 @@
     "greeting_no_name": "مرحبًا",
     "greeting_with_name": "مرحبًا بك يا %1",
     "email.verify-your-email.subject": "Please verify your email",
-    "email.verify.text1": "Your email address has changed!",
+    "email.verify.text1": "You've requested that we change or confirm your email address",
+    "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. <strong>If you did not request this, no action is required on your part.</strong>",
+    "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).",
     "welcome.text1": "شكرًا على تسجيلك في %1!",
     "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي سجلت به.",
     "welcome.text3": "تم قبول نتسجيلك ، يمكنك الدخول باتسخدام اسم المستخدم و كلمة المرور.",

public/language/ar/error.json

@@ -9,6 +9,7 @@
     "invalid-tid": "موضوع غير متواجد",
     "invalid-pid": "رد غير موجود",
     "invalid-uid": "مستخدم غير موجود",
+    "invalid-date": "A valid date must be provided",
     "invalid-username": "اسم المستخدم غير مقبول",
     "invalid-email": "البريد الاكتروني غير مقبول",
     "invalid-fullname": "Invalid Fullname",
@@ -21,16 +22,21 @@
     "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
     "invalid-search-term": "كلمة البحث غير صحيحة",
     "invalid-url": "Invalid URL",
+    "invalid-event": "Invalid event: %1",
     "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "لم تتمكن من تسجيل الدخول. هنالك أحتمال ان جلستك انتهت. رجاءًا حاول مرة اخرى.",
+    "invalid-path": "Invalid path",
+    "folder-exists": "Folder exists",
     "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
+    "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
-    "email-not-confirmed": "You are unable to post until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
     "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.",
-    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
-    "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You may not be able to post in some categories or chat until your email is confirmed.",
+    "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery, and may be necessary for chatting and posting in some categories. Please click here to enter an email.",
+    "user-doesnt-have-email": "User \"%1\" does not have an email set.",
     "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
     "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",
     "sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
@@ -39,6 +45,7 @@
     "username-too-long": "اسم المستخدم طويل",
     "password-too-long": "كلمة السر طويلة ",
     "reset-rate-limited": "Too many password reset requests (rate limited)",
+    "reset-same-password": "Please use a password that is different from your current one",
     "user-banned": "المستخدم محظور",
     "user-banned-reason": "Sorry, this account has been banned (Reason: %1)",
     "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)",
@@ -81,15 +88,27 @@
     "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
+    "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "الرجاء الانتظار حتى يكتمل الرفع.",
     "file-too-big": "الحد الأقصى لرفع الملفات %1 كيلو بت. رجاءًا ارفع ملف أصغر",
     "guest-upload-disabled": "خاصية رفع الملفات غير مفعلة للزوار.",
     "cors-error": "Unable to upload image due to misconfigured CORS",
+    "upload-ratelimit-reached": "You have uploaded too many files at one time. Please try again later.",
+    "scheduling-to-past": "Please select a date in the future.",
+    "invalid-schedule-date": "Please enter a valid date and time.",
+    "cant-pin-scheduled": "Scheduled topics cannot be (un)pinned.",
+    "cant-merge-scheduled": "Scheduled topics cannot be merged.",
+    "cant-move-posts-to-scheduled": "Can't move posts to a scheduled topic.",
+    "cant-move-from-scheduled-to-existing": "Can't move posts from a scheduled topic to an existing topic.",
     "already-bookmarked": "You have already bookmarked this post",
     "already-unbookmarked": "You have already unbookmarked this post",
     "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.",
+    "cant-make-banned-users-admin": "You can't make banned users admin.",
     "cant-remove-last-admin": "رجاءًا ، أضف مدير أخر قبل حذف صلاحيات الإدارة من حسابك.",
+    "account-deletion-disabled": "Account deletion is disabled",
     "cant-delete-admin": "رجاءًا أزل صلاحيات الإدارة قبل حذف الحساب. ",
+    "already-deleting": "Already deleting",
     "invalid-image": "Invalid image",
     "invalid-image-type": "نوع الصورة غير مدعوم. الأنواع المدعومة هي :  %1",
     "invalid-image-extension": "امتداد الصورة غير مدعوم.",
@@ -129,6 +148,7 @@
     "chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting",
     "chat-deleted-already": "This chat message has already been deleted.",
     "chat-restored-already": "This chat message has already been restored.",
+    "chat-room-does-not-exist": "Chat room does not exist.",
     "already-voting-for-this-post": "لقد شاركت بالتصويت ، ألا تذكر؟",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
@@ -143,6 +163,7 @@
     "user-already-flagged": "You have already flagged this user",
     "post-flagged-too-many-times": "This post has been flagged by others already",
     "user-flagged-too-many-times": "This user has been flagged by others already",
+    "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)",
     "self-vote": "You cannot vote on your own post",
     "too-many-downvotes-today": "You can only downvote %1 times a day",
     "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
@@ -159,8 +180,10 @@
     "cant-kick-self": "لا يمكنك طرد نفسك من المجموعة.",
     "no-users-selected": "لا يوجد مستخدم محدد.",
     "invalid-home-page-route": "Invalid home page route",
-    "invalid-session": "Session Mismatch",
-    "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
+    "invalid-session": "Invalid Session",
+    "invalid-session-text": "It looks like your login session is no longer active. Please refresh this page.",
+    "session-mismatch": "Session Mismatch",
+    "session-mismatch-text": "It looks like your login session no longer matches with the server. Please refresh this page.",
     "no-topics-selected": "No topics selected!",
     "cant-move-to-same-topic": "Can't move post to same topic!",
     "cant-move-topic-to-same-category": "Can't move topic to the same category!",
@@ -170,5 +193,19 @@
     "already-blocked": "This user is already blocked",
     "already-unblocked": "This user is already unblocked",
     "no-connection": "There seems to be a problem with your internet connection",
-    "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP"
+    "socket-reconnect-failed": "Unable to reach the server at this time. Click here to try again, or try again later",
+    "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP",
+    "topic-event-unrecognized": "Topic event '%1' unrecognized",
+    "cant-set-child-as-parent": "Can't set child as parent category",
+    "cant-set-self-as-parent": "Can't set self as parent category",
+    "api.master-token-no-uid": "A master token was received without a corresponding `_uid` in the request body",
+    "api.400": "Something was wrong with the request payload you passed in.",
+    "api.401": "A valid login session was not found. Please log in and try again.",
+    "api.403": "You are not authorised to make this call",
+    "api.404": "Invalid API call",
+    "api.426": "HTTPS is required for requests to the write api, please re-send your request via HTTPS",
+    "api.429": "You have made too many requests, please try again later",
+    "api.500": "An unexpected error was encountered while attempting to service your request.",
+    "api.501": "The route you are trying to call is not implemented yet, please try again tomorrow",
+    "api.503": "The route you are trying to call is not currently available due to a server configuration"
 }

public/language/ar/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "المحال إليه",
 	"update": "تحديث",
 	"updated": "تم التحديث",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",
@@ -26,6 +27,7 @@
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
 	"more-filters": "More Filters",
+	"fewer-filters": "Fewer Filters",
 
 	"quick-actions": "اجراءات سريعه",
 	"flagged-user": "Flagged User",
@@ -67,7 +69,7 @@
 	"sort-upvotes": "Most upvotes",
 	"sort-replies": "Most replies",
 
-	"modal-title": "Report Inappropriate Content",
+	"modal-title": "Report Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Offensive",
@@ -75,11 +77,9 @@
 	"modal-reason-custom": "Reason for reporting this content...",
 	"modal-submit": "Submit Report",
 	"modal-submit-success": "Content has been flagged for moderation.",
-	"modal-submit-confirm": "Confirm Submission",
-	"modal-submit-confirm-text": "You have a custom reason specified already. Are you sure you wish to submit via quick-report?",
-	"modal-submit-confirm-text-help": "Submitting a quick report will overwrite any custom reasons defined.",
 
 	"bulk-actions": "Bulk Actions",
 	"bulk-resolve": "Resolve Flag(s)",
-	"bulk-success": "%1 flags updated"
+	"bulk-success": "%1 flags updated",
+	"flagged-timeago-readable": "Flagged <span class=\"timeago\" title=\"%1\"></span> (%2)"
 }

public/language/ar/global.json

@@ -46,7 +46,9 @@
     "alert.success": "نجاح",
     "alert.error": "خطأ",
     "alert.banned": "محظور",
-    "alert.banned.message": "لقد تم حظر حسابك. سيتم تسجيل الخروج.",
+    "alert.banned.message": "You have just been banned, your access is now restricted.",
+    "alert.unbanned": "Unbanned",
+    "alert.unbanned.message": "Your ban has been lifted.",
     "alert.unfollow": "أنت لا تتابع %1 بعد الآن!",
     "alert.follow": "أنت الآن تتابع %1!",
     "users": "الأعضاء",
@@ -68,6 +70,7 @@
     "firstpost": "First post",
     "read_more": "اقرأ المزيد",
     "more": "المزيد",
+    "none": "None",
     "posted_ago_by_guest": "كتب %1 بواسطة زائر",
     "posted_ago_by": "كتب %1 بواسطة %2",
     "posted_ago": "كتب %1",
@@ -93,6 +96,8 @@
     "guest": "زائر",
     "guests": "الزوار",
     "former_user": "A Former User",
+    "system-user": "System",
+    "unknown-user": "Unknown user",
     "updated.title": "تم تحديث المنتدى",
     "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. إضغط هنا لإعادة تحميل الصفحة.",
     "privacy": "الخصوصية",

public/language/ar/groups.json

@@ -35,6 +35,7 @@
     "details.member_count": "عدد اﻷعضاء",
     "details.creation_date": "تاريخ الإنشاء",
     "details.description": "الوصف",
+    "details.member-post-cids": "Category IDs to display posts from",
     "details.badge_preview": "معاينة الوسام",
     "details.change_icon": "تغيير الأيقونة",
     "details.change_label_colour": "Change Label Colour",

public/language/ar/login.json

@@ -8,5 +8,6 @@
     "failed_login_attempt": "تسجيل الدخول غير ناجح",
     "login_successful": "قمت بتسجيل الدخول بنجاح!",
     "dont_have_account": "لا تملك حساب؟",
-    "logged-out-due-to-inactivity": "لقد تم تسجيل خروجك من لوحة تحكم بسبب عدم نشاطك"
+    "logged-out-due-to-inactivity": "لقد تم تسجيل خروجك من لوحة تحكم بسبب عدم نشاطك",
+    "caps-lock-enabled": "Caps Lock is enabled"
 }

public/language/ar/modules.json

@@ -54,16 +54,27 @@
     "composer.formatting.strikethrough": "Strikethrough",
     "composer.formatting.code": "Code",
     "composer.formatting.link": "Link",
-    "composer.formatting.picture": "Picture",
+    "composer.formatting.picture": "Image Link",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
     "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
+    "composer.schedule-for": "Schedule topic for",
+    "composer.schedule-date": "Date",
+    "composer.schedule-time": "Time",
+    "composer.cancel-scheduling": "Cancel Scheduling",
+    "composer.set-schedule-date": "Set Date",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",
     "cover.dragging_title": "Cover Photo Positioning",
     "cover.dragging_message": "Drag the cover photo to the desired position and click \"Save\"",
-    "cover.saved": "Cover photo image and position saved"
+    "cover.saved": "Cover photo image and position saved",
+    "thumbs.modal.title": "Manage topic thumbnails",
+    "thumbs.modal.no-thumbs": "No thumbnails found.",
+    "thumbs.modal.resize-note": "<strong>Note</strong>: This forum is configured to resize topic thumbnails down to a maximum width of %1px",
+    "thumbs.modal.add": "Add thumbnail",
+    "thumbs.modal.remove": "Remove thumbnail",
+    "thumbs.modal.confirm-remove": "Are you sure you want to remove this thumbnail?"
 }

public/language/ar/notifications.json

@@ -14,6 +14,7 @@
     "topics": "مواضيع",
     "replies": "ردود",
     "chat": "محادثات",
+    "group-chat": "Group Chats",
     "follows": "متابعون",
     "upvote": "الموافقين",
     "new-flags": "New Flags",
@@ -46,6 +47,9 @@
     "profile-exported": "<strong>%1</strong> profile exported, click to download",
     "posts-exported": "<strong>%1</strong> posts exported, click to download",
     "uploads-exported": "<strong>%1</strong> uploads exported, click to download",
+    "users-csv-exported": "Users csv exported, click to download",
+    "post-queue-accepted": "Your queued post has been accepted. Click here to see your post.",
+    "post-queue-rejected": "Your queued post has been rejected.",
     "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني",
     "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.",
     "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.",
@@ -60,7 +64,9 @@
     "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
+    "notificationType_new-group-chat": "When you receive a group chat message",
     "notificationType_group-invite": "When you receive a group invite",
+    "notificationType_group-leave": "When a user leaves your group",
     "notificationType_group-request-membership": "When someone requests to join a group you own",
     "notificationType_new-register": "When someone gets added to registration queue",
     "notificationType_post-queue": "When a new post is queued",

public/language/ar/post-queue.json

@@ -1,3 +1,4 @@
+
 {
 	"post-queue": "Post Queue",
 	"description": "There are no posts in the post queue. <br> To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
@@ -7,5 +8,11 @@
 	"content": "Content",
 	"posted": "Posted",
 	"reply-to": "Reply to \"%1\"",
-	"content-editable": "You can click on individual content to edit before posting."
+	"content-editable": "Click on content to edit",
+	"category-editable": "Click on category to edit",
+	"title-editable": "Click on title to edit",
+	"reply": "Reply",
+	"topic": "Topic",
+	"accept": "Accept",
+	"reject": "Reject"
 }

public/language/ar/register.json

@@ -18,9 +18,15 @@
     "agree_to_terms_of_use": "أوافق على شروط الاستخدام",
     "terms_of_use_error": "يجب عليك الموافقة على شروط الاستخدام",
     "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
-    "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
-    "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
+    "interstitial.intro": "We'd like some additional information in order to update your account…",
+    "interstitial.intro-new": "We'd like some additional information before we can create your account…",
+    "interstitial.errors-found": "Please review the entered information:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
     "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
-    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails.",
+    "invite.error-admin-only": "Direct user registration has been disabled. Please contact an administrator for more details.",
+    "invite.error-invite-only": "Direct user registration has been disabled. You must be invited by an existing user in order to access this forum.",
+    "invite.error-invalid-data": "The registration data received does not correspond to our records. Please contact an administrator for more details"
 }

public/language/ar/success.json

@@ -1,7 +1,7 @@
 {
     "success": "نجاح",
     "topic-post": "لقد تمت الإضافة بنجاح.",
-    "post-queued": "Your post is queued for approval.",
+    "post-queued": "Your post is queued for approval. You will get a notification when it is accepted or rejected.",
     "authentication-successful": "تم تسجيل الدخول بنجاح",
     "settings-saved": "تم حفظ التغييرات!"
 }

public/language/ar/top.json

@@ -0,0 +1,4 @@
+{
+	"title": "Top",
+	"no_top_topics": "No top topics"
+}

public/language/ar/topic.json

@@ -1,5 +1,6 @@
 {
     "topic": "موضوع",
+    "title": "Title",
     "no_topics_found": "لا توجد مواضيع !",
     "no_posts_found": "لا  توجد مشاركات!",
     "post_is_deleted": "هذه المشاركة محذوفة!",
@@ -19,6 +20,8 @@
     "login-to-view": "🔒 Log in to view",
     "edit": "تعديل",
     "delete": "حذف",
+    "delete-event": "Delete Event",
+    "delete-event-confirm": "Are you sure you want to delete this event?",
     "purge": "تطهير",
     "restore": "استعادة",
     "move": "نقل",
@@ -29,15 +32,28 @@
     "tools": "أدوات",
     "locked": "مقفل",
     "pinned": "مثبت",
+    "pinned-with-expiry": "Pinned until %1",
+    "scheduled": "Scheduled",
     "moved": "منقول",
+    "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
+    "locked-by": "Locked by",
+    "unlocked-by": "Unlocked by",
+    "pinned-by": "Pinned by",
+    "unpinned-by": "Unpinned by",
+    "deleted-by": "Deleted by",
+    "restored-by": "Restored by",
+    "moved-from-by": "Moved from %1 by",
+    "queued-by": "Post queued for approval →",
+    "backlink": "Referenced by",
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
     "flag-post": "Flag this post",
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
@@ -79,13 +95,17 @@
     "thread_tools.purge_confirm": "هل أنت متأكد أنك تريد تطهير هذا الموضوع؟",
     "thread_tools.merge_topics": "Merge Topics",
     "thread_tools.merge": "Merge",
-    "topic_move_success": "This topic will be moved shortly. Click here to undo.",
+    "topic_move_success": "This topic will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_multiple_success": "These topics will be moved to \"%1\" shortly. Click here to undo.",
+    "topic_move_all_success": "All topics will be moved to \"%1\" shortly. Click here to undo.",
     "topic_move_undone": "Topic move undone",
     "topic_move_posts_success": "Posts will be moved shortly. Click here to undo.",
     "topic_move_posts_undone": "Post move undone",
     "post_delete_confirm": "هل أنت متأكد أنك تريد حذف هذه المشاركة؟",
     "post_restore_confirm": "هل أنت متأكد أنك تريد استعادة هذه المشاركة؟",
     "post_purge_confirm": "هل أنت متأكد أنك تريد تطهير هذه المشاركة؟",
+    "pin-modal-expiry": "Expiration Date",
+    "pin-modal-help": "You can optionally set an expiration date for the pinned topic(s) here. Alternatively, you can leave this field blank to have the topic stay pinned until it is manually unpinned.",
     "load_categories": "تحميل الفئات",
     "confirm_move": "انقل",
     "confirm_fork": "فرع",
@@ -98,6 +118,7 @@
     "move_post": "نقل المشاركة",
     "post_moved": "تم نقل المشاركة",
     "fork_topic": "فرع الموضوع",
+    "enter-new-topic-title": "Enter new topic title",
     "fork_topic_instruction": "إضغط على المشاركات التي تريد تفريعها",
     "fork_no_pids": "لم تختر أي مشاركة",
     "no-posts-selected": "No posts selected!",
@@ -111,14 +132,18 @@
     "merge-options": "Merge options",
     "merge-select-main-topic": "Select the main topic",
     "merge-new-title-for-topic": "New title for topic",
-    "move_posts_instruction": "Click the posts you want to move then go to target topic and click move.",
+    "topic-id": "Topic ID",
+    "move_posts_instruction": "Click the posts you want to move then enter a topic ID or go to the target topic",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
     "composer.handle_placeholder": "Enter your name/handle here",
     "composer.discard": "نبذ التغييرات",
     "composer.submit": "حفظ",
+    "composer.additional-options": "Additional Options",
+    "composer.schedule": "Schedule",
     "composer.replying_to": "الرد على %1",
     "composer.new_topic": "موضوع جديد",
+    "composer.editing": "Editing",
     "composer.uploading": "جاري الرفع",
     "composer.thumb_url_label": "ألصق رابط الصورة المصغرة للموضوع",
     "composer.thumb_title": "إضافة صورة مصغرة للموضوع",
@@ -135,6 +160,7 @@
     "newest_to_oldest": "من الأحدث إلى الأقدم",
     "most_votes": "Most Votes",
     "most_posts": "Most Posts",
+    "most_views": "Most Views",
     "stale.title": "Create new topic instead?",
     "stale.warning": "The topic you are replying to is quite old. Would you like to create a new topic instead, and reference this one in your reply?",
     "stale.create": "موضوع جديد",
@@ -146,8 +172,13 @@
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
     "diffs.restore": "Restore this revision",
-    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.",
     "diffs.post-restored": "Post successfully restored to earlier revision",
+    "diffs.delete": "Delete this revision",
+    "diffs.deleted": "Revision deleted",
     "timeago_later": "%1 later",
-    "timeago_earlier": "%1 earlier"
+    "timeago_earlier": "%1 earlier",
+    "first-post": "First post",
+    "last-post": "Last post",
+    "post-quick-reply": "Post quick reply"
 }

public/language/ar/user.json

@@ -84,6 +84,7 @@
     "remove_cover_picture_confirm": "هل تريد بالتأكيد إزالة صورة الغلاف؟",
     "crop_picture": "إقتصاص الصورة",
     "upload_cropped_picture": "إقتصاص ورفع",
+    "avatar-background-colour": "Avatar background colour",
     "settings": "خيارات",
     "show_email": "أظهر بريدي الإلكتروني",
     "show_fullname": "أظهر اسمي الكامل",
@@ -93,10 +94,12 @@
     "digest_off": "غير مفعل",
     "digest_daily": "يوميا",
     "digest_weekly": "أسبوعيًّا",
+    "digest_biweekly": "Bi-Weekly",
     "digest_monthly": "شهريًّا",
     "has_no_follower": "هذا المستخدم ليس لديه أية متابعين :(",
     "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
     "has_no_posts": "هذا المستخدم لم يشارك حتى الآن.",
+    "has_no_best_posts": "This user does not have any upvoted posts yet.",
     "has_no_topics": "هذا المستخدم لم يكتب أي موضوع حتى الآن.",
     "has_no_watched_topics": "هذا المستخدم لم يقم بمراقبة اية مواضيع حتى الآن.",
     "has_no_ignored_topics": "هذا المستخدم لم يقم بتجاهل اية مواضيع حتى الآن.",
@@ -123,6 +126,7 @@
     "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
     "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
     "topic_search_help": "إذا قمت بتفعيل ميزة البحث في-الموضوع،  سيتم تجاوز الخيار الافتراضي للمتصفح مما يؤدي للبحث بكامل الموضوع بدلا عن البحث في الجزء الظاهر في الشاشة.",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
     "scroll_to_my_post": "بعد اضافة رد على المشاركة, قم بإظهار المشاركة",
     "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد عليها",
     "follow_topics_you_create": "متابعة المواضيع التي تقوم بإنشائها",
@@ -134,7 +138,7 @@
     "homepage": "الصفحة الرئيسية",
     "homepage_description": "حدد صفحة لاستخدامها كصفحة رئيسية للمنتدى أو \"لا شيء\" لاستخدام الصفحة الرئيسية الافتراضية.",
     "custom_route": "مسار الصفحة الرئيسية المخصصة",
-    "custom_route_help": "أدخل اسم مسار هنا، بدون أي شرطة مائلة (على سبيل المثال \"حديثة\" أو \"شائعة\")",
+    "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\" or \"category/2/general-discussion\")",
     "sso.title": "خدمات تسجيل الدخول الموحد",
     "sso.associated": "مرتبط مع",
     "sso.not-associated": "انقر هنا لربط مع",
@@ -178,5 +182,8 @@
     "consent.export_uploads": "Export Uploaded Content (.zip)",
     "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",
     "consent.export_posts": "Export Posts (.csv)",
-    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete."
+    "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.",
+    "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.",
+    "emailUpdate.optional": "<strong>This field is optional</strong>. You are not obligated to provide your email address, but without a validated email, you will not be able to recover your account.",
+    "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page."
 }

public/language/ar/users.json

@@ -11,6 +11,7 @@
     "online-only": "المتصلون فقط",
     "invite": "دعوة",
     "prompt-email": "Emails:",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
     "invitation-email-sent": "تم إرسال دعوة بالبريد الإلكتروني إلى %1",
     "user_list": "قائمة اﻷعضاء",
     "recent_topics": "أحدث المواضيع",

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

@@ -1,11 +1,6 @@
 {
 	"post-cache": "Кеш за публикации",
-	"posts-in-cache": "Публикации в кеша",
-	"average-post-size": "Среден обем на публикация",
-	"length-to-max": "Дължина / максимум",
 	"percent-full": "Запълненост: %1%",
 	"post-cache-size": "Размер на кеша за публикации",
-	"items-in-cache": "Елементи в кеша",
-	"control-panel": "Контролен панел",
-	"update-settings": "Обновяване на настройките на кеша"
+	"items-in-cache": "Елементи в кеша"
 }

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

@@ -3,6 +3,7 @@
 	"no-events": "Няма събития",
 	"control-panel": "Контролен панел за събитията",
 	"delete-events": "Изтриване на събитията",
+	"confirm-delete-all-events": "Наистина ли искате да изтриете всички събития в журнала?",
 	"filters": "Филтри",
 	"filters-apply": "Прилагане на филтрите",
 	"filter-type": "Вид събитие",

public/language/bg/admin/dashboard.json

@@ -2,6 +2,7 @@
 	"forum-traffic": "Трафик на форума",
 	"page-views": "Преглеждания на страниците",
 	"unique-visitors": "Уникални посетители",
+	"logins": "Вписвания",
 	"new-users": "Нови потребители",
 	"posts": "Публикации",
 	"topics": "Теми",
@@ -29,6 +30,7 @@
 	"upgrade-available": "<p>Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
 	"prerelease-upgrade-available": "<p>Това е остаряла предварителна версия на NodeBB. Има нова версия (версия %1). Ако имате възможност, <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">обновете NodeBB</a>.</p>",
 	"prerelease-warning": "<p>Това е версия за <strong>предварителен преглед</strong> на NodeBB. Възможно е да има неочаквани неизправности. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"fallback-emailer-not-found": "Не е намерен резервен изпращач на е-поща",
 	"running-in-development": "<span>Форумът работи в режим за разработчици, така че може да бъде уязвим. Моля, свържете се със системния си администратор.</span>",
 	"latest-lookup-failed": "<p>Не може да бъде извършена проверка за последната налична версия на NodeBB</p>",
 
@@ -54,8 +56,8 @@
 	"active-users.total": "Общо",
 	"active-users.connections": "Връзки",
 
-	"anonymous-registered-users": "Анонимни към регистрирани потребители",
-	"anonymous": "Анонимни",
+	"guest-registered-users": "Гости към регистрирани потребители",
+	"guest": "Гост",
 	"registered": "Регистрирани",
 
 	"user-presence": "Присъствие на потребителите ",
@@ -66,6 +68,7 @@
 	"unread": "Непрочетени",
 
 	"high-presence-topics": "Теми с най-голяма присъственост",
+	"popular-searches": "Популярни търсения",
 
 	"graphs.page-views": "Преглеждания на страниците",
 	"graphs.page-views-registered": "Преглеждания на страниците от регистрирани потребители",
@@ -73,7 +76,15 @@
 	"graphs.page-views-bot": "Преглеждания на страниците от ботове",
 	"graphs.unique-visitors": "Уникални посетители",
 	"graphs.registered-users": "Регистрирани потребители",
-	"graphs.anonymous-users": "Анонимни потребители",
+	"graphs.guest-users": "Гости",
 	"last-restarted-by": "Последно рестартиране от",
-	"no-users-browsing": "Няма разглеждащи потребители"
+	"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": "Време на вписване"
 }

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

@@ -8,7 +8,11 @@
 	"nodejs": "nodejs",
 	"online": "на линия",
 	"git": "git",
-	"memory": "памет",
+	"process-memory": "памет на процеса",
+	"system-memory": "системна памет",
+	"used-memory-process": "Използвана памет от процеса",
+	"used-memory-os": "Използвана системна памет",
+	"total-memory-os": "Обща системна памет",
 	"load": "натоварване на системата",
 	"cpu-usage": "използване на процесора",
 	"uptime": "активно време",

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

@@ -39,7 +39,7 @@
 	"alert.upgraded": "Добавката е обновена",
 	"alert.installed": "Добавката е инсталирана",
 	"alert.uninstalled": "Добавката е деинсталирана",
-	"alert.activate-success": "Моля, рестартирайте NodeBB, за да включите тази добавка напълно.",
+	"alert.activate-success": "Моля, изградете повторно и презаредете NodeBB, за да активирате напълно тази добавка.",
 	"alert.deactivate-success": "Добавката е изключена успешно.",
 	"alert.upgrade-success": "Моля, изградете повторно и презаредете NodeBB, за да обновите тази добавка напълно.",
 	"alert.install-success": "Добавката е инсталирана успешно, моля, включете я",