Merge pull request NodeBB#24 from ic3fresh/release

official v1.9.1 merge to paciak release branch
tosyu · May 14, 2018 · c45995c · c45995c
2 parents d0ea8b7 + 898a80c
commit c45995c
Show file tree

Hide file tree

Showing 723 changed files with 4,983 additions and 1,316 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,7 +61,6 @@ tx.exe
 coverage
 .nyc_output
 
-build
 *.log
 test/files/normalise.jpg.png
 test/files/normalise-resized.jpg

diff --git a/build/.gitignore b/build/.gitignore
@@ -0,0 +1,4 @@
+*
+*/
+!export
+!.gitignore
diff --git a/build/export/.gitignore b/build/export/.gitignore
@@ -0,0 +1,3 @@
+.
+!.gitignore
+!README
diff --git a/build/export/README b/build/export/README
@@ -0,0 +1,5 @@
+This directory contains archives of user uploads that are prepared on-demand
+when a user wants to retrieve a copy of their uploaded content.
+
+You can delete the files in here at will. They will just be regenerated if
+requested again.
diff --git a/install/package.json b/install/package.json
@@ -1,146 +1,170 @@
 {
-    "name": "nodebb",
-    "license": "GPL-3.0",
-    "description": "NodeBB Forum",
-    "version": "1.8.2",
-    "homepage": "http://www.nodebb.org",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/NodeBB/NodeBB/"
+  "name": "nodebb",
+  "license": "GPL-3.0",
+  "description": "NodeBB Forum",
+  "version": "1.9.1",
+  "homepage": "http://www.nodebb.org",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NodeBB/NodeBB/"
+  },
+  "main": "app.js",
+  "scripts": {
+    "start": "node loader.js",
+    "lint": "eslint --cache ./nodebb .",
+    "pretest": "npm run lint",
+    "test": "nyc --reporter=html --reporter=text-summary mocha",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
+  },
+  "dependencies": {
+    "ace-builds": "^1.2.9",
+    "archiver": "^2.1.1",
+    "async": "2.6.0",
+    "autoprefixer": "7.2.4",
+    "bcryptjs": "2.4.3",
+    "benchpressjs": "^1.2.1",
+    "body-parser": "^1.18.2",
+    "bootstrap": "^3.3.7",
+    "chart.js": "^2.7.1",
+    "clipboard": "1.7.1",
+    "colors": "^1.1.2",
+    "commander": "^2.12.2",
+    "compression": "^1.7.1",
+    "connect-ensure-login": "^0.1.1",
+    "connect-flash": "^0.1.1",
+    "connect-mongo": "2.0.1",
+    "connect-multiparty": "^2.1.0",
+    "connect-redis": "3.3.3",
+    "cookie-parser": "^1.4.3",
+    "cron": "^1.3.0",
+    "cropperjs": "^1.2.2",
+    "csurf": "^1.9.0",
+    "daemon": "^1.1.0",
+    "diff": "^3.4.0",
+    "express": "^4.16.2",
+    "express-session": "^1.15.6",
+    "express-useragent": "1.0.8",
+    "graceful-fs": "^4.1.11",
+    "helmet": "^3.11.0",
+    "html-to-text": "3.3.0",
+    "ipaddr.js": "^1.5.4",
+    "jimp": "0.2.28",
+    "jquery": "^3.2.1",
+    "jsesc": "2.5.1",
+    "json-2-csv": "^2.1.2",
+    "less": "^2.7.3",
+    "lodash": "^4.17.4",
+    "logrotate-stream": "^0.2.5",
+    "lru-cache": "4.1.1",
+    "material-design-lite": "^1.3.0",
+    "mime": "^2.2.0",
+    "mkdirp": "^0.5.1",
+    "mongodb": "2.2.33",
+    "morgan": "^1.9.0",
+    "mousetrap": "^1.6.1",
+    "mubsub": "^1.4.0",
+    "nconf": "^0.9.1",
+    "nodebb-plugin-calendar": "^1.0.0-alpha.41",
+    "nodebb-plugin-cards2": "^0.2.4",
+    "nodebb-plugin-carton": "^1.0.2",
+    "nodebb-plugin-composer-default": "6.0.22",
+    "nodebb-plugin-dbsearch": "2.0.13",
+    "nodebb-plugin-desktop-notifications": "^0.3.2",
+    "nodebb-plugin-emoji": "^2.2.3",
+    "nodebb-plugin-emoji-android": "2.0.0",
+    "nodebb-plugin-emoji-apple": "^2.0.0",
+    "nodebb-plugin-emoji-extended": "^1.1.1",
+    "nodebb-plugin-gravatar": "^2.2.0",
+    "nodebb-plugin-html5videoplayer": "^0.2.5",
+    "nodebb-plugin-iframely": "^0.7.8",
+    "nodebb-plugin-imagemagick": "^2.0.5",
+    "nodebb-plugin-lightbox": "PaciakPL/nodebb-plugin-lightbox",
+    "nodebb-plugin-markdown": "8.4.2",
+    "nodebb-plugin-mentions": "2.2.6",
+    "nodebb-plugin-ns-custom-fields": "PaciakPL/nodebb-plugin-ns-custom-fields",
+    "nodebb-plugin-ns-embed": "^2.1.1",
+    "nodebb-plugin-ns-spoiler": "^4.1.0",
+    "nodebb-plugin-poll": "^0.2.17",
+    "nodebb-plugin-reactions": "0.0.3",
+    "nodebb-plugin-shoutbox": "^0.3.4",
+    "nodebb-plugin-soundpack-default": "1.0.0",
+    "nodebb-plugin-spam-be-gone": "0.5.3",
+    "nodebb-plugin-sso-facebook": "^3.3.0",
+    "nodebb-plugin-sso-google": "^2.2.2",
+    "nodebb-plugin-write-api": "^5.1.3",
+    "nodebb-plugin-youtube-embed": "^0.6.7",
+    "nodebb-rewards-essentials": "0.0.11",
+    "nodebb-theme-lavender": "5.0.4",
+    "nodebb-theme-persona": "PaciakPL/nodebb-theme-persona",
+    "nodebb-theme-slick": "1.2.1",
+    "nodebb-theme-vanilla": "9.0.7",
+    "nodebb-widget-essentials": "4.0.2",
+    "nodebb-widget-ns-birthdays": "^2.0.0",
+    "nodebb-widget-search-bar": "^1.1.2",
+    "nodemailer": "4.4.1",
+    "passport": "^0.4.0",
+    "passport-local": "1.0.0",
+    "postcss": "6.0.15",
+    "postcss-clean": "1.1.0",
+    "promise-polyfill": "^7.0.0",
+    "prompt": "^1.0.0",
+    "redis": "2.8.0",
+    "request": "2.83.0",
+    "rimraf": "2.6.2",
+    "rss": "^1.2.2",
+    "sanitize-html": "^1.16.3",
+    "semver": "^5.4.1",
+    "serve-favicon": "^2.4.5",
+    "sitemap": "^1.13.0",
+    "socket.io": "2.0.4",
+    "socket.io-adapter-mongo": "^2.0.1",
+    "socket.io-client": "2.0.4",
+    "socket.io-redis": "5.2.0",
+    "socketio-wildcard": "2.0.0",
+    "spdx-license-list": "^3.0.1",
+    "spider-detector": "1.0.18",
+    "toobusy-js": "^0.5.1",
+    "uglify-es": "^3.3.9",
+    "validator": "9.2.0",
+    "winston": "^2.4.0",
+    "xml": "^1.0.1",
+    "xregexp": "3.2.0",
+    "zxcvbn": "^4.4.2"
+  },
+  "devDependencies": {
+    "coveralls": "^3.0.0",
+    "eslint": "^4.14.0",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-plugin-import": "^2.8.0",
+    "grunt": "^1.0.1",
+    "grunt-contrib-watch": "^1.0.0",
+    "jsdom": "^11.5.1",
+    "mocha": "^4.1.0",
+    "mocha-lcov-reporter": "^1.3.0",
+    "nyc": "^11.4.1",
+    "smtp-server": "^3.4.1"
+  },
+  "bugs": {
+    "url": "https://github.com/NodeBB/NodeBB/issues"
+  },
+  "engines": {
+    "node": ">=6"
+  },
+  "maintainers": [
+    {
+      "name": "Andrew Rodrigues",
+      "email": "andrew@nodebb.org",
+      "url": "https://github.com/psychobunny"
     },
-    "main": "app.js",
-    "scripts": {
-        "start": "node loader.js",
-        "lint": "eslint --cache ./nodebb .",
-        "pretest": "npm run lint",
-        "test": "nyc --reporter=html --reporter=text-summary mocha",
-        "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage"
+    {
+      "name": "Julian Lam",
+      "email": "julian@nodebb.org",
+      "url": "https://github.com/julianlam"
     },
-    "dependencies": {
-        "ace-builds": "^1.2.9",
-        "async": "2.6.0",
-        "autoprefixer": "7.2.4",
-        "bcryptjs": "2.4.3",
-        "benchpressjs": "^1.2.1",
-        "body-parser": "^1.18.2",
-        "bootstrap": "^3.3.7",
-        "chart.js": "^2.7.1",
-        "clipboard": "1.7.1",
-        "colors": "^1.1.2",
-        "compression": "^1.7.1",
-        "commander": "^2.12.2",
-        "connect-ensure-login": "^0.1.1",
-        "connect-flash": "^0.1.1",
-        "connect-mongo": "2.0.1",
-        "connect-multiparty": "^2.1.0",
-        "connect-redis": "3.3.3",
-        "cookie-parser": "^1.4.3",
-        "cron": "^1.3.0",
-        "cropperjs": "^1.2.2",
-        "csurf": "^1.9.0",
-        "daemon": "^1.1.0",
-        "diff": "^3.4.0",
-        "express": "^4.16.2",
-        "express-session": "^1.15.6",
-        "express-useragent": "1.0.8",
-        "graceful-fs": "^4.1.11",
-        "helmet": "^3.11.0",
-        "html-to-text": "3.3.0",
-        "ipaddr.js": "^1.5.4",
-        "jimp": "0.2.28",
-        "jquery": "^3.2.1",
-        "jsesc": "2.5.1",
-        "json-2-csv": "^2.1.2",
-        "less": "^2.7.3",
-        "lodash": "^4.17.4",
-        "logrotate-stream": "^0.2.5",
-        "lru-cache": "4.1.1",
-        "material-design-lite": "^1.3.0",
-        "mime": "^2.2.0",
-        "mkdirp": "^0.5.1",
-        "mongodb": "2.2.33",
-        "morgan": "^1.9.0",
-        "mousetrap": "^1.6.1",
-        "mubsub": "^1.4.0",
-        "nconf": "^0.9.1",
-        "nodebb-plugin-composer-default": "6.0.21",
-        "nodebb-plugin-dbsearch": "2.0.16",
-        "nodebb-plugin-emoji": "^2.2.0",
-        "nodebb-plugin-emoji-android": "2.0.0",
-        "nodebb-plugin-markdown": "8.4.2",
-        "nodebb-plugin-mentions": "2.2.6",
-        "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.5.3",
-        "nodebb-rewards-essentials": "0.0.11",
-        "nodebb-theme-lavender": "5.0.4",
-        "nodebb-theme-persona": "8.0.10",
-        "nodebb-theme-slick": "1.2.1",
-        "nodebb-theme-vanilla": "9.0.7",
-        "nodebb-widget-essentials": "4.0.2",
-        "nodemailer": "4.4.1",
-        "passport": "^0.4.0",
-        "passport-local": "1.0.0",
-        "postcss": "6.0.15",
-        "postcss-clean": "1.1.0",
-        "promise-polyfill": "^7.0.0",
-        "prompt": "^1.0.0",
-        "redis": "2.8.0",
-        "request": "2.83.0",
-        "rimraf": "2.6.2",
-        "rss": "^1.2.2",
-        "sanitize-html": "^1.16.3",
-        "semver": "^5.4.1",
-        "serve-favicon": "^2.4.5",
-        "sitemap": "^1.13.0",
-        "socket.io": "2.0.4",
-        "socket.io-adapter-mongo": "^2.0.1",
-        "socket.io-client": "2.0.4",
-        "socket.io-redis": "5.2.0",
-        "socketio-wildcard": "2.0.0",
-        "spdx-license-list": "^3.0.1",
-        "spider-detector": "1.0.18",
-        "toobusy-js": "^0.5.1",
-        "uglify-es": "^3.3.9",
-        "validator": "9.2.0",
-        "winston": "^2.4.0",
-        "xml": "^1.0.1",
-        "xregexp": "3.2.0",
-        "zxcvbn": "^4.4.2"
-    },
-    "devDependencies": {
-        "coveralls": "^3.0.0",
-        "eslint": "^4.14.0",
-        "eslint-config-airbnb-base": "^12.1.0",
-        "eslint-plugin-import": "^2.8.0",
-        "grunt": "^1.0.1",
-        "grunt-contrib-watch": "^1.0.0",
-        "jsdom": "^11.5.1",
-        "mocha": "^4.1.0",
-        "mocha-lcov-reporter": "^1.3.0",
-        "nyc": "^11.4.1",
-        "smtp-server": "^3.4.1"
-    },
-    "bugs": {
-        "url": "https://github.com/NodeBB/NodeBB/issues"
-    },
-    "engines": {
-        "node": ">=6"
-    },
-    "maintainers": [
-        {
-            "name": "Andrew Rodrigues",
-            "email": "andrew@nodebb.org",
-            "url": "https://github.com/psychobunny"
-        },
-        {
-            "name": "Julian Lam",
-            "email": "julian@nodebb.org",
-            "url": "https://github.com/julianlam"
-        },
-        {
-            "name": "Barış Soner Uşaklı",
-            "email": "baris@nodebb.org",
-            "url": "https://github.com/barisusakli"
-        }
-    ]
+    {
+      "name": "Barış Soner Uşaklı",
+      "email": "baris@nodebb.org",
+      "url": "https://github.com/barisusakli"
+    }
+  ]
 }
diff --git a/public/language/ar/admin/extend/plugins.json b/public/language/ar/admin/extend/plugins.json
@@ -44,6 +44,8 @@
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.</p>",
 	"alert.possibly-incompatible": "<div class=\"alert alert-warning\"><p><strong>No Compatibility Information Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div><p>In the event that NodeBB cannot boot properly:</p><pre><code>$ ./nodebb reset plugin=\"%1\"</code></pre><p>Continue installation of latest version of this plugin?</p>",
+	"alert.reorder": "Plugins Re-ordered",
+	"alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.",
 
 	"license.title": "معلومات ترخيص الإضافة",
 	"license.intro": "The plugin <strong>%1</strong> is licensed under the %2. Please read and understand the license terms prior to activating this plugin.",

diff --git a/public/language/ar/admin/general/dashboard.json b/public/language/ar/admin/general/dashboard.json
@@ -67,5 +67,6 @@
 	"graphs.page-views": "مشاهدات الصفحة",
 	"graphs.unique-visitors": "زوار فريدين",
 	"graphs.registered-users": "مستخدمين مسجلين",
-	"graphs.anonymous-users": "مستخدمين مجهولين"
+	"graphs.anonymous-users": "مستخدمين مجهولين",
+	"last-restarted-by": "Last restarted by"
 }
diff --git a/public/language/ar/admin/settings/group.json b/public/language/ar/admin/settings/group.json
@@ -5,6 +5,7 @@
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
 	"allow-creation": "Allow Group Creation",
 	"allow-creation-help": "If enabled, users can create groups <em>(Default: disabled)</em>",
+	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"cover-image": "Group Cover Image",
 	"default-cover": "Default Cover Images",

diff --git a/public/language/ar/admin/settings/notifications.json b/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)",
+	"notification-alert-timeout": "Notification Alert Timeout"
 }
diff --git a/public/language/ar/error.json b/public/language/ar/error.json
@@ -18,6 +18,7 @@
     "invalid-username-or-password": "المرجود تحديد اسم مستخدم و كلمة مرور",
     "invalid-search-term": "كلمة البحث غير صحيحة",
     "invalid-url": "Invalid URL",
+    "local-login-disabled": "Local login system has been disabled for non-privileged accounts.",
     "csrf-invalid": "لم تتمكن من تسجيل الدخول. هنالك أحتمال ان جلستك انتهت. رجاءًا حاول مرة اخرى.",
     "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
     "username-taken": "اسم المستخدم مأخوذ",
@@ -145,5 +146,7 @@
     "invalid-session": "Session Mismatch",
     "invalid-session-text": "يبدو أن فترة التسجيل لم تعد قائمة او هي غير مطابقة مع الخادم. يرجى إعادة تحميل هذه الصفحة.",
     "no-topics-selected": "No topics selected!",
-    "cant-move-to-same-topic": "Can't move post to same topic!"
+    "cant-move-to-same-topic": "Can't move post to same topic!",
+    "cannot-block-self": "You cannot block yourself!",
+    "cannot-block-privileged": "You cannot block administrators or global moderators"
 }
diff --git a/public/language/ar/flags.json b/public/language/ar/flags.json
@@ -18,6 +18,7 @@
 	"filter-type": "Flag Type",
 	"filter-type-all": "All Content",
 	"filter-type-post": "Post",
+	"filter-type-user": "User",
 	"filter-state": "State",
 	"filter-assignee": "Assignee UID",
 	"filter-cid": "Category",