Merge commit '171017c38c24fa06fee7333ccf955883e393dfab' into v1.16.x

This commit is contained in:
Misty (Bot)
2021-01-06 19:17:55 +00:00
207 changed files with 1927 additions and 654 deletions

View File

@@ -150,5 +150,7 @@
"useCompression": 0,
"updateUrlWithPostIndex": 1,
"composer:showHelpTab": 1,
"composer:allowPluginHelp": 1
"composer:allowPluginHelp": 1,
"maxReconnectionAttempts": 5,
"reconnectionDelay": 1500
}

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
"version": "1.16.0",
"version": "1.16.1-beta.0",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
@@ -39,9 +39,9 @@
"ace-builds": "^1.4.9",
"archiver": "^5.0.0",
"async": "^3.2.0",
"autoprefixer": "10.1.0",
"autoprefixer": "10.2.0",
"bcryptjs": "2.4.3",
"benchpressjs": "2.3.0",
"benchpressjs": "2.4.0",
"body-parser": "^1.19.0",
"bootbox": "4.4.0",
"bootstrap": "^3.4.1",
@@ -69,7 +69,7 @@
"express-useragent": "^1.0.13",
"graceful-fs": "^4.2.3",
"helmet": "^4.0.0",
"html-to-text": "^5.1.1",
"html-to-text": "6.0.0",
"ipaddr.js": "^2.0.0",
"jquery": "3.5.1",
"jquery-deserialize": "2.0.0-rc1",
@@ -91,7 +91,7 @@
"mousetrap": "^1.6.5",
"@nodebb/bootswatch": "3.4.2",
"nconf": "^0.11.0",
"nodebb-plugin-composer-default": "6.5.4",
"nodebb-plugin-composer-default": "6.5.5",
"nodebb-plugin-dbsearch": "4.1.2",
"nodebb-plugin-emoji": "^3.3.0",
"nodebb-plugin-emoji-android": "2.0.0",
@@ -101,10 +101,10 @@
"nodebb-plugin-spam-be-gone": "0.7.7",
"nodebb-rewards-essentials": "0.1.4",
"nodebb-theme-lavender": "5.0.17",
"nodebb-theme-persona": "10.3.9",
"nodebb-theme-persona": "10.3.17",
"nodebb-theme-slick": "1.3.7",
"nodebb-theme-vanilla": "11.3.10",
"nodebb-widget-essentials": "5.0.0",
"nodebb-widget-essentials": "5.0.2",
"nodemailer": "^6.4.6",
"nprogress": "0.2.0",
"passport": "^0.4.1",
@@ -125,12 +125,12 @@
"sanitize-html": "^2.0.0",
"semver": "^7.2.1",
"serve-favicon": "^2.5.0",
"sharp": "0.26.3",
"sharp": "0.27.0",
"sitemap": "^6.1.0",
"slideout": "1.0.1",
"socket.io": "3.0.4",
"socket.io": "3.0.5",
"socket.io-adapter-cluster": "^1.0.1",
"socket.io-client": "3.0.4",
"socket.io-client": "3.0.5",
"socket.io-redis": "6.0.1",
"sortablejs": "1.10.2",
"spdx-license-list": "^6.1.0",
@@ -153,7 +153,7 @@
"@commitlint/cli": "11.0.0",
"@commitlint/config-angular": "11.0.0",
"coveralls": "3.1.0",
"eslint": "7.15.0",
"eslint": "7.17.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-plugin-import": "2.22.1",
"grunt": "1.3.0",