From cf157c9bfd4fdab2495e691a2c458b8d78cde37d Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 26 Nov 2020 01:11:08 +0000 Subject: [PATCH 001/116] chore: update changelog for v1.15.3 --- CHANGELOG.md | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c541932a77..c6c077fb5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,94 @@ +#### v1.15.3 (2020-11-26) + +##### Chores + +* bump persona (720170a9) +* remove console.log (6a819944) +* move topic route schema up two levels as slug and index are optional (ae402e21) +* move category route schema up two levels as slug and index are optional (b3b501d7) +* up persona (0ffc091b) +* up persona (2f2f0ab7) +* up persona (5c9ff18e) +* add missing plugin hook deprecation warning (98a05e4d) +* pin autoprefixer to latest (46eb7701) +* incrementing version number - v1.15.3-beta.0 (28fa03bd) +* up persona (81984285) +* up slick (5f2fe883) +* incrementing version number - v1.15.2 (5867a5b9) +* update changelog for v1.15.2 (37965d45) +* **spec:** replace ugly hack with another hack for optional properties (45a4f136) +* **deps:** + * update dependency lint-staged to v10.5.2 (db205e2e) + * update dependency eslint to v7.14.0 (80404216) + +##### New Features + +* add topicOwnerPost #8778 (c037779f) +* clear reset tokens on user delete (4f37eddc) +* select/clear all checkboxes in privilege table (#8941) (00e75de7) +* show ban reason and expiry in write api responses, if user is banned (afb26bfe) +* automatically unban users in onSuccessfulLogin (6e5ec3f8) +* #8925, #8924 (3f337b5d) +* human readable uptime (672d4da0) +* allow ACP API access to bearer tokens (3b1c03ed) +* allow pins to expire (if set) (#8908) (046d0b16) +* #8637 (903e9d82) +* add displayname into user obj #8637 (#8909) (9ca44e6f) + +##### Bug Fixes + +* **deps:** + * update dependency nodebb-theme-persona to v10.2.87 (#8946) (167ab3a4) + * update dependency nodebb-theme-persona to v10.2.86 (#8945) (5af5cb85) + * update dependency nconf to ^0.11.0 (58152606) + * update dependency postcss to v8.1.10 (5363ebbb) + * update dependency nodebb-theme-persona to v10.2.85 (#8928) (abc32d62) + * update dependency postcss to v8.1.9 (d1cb5d48) + * update dependency postcss to v8.1.8 (b47a470b) + * update dependency nodebb-theme-vanilla to v11.3.4 (#8914) (589f7a56) + * update dependency nodebb-theme-persona to v10.2.80 (#8913) (38127b04) + * update dependency nodebb-theme-persona to v10.2.79 (#8907) (8e1b2458) + * update dependency nodebb-theme-persona to v10.2.75 (b9856179) +* add topic uid to infinitescroll (6771ca15) +* #8943, session mismatch modal thrown on login (race condition) (d5845169) +* #8912 (ac734b83) +* #8918 (e32cd31e) +* basepath for r.js modules (3af4d13f) +* test (61c6a762) +* move meta.getServerTime call to admin namespace (1c0e8c16) +* add client side check for userslug #8939 (f20c12ee) +* #8939, fix username change notification getting filtered out (0ca40af8) +* #8931, fix lang string (cf903e4e) +* #8932, fix client side error when updating username (95a3f030) +* bug with Topics.resizeAndUploadThumb not checking for extension validity (eab4ca71) +* #8933 (2b73a14e) +* #8929, fix popular, top rss feed urls (77f0bff5) +* a derp (5dd3b031) +* spec (b18e7e31) +* improper handling of scheme-relative URLs in topic thumb logic (4ca62dc4) +* https://github.com/NodeBB/NodeBB/pull/8685 (5fa09832) +* on OP edit, call helper method to upload and resize thumb (f33a9185) +* https://github.com/NodeBB/NodeBB/pull/8759 (9ee1fb49) +* spec (c2bb6123) +* guest displayname (1be08b2e) +* show messages after app load (46acbfda) +* restart on js changes in vendor (814771bd) +* #8915, fix queue not being cleared after firing click events (6ef7e867) +* spec, only call modifyUser on unique user objects (dbd814c2) +* setting (ae5d4405) +* spec (8d060065) +* group userTitles translation escapes (e9585b9b) +* remove params from error log (965671a9) +* **spec:** always show thumb in topic response (493c568a) + +##### Refactors + +* remove unused require (db1c140f) +* move API banned response handler to separate internal method (906d7d73) +* move plugin hook methods to plugin.hooks.* (6e2da996) +* remove breaking change in pin expiry (ef3df47a) +* use categoryCommand local method for pin/lock in category tools (#8917) (00aee84b) + #### v1.15.2 (2020-11-18) ##### Chores From d1ae08fa4a6654b13d0b5ff4f2f534947a208f37 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 26 Nov 2020 01:11:08 +0000 Subject: [PATCH 002/116] chore: incrementing version number - v1.15.3 (cherry picked from commit c0d406ae68c285da3ad6ce630e7e73d20f1a7a22) Signed-off-by: Misty (Bot) --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bebcbd3864..86e6eb322a 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "1.15.3-beta.0", + "version": "1.15.3", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From 93863bb3c6704d4eac15d69b4a2a5951247f8742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 00:01:59 -0500 Subject: [PATCH 003/116] fix: #8949, faster upgrade script --- src/upgrades/1.15.0/verified_users_group.js | 26 ++++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/upgrades/1.15.0/verified_users_group.js b/src/upgrades/1.15.0/verified_users_group.js index 7e5bcd4c64..7f6736b1ef 100644 --- a/src/upgrades/1.15.0/verified_users_group.js +++ b/src/upgrades/1.15.0/verified_users_group.js @@ -7,7 +7,7 @@ const user = require('../../user'); const groups = require('../../groups'); const meta = require('../../meta'); const privileges = require('../../privileges'); - +const now = Date.now(); module.exports = { name: 'Create verified/unverified user groups', timestamp: Date.UTC(2020, 9, 13), @@ -46,14 +46,17 @@ module.exports = { const verified = userData.filter(u => parseInt(u['email:confirmed'], 10) === 1); const unverified = userData.filter(u => parseInt(u['email:confirmed'], 10) !== 1); - for (const user of verified) { - // eslint-disable-next-line no-await-in-loop - await groups.join('verified-users', user.uid); - } - for (const user of unverified) { - // eslint-disable-next-line no-await-in-loop - await groups.join('unverified-users', user.uid); - } + await db.sortedSetAdd( + 'group:verified-users:members', + verified.map(() => now), + verified.map(u => u.uid) + ); + + await db.sortedSetAdd( + 'group:unverified-users:members', + verified.map(() => now), + unverified.map(u => u.uid) + ); }, { batch: 500, progress: this.progress, @@ -61,6 +64,11 @@ module.exports = { await db.delete('users:notvalidated'); await updatePrivilges(); + + const verifiedCount = await db.sortedSetCard('group:verified-users:members'); + const unverifiedCount = await db.sortedSetCard('group:unverified-users:members'); + await db.setObjectField('group:verified-users', 'memberCount', verifiedCount); + await db.setObjectField('group:unverified-users', 'memberCount', unverifiedCount); }, }; From 97c037f0a1226699fb2a174fa35ed1dafe24fae2 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 26 Nov 2020 09:07:31 +0000 Subject: [PATCH 004/116] Latest translations and fallbacks --- public/language/bg/admin/settings/api.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/bg/admin/settings/api.json b/public/language/bg/admin/settings/api.json index 4cc23fc914..0e153563ba 100644 --- a/public/language/bg/admin/settings/api.json +++ b/public/language/bg/admin/settings/api.json @@ -1,12 +1,12 @@ { "tokens": "Кодове", - "settings": "Settings", + "settings": "Настройки", "lead-text": "На тази страница можете да настроите достъпа до ППИ за писане в NodeBB.", "intro": "По подразбиране ППИ за писане удостоверява потребителите чрез бисквитката им за сесията, но NodeBB поддържа и удостоверяване чрез метода „Bearer“, използвайки кодовете от тази страница.", "docs": "Щракнете тук за достъп до пълната документация на ППИ", - "require-https": "Require API usage via HTTPS only", - "require-https-caveat": "Note: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.", + "require-https": "Ползването на ППИ да работи само чрез HTTPS", + "require-https-caveat": "Забележка: В някои случаи, когато се ползват програми за балансиране на натоварването, е възможно заявките към NodeBB да се препращат чрез HTTP – тогава тази настройка трябва да остане изключена.", "uid": "Потребителски ИД", "uid-help-text": "Посочете потребителски ИД, който да бъде свързан с този код. Ако ИД е 0, това ще се счита за главен код, който може да приема идентичността на всеки от другите потребители чрез параметъра _uid", From 21d6225ce0e2a29021141144b6e64c43306d100f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Nov 2020 11:05:45 -0500 Subject: [PATCH 005/116] fix: 'already-deleting' error on subsequent account content deletions --- src/user/delete.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/user/delete.js b/src/user/delete.js index d5ca3ccc4b..8168942244 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -36,6 +36,7 @@ module.exports = function (User) { await deleteTopics(callerUid, uid); await deleteUploads(uid); await deleteQueued(uid); + delete deletesInProgress[uid]; }; async function deletePosts(callerUid, uid) { From 39dae0aaff4c323553cb66d1d8dd80f70c98953e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Nov 2020 11:25:09 -0500 Subject: [PATCH 006/116] fix: #8955, popstate to purged topic should go to homepage --- public/src/ajaxify.js | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 76b1a545ba..32bcfdf8da 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -423,16 +423,34 @@ ajaxify = window.ajaxify || {}; $(document).ready(function () { $(window).on('popstate', function (ev) { ev = ev.originalEvent; + let url = ev.state.url; + const execute = function () { + ajaxify.go(url, function () { + $(window).trigger('action:popstate', { url: url }); + }, true); + }; if (ev !== null && ev.state) { - if (ev.state.url === null && ev.state.returnPath !== undefined) { + if (url === null && ev.state.returnPath !== undefined) { window.history.replaceState({ url: ev.state.returnPath, }, ev.state.returnPath, config.relative_path + '/' + ev.state.returnPath); - } else if (ev.state.url !== undefined) { - ajaxify.go(ev.state.url, function () { - $(window).trigger('action:popstate', { url: ev.state.url }); - }, true); + } else if (url !== undefined) { + if (url.startsWith('topic/')) { + // Check topic exists + fetch(`${config.relative_path}/${url}`, { + method: 'HEAD', + cache: 'no-cache', + }).then((res) => { + if (res.status === 404) { + url = ''; + } + + execute(); + }); + } else { + execute(); + } } } }); From 5bb5ec46188420b942240b897ebe86c75e84d5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 12:04:01 -0500 Subject: [PATCH 007/116] fix: #8954, clear purged replies and toPids (#8959) * fix: #8954, clear purged replies and toPids * fix: redis test --- src/database/mongo/hash.js | 8 +++-- src/database/postgres/hash.js | 30 +++++++++++-------- src/database/redis/hash.js | 11 +++++-- src/posts/delete.js | 17 +++++++---- src/upgrades/1.15.4/clear_purged_replies.js | 33 +++++++++++++++++++++ test/database/hash.js | 10 +++++++ test/topics.js | 16 ++++++++++ 7 files changed, 103 insertions(+), 22 deletions(-) create mode 100644 src/upgrades/1.15.4/clear_purged_replies.js diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index 58db98c537..1997d0b02d 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -149,7 +149,7 @@ module.exports = function (module) { }; module.deleteObjectFields = async function (key, fields) { - if (!key || !Array.isArray(fields) || !fields.length) { + if (!key || (Array.isArray(key) && !key.length) || !Array.isArray(fields) || !fields.length) { return; } fields = fields.filter(Boolean); @@ -162,8 +162,12 @@ module.exports = function (module) { field = helpers.fieldToString(field); data[field] = ''; }); + if (Array.isArray(key)) { + await module.client.collection('objects').updateMany({ _key: { $in: key } }, { $unset: data }); + } else { + await module.client.collection('objects').updateOne({ _key: key }, { $unset: data }); + } - await module.client.collection('objects').updateOne({ _key: key }, { $unset: data }); cache.del(key); }; diff --git a/src/database/postgres/hash.js b/src/database/postgres/hash.js index 6094c3bb72..a1f91d5dab 100644 --- a/src/database/postgres/hash.js +++ b/src/database/postgres/hash.js @@ -247,20 +247,26 @@ SELECT (h."data" ? $2::TEXT AND h."data"->>$2::TEXT IS NOT NULL) b }; module.deleteObjectFields = async function (key, fields) { - if (!key || !Array.isArray(fields) || !fields.length) { + if (!key || (Array.isArray(key) && !key.length) || !Array.isArray(fields) || !fields.length) { return; } - - await module.pool.query({ - name: 'deleteObjectFields', - text: ` -UPDATE "legacy_hash" - SET "data" = COALESCE((SELECT jsonb_object_agg("key", "value") - FROM jsonb_each("data") - WHERE "key" <> ALL ($2::TEXT[])), '{}') - WHERE "_key" = $1::TEXT`, - values: [key, fields], - }); + async function delKey(key, fields) { + await module.pool.query({ + name: 'deleteObjectFields', + text: ` + UPDATE "legacy_hash" + SET "data" = COALESCE((SELECT jsonb_object_agg("key", "value") + FROM jsonb_each("data") + WHERE "key" <> ALL ($2::TEXT[])), '{}') + WHERE "_key" = $1::TEXT`, + values: [key, fields], + }); + } + if (Array.isArray(key)) { + await Promise.all(key.map(k => delKey(k, fields))); + } else { + await delKey(key, fields); + } }; module.incrObjectField = async function (key, field) { diff --git a/src/database/redis/hash.js b/src/database/redis/hash.js index f32f7be0e5..b495c7d44a 100644 --- a/src/database/redis/hash.js +++ b/src/database/redis/hash.js @@ -150,14 +150,21 @@ module.exports = function (module) { }; module.deleteObjectFields = async function (key, fields) { - if (!key || !Array.isArray(fields) || !fields.length) { + if (!key || (Array.isArray(key) && !key.length) || !Array.isArray(fields) || !fields.length) { return; } fields = fields.filter(Boolean); if (!fields.length) { return; } - await module.client.async.hdel(key, fields); + if (Array.isArray(key)) { + const batch = module.client.batch(); + key.forEach(k => batch.hdel(k, fields)); + await helpers.execBatch(batch); + } else { + await module.client.async.hdel(key, fields); + } + cache.del(key); }; diff --git a/src/posts/delete.js b/src/posts/delete.js index 0504eec5f4..ed85a73110 100644 --- a/src/posts/delete.js +++ b/src/posts/delete.js @@ -122,13 +122,18 @@ module.exports = function (Posts) { } async function deletePostFromReplies(postData) { - if (!parseInt(postData.toPid, 10)) { - return; + const replyPids = await db.getSortedSetMembers('pid:' + postData.pid + ':replies'); + const promises = [ + db.deleteObjectFields( + replyPids.map(pid => 'post:' + pid), ['toPid'] + ), + db.delete('pid:' + postData.pid + ':replies'), + ]; + if (parseInt(postData.toPid, 10)) { + promises.push(db.sortedSetRemove('pid:' + postData.toPid + ':replies', postData.pid)); + promises.push(db.decrObjectField('post:' + postData.toPid, 'replies')); } - await Promise.all([ - db.sortedSetRemove('pid:' + postData.toPid + ':replies', postData.pid), - db.decrObjectField('post:' + postData.toPid, 'replies'), - ]); + await Promise.all(promises); } async function deletePostFromGroups(postData) { diff --git a/src/upgrades/1.15.4/clear_purged_replies.js b/src/upgrades/1.15.4/clear_purged_replies.js new file mode 100644 index 0000000000..df4655116d --- /dev/null +++ b/src/upgrades/1.15.4/clear_purged_replies.js @@ -0,0 +1,33 @@ +'use strict'; + +const _ = require('lodash'); +const db = require('../../database'); + +const batch = require('../../batch'); + +module.exports = { + name: 'Clear purged replies and toPid', + timestamp: Date.UTC(2020, 10, 26), + method: async function () { + const progress = this.progress; + + await batch.processSortedSet('posts:pid', async function (pids) { + progress.incr(pids.length); + let postData = await db.getObjects(pids.map(pid => 'post:' + pid)); + postData = postData.filter(p => p && parseInt(p.toPid, 10)); + if (!postData.length) { + return; + } + const toPids = postData.map(p => p.toPid); + const exists = await db.exists(toPids.map(pid => 'post:' + pid)); + const pidsToDelete = postData.filter((p, index) => !exists[index]).map(p => p.pid); + await db.deleteObjectFields(pidsToDelete.map(pid => 'post:' + pid), ['toPid']); + + const repliesToDelete = _.uniq(toPids.filter((pid, index) => !exists[index])); + await db.deleteAll(repliesToDelete.map(pid => 'pid:' + pid + ':replies')); + }, { + progress: progress, + batchSize: 500, + }); + }, +}; diff --git a/test/database/hash.js b/test/database/hash.js index d3a5535d5d..123967b1da 100644 --- a/test/database/hash.js +++ b/test/database/hash.js @@ -415,6 +415,16 @@ describe('Hash methods', function () { }); }); + it('should delete multiple fields of multiple objects', async function () { + await db.setObject('deleteFields1', { foo: 'foo1', baz: '2' }); + await db.setObject('deleteFields2', { foo: 'foo2', baz: '3' }); + await db.deleteObjectFields(['deleteFields1', 'deleteFields2'], ['baz']); + const obj1 = await db.getObject('deleteFields1'); + const obj2 = await db.getObject('deleteFields2'); + assert.deepStrictEqual(obj1, { foo: 'foo1' }); + assert.deepStrictEqual(obj2, { foo: 'foo2' }); + }); + it('should not error if fields is empty array', async () => { await db.deleteObjectFields('someKey', []); }); diff --git a/test/topics.js b/test/topics.js index 6ef9d4a4b8..239cf055d5 100644 --- a/test/topics.js +++ b/test/topics.js @@ -190,6 +190,22 @@ describe('Topic\'s', function () { done(); }); }); + + it('should delete nested relies properly', async function () { + const result = await topics.post({ uid: fooUid, title: 'nested test', content: 'main post', cid: topic.categoryId }); + const reply1 = await topics.reply({ uid: fooUid, content: 'reply post 1', tid: result.topicData.tid }); + const reply2 = await topics.reply({ uid: fooUid, content: 'reply post 2', tid: result.topicData.tid, toPid: reply1.pid }); + let replies = await socketPosts.getReplies({ uid: fooUid }, reply1.pid); + assert.strictEqual(replies.length, 1); + assert.strictEqual(replies[0].content, 'reply post 2'); + let toPid = await posts.getPostField(reply2.pid, 'toPid'); + assert.strictEqual(parseInt(toPid, 10), parseInt(reply1.pid, 10)); + await posts.purge(reply1.pid, fooUid); + replies = await socketPosts.getReplies({ uid: fooUid }, reply1.pid); + assert.strictEqual(replies.length, 0); + toPid = await posts.getPostField(reply2.pid, 'toPid'); + assert.strictEqual(toPid, null); + }); }); describe('Get methods', function () { From 47a19d67631efb0a633aa6ffcff50a57f7a52607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 12:22:24 -0500 Subject: [PATCH 008/116] fix: error message --- src/cli/manage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/manage.js b/src/cli/manage.js index 94f185f5b4..2f541149c0 100644 --- a/src/cli/manage.js +++ b/src/cli/manage.js @@ -65,7 +65,7 @@ async function activate(plugin) { }); process.exit(0); } catch (err) { - winston.error('An error occurred during plugin activation', err.stack); + winston.error('An error occurred during plugin activation\n' + err.stack); throw err; } } From 5ceda148746a5e20a48a11e3e4c25556417d136c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 12:23:41 -0500 Subject: [PATCH 009/116] Revert "fix: #8955, popstate to purged topic should go to homepage" This reverts commit 39dae0aaff4c323553cb66d1d8dd80f70c98953e. --- public/src/ajaxify.js | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 32bcfdf8da..76b1a545ba 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -423,34 +423,16 @@ ajaxify = window.ajaxify || {}; $(document).ready(function () { $(window).on('popstate', function (ev) { ev = ev.originalEvent; - let url = ev.state.url; - const execute = function () { - ajaxify.go(url, function () { - $(window).trigger('action:popstate', { url: url }); - }, true); - }; if (ev !== null && ev.state) { - if (url === null && ev.state.returnPath !== undefined) { + if (ev.state.url === null && ev.state.returnPath !== undefined) { window.history.replaceState({ url: ev.state.returnPath, }, ev.state.returnPath, config.relative_path + '/' + ev.state.returnPath); - } else if (url !== undefined) { - if (url.startsWith('topic/')) { - // Check topic exists - fetch(`${config.relative_path}/${url}`, { - method: 'HEAD', - cache: 'no-cache', - }).then((res) => { - if (res.status === 404) { - url = ''; - } - - execute(); - }); - } else { - execute(); - } + } else if (ev.state.url !== undefined) { + ajaxify.go(ev.state.url, function () { + $(window).trigger('action:popstate', { url: ev.state.url }); + }, true); } } }); From 7e6427bca784779436a9beb4d17cec79cfdc499b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 12:26:03 -0500 Subject: [PATCH 010/116] fix: dont go back after delete account actions --- public/src/modules/accounts/delete.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/src/modules/accounts/delete.js b/public/src/modules/accounts/delete.js index 3be11dd4a1..a1f5d90b84 100644 --- a/public/src/modules/accounts/delete.js +++ b/public/src/modules/accounts/delete.js @@ -45,8 +45,6 @@ define('accounts/delete', ['api', 'bootbox'], function (api) { if (typeof callback === 'function') { return callback(); } - - history.back(); }); }); } From 414caac01b52d280701cc7786a6e378379b9ac8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 12:45:02 -0500 Subject: [PATCH 011/116] fix: #8957 --- src/socket.io/posts/move.js | 5 +++++ test/posts.js | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/socket.io/posts/move.js b/src/socket.io/posts/move.js index bfd614b063..c1637fad51 100644 --- a/src/socket.io/posts/move.js +++ b/src/socket.io/posts/move.js @@ -19,6 +19,11 @@ module.exports = function (SocketPosts) { throw new Error('[[error:invalid-data]]'); } + const canMove = await privileges.topics.isAdminOrMod(data.tid, socket.uid); + if (!canMove) { + throw new Error('[[error:no-privileges]]'); + } + for (const pid of data.pids) { /* eslint-disable no-await-in-loop */ const canMove = await privileges.posts.canMove(pid, socket.uid); diff --git a/test/posts.js b/test/posts.js index aad50e2684..b777230f93 100644 --- a/test/posts.js +++ b/test/posts.js @@ -721,6 +721,21 @@ describe('Post\'s', function () { }); }); }); + + it('should fail to move post if not moderator of target category', async function () { + const cat1 = await categories.create({ name: 'Test Category', description: 'Test category created by testing script' }); + const cat2 = await categories.create({ name: 'Test Category', description: 'Test category created by testing script' }); + const result = await socketTopics.post({ uid: globalModUid }, { title: 'target topic', content: 'queued topic', cid: cat2.cid }); + const modUid = await user.create({ username: 'modofcat1' }); + await privileges.categories.give(privileges.userPrivilegeList, cat1.cid, modUid); + let err; + try { + await socketPosts.movePost({ uid: modUid }, { pid: replyPid, tid: result.tid }); + } catch (_err) { + err = _err; + } + assert.strictEqual(err.message, '[[error:no-privileges]]'); + }); }); describe('getPostSummaryByPids', function () { From b8cafefce225a7e0fb2881881ac88f1a8206f5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 13:56:34 -0500 Subject: [PATCH 012/116] fix: winston usages --- app.js | 2 ++ src/analytics.js | 2 +- src/cli/reset.js | 2 +- src/controllers/admin/dashboard.js | 2 +- src/database/redis.js | 2 +- src/database/redis/connection.js | 2 +- src/flags.js | 2 +- src/notifications.js | 2 +- src/prestart.js | 14 ++++++++++++++ src/webserver.js | 2 +- 10 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app.js b/app.js index 1c7e5017d5..d9d92f545d 100644 --- a/app.js +++ b/app.js @@ -45,6 +45,8 @@ prestart.setupWinston(); prestart.versionCheck(); winston.verbose('* using configuration stored in: %s', configFile); +winston.error('oppps we faled', new Error('yah')); + 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.'); diff --git a/src/analytics.js b/src/analytics.js index d1ec60af2d..1fe00f9803 100644 --- a/src/analytics.js +++ b/src/analytics.js @@ -139,7 +139,7 @@ Analytics.writeData = async function () { try { await Promise.all(dbQueue); } catch (err) { - winston.error('[analytics] Encountered error while writing analytics to data store', err.stack); + winston.error('[analytics] Encountered error while writing analytics to data store\n' + err.stack); throw err; } }; diff --git a/src/cli/reset.js b/src/cli/reset.js index 9edbfee8e7..a7822ba2c1 100644 --- a/src/cli/reset.js +++ b/src/cli/reset.js @@ -133,7 +133,7 @@ async function resetPlugin(pluginId) { winston.info('[reset] No action taken.'); } } catch (err) { - winston.error('[reset] Could not disable plugin: ' + pluginId + ' encountered error %s', err.stack); + winston.error('[reset] Could not disable plugin: ' + pluginId + ' encountered error %s\n' + err.stack); throw err; } } diff --git a/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.js index cef8c8921a..49e34db80a 100644 --- a/src/controllers/admin/dashboard.js +++ b/src/controllers/admin/dashboard.js @@ -69,7 +69,7 @@ async function getLatestVersion() { try { return await versions.getLatestVersion(); } catch (err) { - winston.error('[acp] Failed to fetch latest version', err.stack); + winston.error('[acp] Failed to fetch latest version\n' + err.stack); } return null; } diff --git a/src/database/redis.js b/src/database/redis.js index 7de6efd5b4..b0fd76f284 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -40,7 +40,7 @@ redisModule.init = function (callback) { callback = callback || function () { }; redisModule.client = connection.connect(nconf.get('redis'), function (err) { if (err) { - winston.error('NodeBB could not connect to your Redis database. Redis returned the following error', err.stack); + winston.error('NodeBB could not connect to your Redis database. Redis returned the following error\n' + err.stack); return callback(err); } require('./redis/promisify')(redisModule.client); diff --git a/src/database/redis/connection.js b/src/database/redis/connection.js index b291b1f284..b79c154f63 100644 --- a/src/database/redis/connection.js +++ b/src/database/redis/connection.js @@ -58,7 +58,7 @@ connection.connect = function (options, callback) { if (dbIdx >= 0) { cxn.select(dbIdx, function (err) { if (err) { - winston.error('NodeBB could not select Redis database. Redis returned the following error', err.stack); + winston.error('NodeBB could not select Redis database. Redis returned the following error\n' + err.stack); throw err; } }); diff --git a/src/flags.js b/src/flags.js index 8c716765b2..ae954d1607 100644 --- a/src/flags.js +++ b/src/flags.js @@ -79,7 +79,7 @@ Flags.init = async function () { const data = await plugins.hooks.fire('filter:flags.getFilters', hookData); Flags._filters = data.filters; } catch (err) { - winston.error('[flags/init] Could not retrieve filters', err.stack); + winston.error('[flags/init] Could not retrieve filters\n' + err.stack); Flags._filters = {}; } }; diff --git a/src/notifications.js b/src/notifications.js index f4f526c6d5..11d3ac05c8 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -333,7 +333,7 @@ Notifications.prune = async function () { }, { batch: 500, interval: 100 }); } catch (err) { if (err) { - winston.error('Encountered error pruning notifications', err.stack); + winston.error('Encountered error pruning notifications\n' + err.stack); } } }; diff --git a/src/prestart.js b/src/prestart.js index ed61e28c16..a46e7d3299 100644 --- a/src/prestart.js +++ b/src/prestart.js @@ -13,6 +13,20 @@ function setupWinston() { return; } + // allow winton.error to log error objects properly + // https://github.com/NodeBB/NodeBB/issues/6848 + // const winstonError = winston.error; + // winston.error = function (msg, error) { + // if (msg instanceof Error) { + // winstonError(msg); + // } else if (error instanceof Error) { + // msg = msg + '\n' + error.stack; + // winstonError(msg); + // } else { + // winstonError.apply(null, arguments); + // } + // }; + var formats = []; if (nconf.get('log-colorize') !== 'false') { formats.push(winston.format.colorize()); diff --git a/src/webserver.js b/src/webserver.js index 4a6898f9a0..827baa5cc4 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -278,7 +278,7 @@ function listen(callback) { oldUmask = process.umask('0000'); module.exports.testSocket(socketPath, function (err) { if (err) { - winston.error('[startup] NodeBB was unable to secure domain socket access (' + socketPath + ')', err.stack); + winston.error('[startup] NodeBB was unable to secure domain socket access (' + socketPath + ')\n' + err.stack); throw err; } From 07fe959ce50803da2e7c636b091f8ce5b7154281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 13:56:53 -0500 Subject: [PATCH 013/116] chore: remove test code --- app.js | 2 -- src/prestart.js | 14 -------------- 2 files changed, 16 deletions(-) diff --git a/app.js b/app.js index d9d92f545d..1c7e5017d5 100644 --- a/app.js +++ b/app.js @@ -45,8 +45,6 @@ prestart.setupWinston(); prestart.versionCheck(); winston.verbose('* using configuration stored in: %s', configFile); -winston.error('oppps we faled', new Error('yah')); - 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.'); diff --git a/src/prestart.js b/src/prestart.js index a46e7d3299..ed61e28c16 100644 --- a/src/prestart.js +++ b/src/prestart.js @@ -13,20 +13,6 @@ function setupWinston() { return; } - // allow winton.error to log error objects properly - // https://github.com/NodeBB/NodeBB/issues/6848 - // const winstonError = winston.error; - // winston.error = function (msg, error) { - // if (msg instanceof Error) { - // winstonError(msg); - // } else if (error instanceof Error) { - // msg = msg + '\n' + error.stack; - // winstonError(msg); - // } else { - // winstonError.apply(null, arguments); - // } - // }; - var formats = []; if (nconf.get('log-colorize') !== 'false') { formats.push(winston.format.colorize()); From 6c316be4775c34130452f9d8f9f53196c27df5dc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Nov 2020 19:02:37 +0000 Subject: [PATCH 014/116] fix(deps): update dependency benchpressjs to v2.3.0 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 86e6eb322a..ac54bcbc65 100644 --- a/install/package.json +++ b/install/package.json @@ -41,7 +41,7 @@ "async": "^3.2.0", "autoprefixer": "10.0.2", "bcryptjs": "2.4.3", - "benchpressjs": "2.2.2", + "benchpressjs": "2.3.0", "body-parser": "^1.19.0", "bootbox": "4.4.0", "bootstrap": "^3.4.1", From 15c6f32c9388d591cf11f5faeb9eb3a60f01ac30 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Nov 2020 15:49:09 -0500 Subject: [PATCH 015/116] refactor: pin/lock threadTools to use topicCommand, rewrote topicCommand to match categoryCommand signature --- public/src/client/category/tools.js | 41 +----------- public/src/client/topic/threadTools.js | 89 +++++++++++++++++++++----- 2 files changed, 75 insertions(+), 55 deletions(-) diff --git a/public/src/client/category/tools.js b/public/src/client/category/tools.js index e9ae03431c..bc27ea7416 100644 --- a/public/src/client/category/tools.js +++ b/public/src/client/category/tools.js @@ -4,11 +4,12 @@ define('forum/category/tools', [ 'topicSelect', + 'forum/topic/threadTools', 'components', 'translator', 'api', 'bootbox', -], function (topicSelect, components, translator, api, bootbox) { +], function (topicSelect, threadTools, components, translator, api, bootbox) { var CategoryTools = {}; CategoryTools.init = function () { @@ -149,7 +150,7 @@ define('forum/category/tools', [ break; case 'pin': - requestPinExpiry(body, execute.bind(null, true)); + threadTools.requestPinExpiry(body, execute.bind(null, true)); break; default: @@ -158,42 +159,6 @@ define('forum/category/tools', [ } } - function requestPinExpiry(body, onSuccess) { - app.parseAndTranslate('modals/set-pin-expiry', {}, function (html) { - const modal = bootbox.dialog({ - title: '[[topic:thread_tools.pin]]', - message: html, - onEscape: true, - size: 'small', - buttons: { - save: { - label: '[[global:save]]', - className: 'btn-primary', - callback: function () { - const expiryEl = modal.get(0).querySelector('#expiry'); - let expiry = expiryEl.value; - - // No expiry set - if (expiry === '') { - return onSuccess(); - } - - // Expiration date set - expiry = new Date(expiry); - - if (expiry && expiry.getTime() > Date.now()) { - body.expiry = expiry.getTime(); - onSuccess(); - } else { - app.alertError('[[error:invalid-date]]'); - } - }, - }, - }, - }); - }); - } - CategoryTools.removeListeners = function () { socket.removeListener('event:topic_deleted', setDeleteState); socket.removeListener('event:topic_restored', setDeleteState); diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index ab1383fbd0..1cc5bf32f3 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -12,41 +12,43 @@ define('forum/topic/threadTools', [ ThreadTools.init = function (tid, topicContainer) { renderMenu(topicContainer); + // function topicCommand(method, path, command, onComplete) { topicContainer.on('click', '[component="topic/delete"]', function () { - topicCommand('delete', tid); + topicCommand('del', '/state', 'delete'); return false; }); topicContainer.on('click', '[component="topic/restore"]', function () { - topicCommand('restore', tid); + topicCommand('put', '/state', 'restore'); return false; }); topicContainer.on('click', '[component="topic/purge"]', function () { - topicCommand('purge', tid); + topicCommand('del', '', 'purge'); return false; }); topicContainer.on('click', '[component="topic/lock"]', function () { - api.put(`/topics/${tid}/lock`); + topicCommand('put', '/lock', 'lock'); return false; }); topicContainer.on('click', '[component="topic/unlock"]', function () { - api.del(`/topics/${tid}/lock`); + topicCommand('del', '/lock', 'unlock'); return false; }); topicContainer.on('click', '[component="topic/pin"]', function () { - api.put(`/topics/${tid}/pin`); + topicCommand('put', '/pin', 'pin'); return false; }); topicContainer.on('click', '[component="topic/unpin"]', function () { - api.del(`/topics/${tid}/pin`); + topicCommand('del', '/pin', 'unpin'); return false; }); + // todo: should also use topicCommand, but no write api call exists for this yet topicContainer.on('click', '[component="topic/mark-unread"]', function () { socket.emit('topics.markUnread', tid, function (err) { if (err) { @@ -174,19 +176,72 @@ define('forum/topic/threadTools', [ }); } - function topicCommand(command, tid) { - translator.translate('[[topic:thread_tools.' + command + '_confirm]]', function (msg) { - bootbox.confirm(msg, function (confirm) { - if (!confirm) { - return; - } + function topicCommand(method, path, command, onComplete) { + if (!onComplete) { + onComplete = function () {}; + } + const tid = ajaxify.data.tid; + const body = {}; + const execute = function (ok) { + if (ok) { + api[method](`/topics/${tid}${path}`, body) + .then(onComplete) + .catch(app.alertError); + } + }; - const method = command === 'restore' ? 'put' : 'del'; - const suffix = command !== 'purge' ? '/state' : ''; - api[method](`/topics/${tid}${suffix}`, undefined, undefined, 'default'); + switch (command) { + case 'delete': + case 'restore': + case 'purge': + bootbox.confirm(`[[topic:thread_tools.${command}_confirm]]`, execute); + break; + + case 'pin': + ThreadTools.requestPinExpiry(body, execute.bind(null, true)); + break; + + default: + execute(true); + break; + } + } + + ThreadTools.requestPinExpiry = function (body, onSuccess) { + app.parseAndTranslate('modals/set-pin-expiry', {}, function (html) { + const modal = bootbox.dialog({ + title: '[[topic:thread_tools.pin]]', + message: html, + onEscape: true, + size: 'small', + buttons: { + save: { + label: '[[global:save]]', + className: 'btn-primary', + callback: function () { + const expiryEl = modal.get(0).querySelector('#expiry'); + let expiry = expiryEl.value; + + // No expiry set + if (expiry === '') { + return onSuccess(); + } + + // Expiration date set + expiry = new Date(expiry); + + if (expiry && expiry.getTime() > Date.now()) { + body.expiry = expiry.getTime(); + onSuccess(); + } else { + app.alertError('[[error:invalid-date]]'); + } + }, + }, + }, }); }); - } + }; ThreadTools.setLockedState = function (data) { var threadEl = components.get('topic'); From e1432caf927607cdab8fc3ff93cdd6224c94435a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Nov 2020 15:53:47 -0500 Subject: [PATCH 016/116] feat: add cancel button to pin expiration modal --- public/src/client/topic/threadTools.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 1cc5bf32f3..6a6b03d372 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -215,6 +215,10 @@ define('forum/topic/threadTools', [ onEscape: true, size: 'small', buttons: { + cancel: { + label: '[[modules:bootbox.cancel]]', + className: 'btn-link', + }, save: { label: '[[global:save]]', className: 'btn-primary', From ba3981e270de3e2c049f8da3273dd2468374cc97 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Thu, 26 Nov 2020 14:59:23 -0700 Subject: [PATCH 017/116] fix: use package.name for theme.id (#8965) Prevents cases like #8953 --- src/meta/themes.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/meta/themes.js b/src/meta/themes.js index 8c184f776d..1120591609 100644 --- a/src/meta/themes.js +++ b/src/meta/themes.js @@ -25,9 +25,16 @@ Themes.get = async () => { themes = _.flatten(themes).filter(Boolean); themes = await Promise.all(themes.map(async (theme) => { const config = path.join(themePath, theme, 'theme.json'); + const pack = path.join(themePath, theme, 'package.json'); try { - const file = await fs.promises.readFile(config, 'utf8'); - const configObj = JSON.parse(file); + const [configFile, packageFile] = await Promise.all([ + fs.promises.readFile(config, 'utf8'), + fs.promises.readFile(pack, 'utf8'), + ]); + const configObj = JSON.parse(configFile); + const packageObj = JSON.parse(packageFile); + + configObj.id = packageObj.name; // Minor adjustments for API output configObj.type = 'local'; From a56a657759262201439c660d7e09fd8b0b9fff81 Mon Sep 17 00:00:00 2001 From: gasoved Date: Fri, 27 Nov 2020 01:25:26 +0300 Subject: [PATCH 018/116] fix: missing select/clear all checkbox added to category privileges template (#8967) --- public/language/en-GB/admin/manage/privileges.json | 1 + public/src/admin/manage/privileges.js | 2 +- src/views/admin/partials/privileges/category.tpl | 4 ++++ src/views/admin/partials/privileges/global.tpl | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/public/language/en-GB/admin/manage/privileges.json b/public/language/en-GB/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/en-GB/admin/manage/privileges.json +++ b/public/language/en-GB/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.js index 424d12881e..0fab84ed20 100644 --- a/public/src/admin/manage/privileges.js +++ b/public/src/admin/manage/privileges.js @@ -29,7 +29,7 @@ define('admin/manage/privileges', [ }; Privileges.setupPrivilegeTable = function () { - $('.privilege-table-container').on('change', 'input[type="checkbox"]', function () { + $('.privilege-table-container').on('change', 'input[type="checkbox"]:not(.checkbox-helper)', function () { var checkboxEl = $(this); var wrapperEl = checkboxEl.parent(); var privilege = wrapperEl.attr('data-privilege'); diff --git a/src/views/admin/partials/privileges/category.tpl b/src/views/admin/partials/privileges/category.tpl index 99150e05b9..392feddfab 100644 --- a/src/views/admin/partials/privileges/category.tpl +++ b/src/views/admin/partials/privileges/category.tpl @@ -20,6 +20,7 @@ [[admin/manage/categories:privileges.section-group]] + [[admin/manage/privileges:select-clear-all]] {privileges.labels.groups.name} @@ -46,6 +47,7 @@ + {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} @@ -99,6 +101,7 @@ [[admin/manage/categories:privileges.section-user]] + [[admin/manage/privileges:select-clear-all]] {privileges.labels.users.name} @@ -115,6 +118,7 @@ {privileges.users.username} + {function.spawnPrivilegeStates, privileges.users.username, ../privileges} diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl index 2c704ea7b4..ba2106230b 100644 --- a/src/views/admin/partials/privileges/global.tpl +++ b/src/views/admin/partials/privileges/global.tpl @@ -3,7 +3,7 @@ [[admin/manage/categories:privileges.section-group]] - Select/Clear All + [[admin/manage/privileges:select-clear-all]] {privileges.labels.groups.name} @@ -47,7 +47,7 @@ [[admin/manage/categories:privileges.section-user]] - Select/Clear All + [[admin/manage/privileges:select-clear-all]] {privileges.labels.users.name} From b2f0d38f5c695d1e36eba05832349c9e61921d1a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Nov 2020 22:10:05 +0000 Subject: [PATCH 019/116] fix(deps): update dependency autoprefixer to v10.0.3 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ac54bcbc65..d7a7ef3357 100644 --- a/install/package.json +++ b/install/package.json @@ -39,7 +39,7 @@ "ace-builds": "^1.4.9", "archiver": "^5.0.0", "async": "^3.2.0", - "autoprefixer": "10.0.2", + "autoprefixer": "10.0.3", "bcryptjs": "2.4.3", "benchpressjs": "2.3.0", "body-parser": "^1.19.0", From 4c7374ea33da4749d1f970c614acfbff46d1ca52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 26 Nov 2020 21:37:17 -0500 Subject: [PATCH 020/116] fix: flicker on tooltips if server call takes long time --- public/src/client/topic/votes.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/src/client/topic/votes.js b/public/src/client/topic/votes.js index 8ea9091089..731b7f63ba 100644 --- a/public/src/client/topic/votes.js +++ b/public/src/client/topic/votes.js @@ -15,6 +15,7 @@ define('forum/topic/votes', [ var $this = $(this); var el = $this.parent(); + el.find('.tooltip').css('display', 'none'); var pid = el.parents('[data-pid]').attr('data-pid'); socket.emit('posts.getUpvoters', [pid], function (err, data) { @@ -32,6 +33,7 @@ define('forum/topic/votes', [ function createTooltip(el, data) { function doCreateTooltip(title) { el.attr('title', title).tooltip('fixTitle').tooltip('show'); + el.parent().find('.tooltip').css('display', ''); } var usernames = data.usernames .filter(name => name !== '[[global:former_user]]'); From 664614bbe33a236e14c284a7c3cc48cff4be48be Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 27 Nov 2020 09:09:22 +0000 Subject: [PATCH 021/116] Latest translations and fallbacks --- .../language/ar/admin/manage/privileges.json | 1 + .../language/bg/admin/manage/privileges.json | 1 + .../language/bn/admin/manage/privileges.json | 1 + .../language/cs/admin/manage/privileges.json | 1 + .../language/da/admin/manage/privileges.json | 1 + .../language/de/admin/manage/privileges.json | 1 + .../language/el/admin/manage/privileges.json | 1 + .../en-US/admin/manage/privileges.json | 1 + .../en-x-pirate/admin/manage/privileges.json | 1 + .../language/es/admin/manage/privileges.json | 1 + .../language/et/admin/manage/privileges.json | 1 + .../fa-IR/admin/manage/privileges.json | 1 + .../language/fi/admin/manage/privileges.json | 1 + .../language/fr/admin/manage/privileges.json | 1 + public/language/fr/admin/settings/api.json | 6 +- .../language/gl/admin/manage/privileges.json | 1 + .../language/he/admin/advanced/database.json | 6 +- .../he/admin/appearance/customise.json | 10 +-- .../language/he/admin/appearance/skins.json | 4 +- .../language/he/admin/appearance/themes.json | 16 ++-- public/language/he/admin/extend/rewards.json | 2 +- .../language/he/admin/manage/privileges.json | 1 + public/language/he/admin/menu.json | 16 ++-- public/language/he/email.json | 26 +++---- public/language/he/error.json | 78 +++++++++---------- public/language/he/flags.json | 4 +- public/language/he/ip-blacklist.json | 4 +- public/language/he/notifications.json | 16 ++-- public/language/he/register.json | 4 +- public/language/he/reset_password.json | 4 +- public/language/he/search.json | 6 +- public/language/he/tags.json | 2 +- public/language/he/users.json | 2 +- .../language/hr/admin/manage/privileges.json | 1 + .../language/hu/admin/manage/privileges.json | 1 + .../language/id/admin/manage/privileges.json | 1 + .../language/it/admin/manage/privileges.json | 1 + .../language/ja/admin/manage/privileges.json | 1 + .../language/ko/admin/manage/privileges.json | 1 + .../language/lt/admin/manage/privileges.json | 1 + .../language/lv/admin/manage/privileges.json | 1 + .../language/ms/admin/manage/privileges.json | 1 + .../language/nb/admin/manage/privileges.json | 1 + .../language/nl/admin/manage/privileges.json | 1 + .../language/pl/admin/manage/privileges.json | 1 + .../pt-BR/admin/manage/privileges.json | 1 + .../pt-PT/admin/manage/privileges.json | 1 + .../language/ro/admin/manage/privileges.json | 1 + .../language/ru/admin/manage/privileges.json | 1 + .../language/rw/admin/manage/privileges.json | 1 + .../language/sc/admin/manage/privileges.json | 1 + .../language/sk/admin/manage/privileges.json | 1 + .../language/sl/admin/manage/privileges.json | 1 + .../language/sr/admin/manage/privileges.json | 1 + .../language/sv/admin/manage/privileges.json | 1 + .../language/th/admin/manage/privileges.json | 1 + .../language/tr/admin/manage/privileges.json | 1 + .../language/uk/admin/manage/privileges.json | 1 + .../language/vi/admin/manage/privileges.json | 1 + .../zh-CN/admin/manage/privileges.json | 1 + .../zh-TW/admin/manage/privileges.json | 1 + 61 files changed, 147 insertions(+), 103 deletions(-) diff --git a/public/language/ar/admin/manage/privileges.json b/public/language/ar/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/ar/admin/manage/privileges.json +++ b/public/language/ar/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/bg/admin/manage/privileges.json b/public/language/bg/admin/manage/privileges.json index 10f407dcdd..0b481eb69f 100644 --- a/public/language/bg/admin/manage/privileges.json +++ b/public/language/bg/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Правомощия за групите", "user-privileges": "Правомощия за потребителите", "edit-privileges": "Редактиране на правомощията", + "select-clear-all": "Избиране/изчистване на всичко", "chat": "Разговор", "upload-images": "Качване на изображения", "upload-files": "Качване на файлове", diff --git a/public/language/bn/admin/manage/privileges.json b/public/language/bn/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/bn/admin/manage/privileges.json +++ b/public/language/bn/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/cs/admin/manage/privileges.json b/public/language/cs/admin/manage/privileges.json index 16f257ae6c..5e3a34dc4b 100644 --- a/public/language/cs/admin/manage/privileges.json +++ b/public/language/cs/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Oprávnění skupiny", "user-privileges": "Oprávnění uživatele", "edit-privileges": "Upravit oprávnění", + "select-clear-all": "Select/Clear All", "chat": "Konverzace", "upload-images": "Nahrát obrázky", "upload-files": "Náhrát soubory", diff --git a/public/language/da/admin/manage/privileges.json b/public/language/da/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/da/admin/manage/privileges.json +++ b/public/language/da/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/de/admin/manage/privileges.json b/public/language/de/admin/manage/privileges.json index 010833b7c2..767631b11b 100644 --- a/public/language/de/admin/manage/privileges.json +++ b/public/language/de/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Chat", "upload-images": "Bilder hochladen", "upload-files": "Dateien hochladen", diff --git a/public/language/el/admin/manage/privileges.json b/public/language/el/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/el/admin/manage/privileges.json +++ b/public/language/el/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/en-US/admin/manage/privileges.json b/public/language/en-US/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/en-US/admin/manage/privileges.json +++ b/public/language/en-US/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/en-x-pirate/admin/manage/privileges.json b/public/language/en-x-pirate/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/en-x-pirate/admin/manage/privileges.json +++ b/public/language/en-x-pirate/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/es/admin/manage/privileges.json b/public/language/es/admin/manage/privileges.json index b40262ebb9..118cc2d722 100644 --- a/public/language/es/admin/manage/privileges.json +++ b/public/language/es/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Chat", "upload-images": "Subir imágenes", "upload-files": "Subir Archivos", diff --git a/public/language/et/admin/manage/privileges.json b/public/language/et/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/et/admin/manage/privileges.json +++ b/public/language/et/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/fa-IR/admin/manage/privileges.json b/public/language/fa-IR/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/fa-IR/admin/manage/privileges.json +++ b/public/language/fa-IR/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/fi/admin/manage/privileges.json b/public/language/fi/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/fi/admin/manage/privileges.json +++ b/public/language/fi/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/fr/admin/manage/privileges.json b/public/language/fr/admin/manage/privileges.json index b9f4fcb5ef..4f274df88f 100644 --- a/public/language/fr/admin/manage/privileges.json +++ b/public/language/fr/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Privilèges de groupe", "user-privileges": "Privilèges d'utilisateur", "edit-privileges": "Éditer les privilèges", + "select-clear-all": "Select/Clear All", "chat": "Chat", "upload-images": "Images envoyées", "upload-files": "Fichiers envoyés", diff --git a/public/language/fr/admin/settings/api.json b/public/language/fr/admin/settings/api.json index 85a6230fd5..f6e04bd349 100644 --- a/public/language/fr/admin/settings/api.json +++ b/public/language/fr/admin/settings/api.json @@ -1,12 +1,12 @@ { "tokens": "Tokens", - "settings": "Settings", + "settings": "Paramètres", "lead-text": "À partir de cette page, vous pouvez configurer l'accès à l'API d'écriture dans NodeBB.", "intro": "Par défaut, l'API d'écriture authentifie les utilisateurs en fonction de leur cookie de session, mais NodeBB prend également en charge l'authentification du porteur via des tokens générés via cette page.", "docs": "Cliquez ici pour accéder à la spécification complète de l'API", - "require-https": "Require API usage via HTTPS only", - "require-https-caveat": "Note: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.", + "require-https": "Forcer l'utilisation de l'API via HTTPS uniquement", + "require-https-caveat": "Remarque: certaines installations impliquant des load balancer peuvent transmettre leurs requêtes à NodeBB via HTTP, auquel cas cette option doit rester désactivée.", "uid": "ID Utilisateur", "uid-help-text": "Spécifiez un ID utilisateur à associer à ce token. Si l'ID utilisateur est 0, il sera considéré comme un token maître, qui peut prendre l'identité d'autres utilisateurs en fonction du paramètre _uid", diff --git a/public/language/gl/admin/manage/privileges.json b/public/language/gl/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/gl/admin/manage/privileges.json +++ b/public/language/gl/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/he/admin/advanced/database.json b/public/language/he/admin/advanced/database.json index 356a4cd919..1e66929a54 100644 --- a/public/language/he/admin/advanced/database.json +++ b/public/language/he/admin/advanced/database.json @@ -1,12 +1,12 @@ { - "x-b": "%1 בתים", + "x-b": "%1 ביטים", "x-mb": "%1 מגה בייט", "x-gb": "%1 ג'יגה בייט", "uptime-seconds": "זמן מאתחול אחרון בשניות", "uptime-days": "זמן מאתחול אחרון בימים", "mongo": "Mongo", - "mongo.version": "גרסאת MongoDB", + "mongo.version": "גרסת MongoDB", "mongo.storage-engine": "מנוע אחסון", "mongo.collections": "אוסף", "mongo.objects": "אובייקטים", @@ -36,7 +36,7 @@ "redis.memory-frag-ratio": "יחס פיצול זכרון", "redis.total-connections-recieved": "סך כל החיבורים שהתקבלו", "redis.total-commands-processed": "סך כל הפקודות שעובדו", - "redis.iops": "Instantaneous Ops. Per Second", + "redis.iops": "אפשרויות מידיות לשניה", "redis.iinput": "Instantaneous Input Per Second", "redis.ioutput": "Instantaneous Output Per Second", "redis.total-input": "סך הכל מידע נכנס", diff --git a/public/language/he/admin/appearance/customise.json b/public/language/he/admin/appearance/customise.json index 12b86b47fc..c203bc61d9 100644 --- a/public/language/he/admin/appearance/customise.json +++ b/public/language/he/admin/appearance/customise.json @@ -7,10 +7,10 @@ "custom-js.description": "הזן כאן javascript משלך. זה יבוצע לאחר טעינת הדף לחלוטין.", "custom-js.enable": "אפשר Javascript מותאם אישית", - "custom-header": "Custom Header", - "custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <head> section of your forum's markup. Script tags are allowed, but are discouraged, as the Custom Javascript tab is available.", - "custom-header.enable": "Enable Custom Header", + "custom-header": "HTML מותאם אישית", + "custom-header.description": "הזן כאן HTML משלך (לדוגמא תגיות מטא), שיתווספו לתגית ה-head של הפורום. ניתן להכניס סקריפטים, אך מומלץ להכניס אותם בכרטיסיית Javascript מותאם אישית.", + "custom-header.enable": "אפשר HTML מותאם אישית", - "custom-css.livereload": "Enable Live Reload", - "custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save" + "custom-css.livereload": "אפשר טעינה מחדש אוטומטית.", + "custom-css.livereload.description": "אפשר זאת כדי שכל החיבורים מכל מכשיר יתרעננו כאשר אתה שומר." } \ No newline at end of file diff --git a/public/language/he/admin/appearance/skins.json b/public/language/he/admin/appearance/skins.json index 59c15008c7..4f49fb6e2b 100644 --- a/public/language/he/admin/appearance/skins.json +++ b/public/language/he/admin/appearance/skins.json @@ -4,6 +4,6 @@ "select-skin": "סקין נבחר", "current-skin": "סקין נוכחי", "skin-updated": "סקין מעודכן", - "applied-success": "%1 skin was succesfully applied", - "revert-success": "Skin reverted to base colours" + "applied-success": "העיצוב %1 הוחל בהצלחה", + "revert-success": "העיצובהוחזר לצבעים הבסיסיים" } \ No newline at end of file diff --git a/public/language/he/admin/appearance/themes.json b/public/language/he/admin/appearance/themes.json index f8cfca3c8e..00210bdbd0 100644 --- a/public/language/he/admin/appearance/themes.json +++ b/public/language/he/admin/appearance/themes.json @@ -1,11 +1,11 @@ { - "checking-for-installed": "Checking for installed themes...", + "checking-for-installed": "בודק ערכות נושא מותקנות...", "homepage": "דף הבית", - "select-theme": "Select Theme", - "current-theme": "Current Theme", - "no-themes": "No installed themes found", - "revert-confirm": "Are you sure you wish to restore the default NodeBB theme?", - "theme-changed": "Theme Changed", - "revert-success": "You have successfully reverted your NodeBB back to it's default theme.", - "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme." + "select-theme": "בחר ערכת נושא", + "current-theme": "ערכת נושא נוכחית", + "no-themes": "לא נמצאו ערכות נושא מותקנות", + "revert-confirm": "האם אתה בטוח שאתה רוצה לשחזר את ערכת הנושא הרגילה של NodeBB?", + "theme-changed": "ערכת הנושא שונתה", + "revert-success": "החזרת בהצלחה את הפורום שלך לערכת הנושא ברירת המחדל.", + "restart-to-activate": "אנא בצע בנייה והפעלה מחדש כדי להחיל את ערכת הנושא הזו." } \ No newline at end of file diff --git a/public/language/he/admin/extend/rewards.json b/public/language/he/admin/extend/rewards.json index f78c4b2c56..3c4310ffef 100644 --- a/public/language/he/admin/extend/rewards.json +++ b/public/language/he/admin/extend/rewards.json @@ -1,7 +1,7 @@ { "rewards": "פרסים", "condition-if-users": "אם המשתמשים", - "condition-is": "Is:", + "condition-is": "הוא:", "condition-then": "אז:", "max-claims": "מספר הפעמים הניתן לדרוש פרס", "zero-infinite": "הזן 0 לאינסוף", diff --git a/public/language/he/admin/manage/privileges.json b/public/language/he/admin/manage/privileges.json index fb7d158d7f..d6b879ccd5 100644 --- a/public/language/he/admin/manage/privileges.json +++ b/public/language/he/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "הרשאות קבוצתיות", "user-privileges": "הרשאות משתמש", "edit-privileges": "עריכת הרשאות", + "select-clear-all": "Select/Clear All", "chat": "צ'אט", "upload-images": "העלאת תמונות", "upload-files": "העלאת קבצים", diff --git a/public/language/he/admin/menu.json b/public/language/he/admin/menu.json index ba334339a0..30b433b86d 100644 --- a/public/language/he/admin/menu.json +++ b/public/language/he/admin/menu.json @@ -13,7 +13,7 @@ "manage/groups": "קבוצות", "manage/ip-blacklist": "רשימה שחורה של כתובות IP", "manage/uploads": "העלאות", - "manage/digest": "Digests", + "manage/digest": "תקצירים", "section-settings": "הגדרות", "settings/general": "כללי", @@ -44,14 +44,14 @@ "section-appearance": "מראה חיצוני", "appearance/themes": "ערכות נושא", "appearance/skins": "עיצובים", - "appearance/customise": "תוכן מותאם אישי (HTML/JS/CSS)", + "appearance/customise": "תוכן מותאם אישית (HTML/JS/CSS)", - "section-extend": "Extend", + "section-extend": "הרחב", "extend/plugins": "תוספים", "extend/widgets": "וידג'טים", - "extend/rewards": "תגמולים", + "extend/rewards": "פרסים", - "section-social-auth": "אימות חברתי", + "section-social-auth": "אימות חיצוני", "section-plugins": "תוספים", "extend/plugins.install": "תוספים מותקנים", @@ -60,16 +60,16 @@ "advanced/database": "מסד נתונים", "advanced/events": "ארועים", "advanced/hooks": "Hooks", - "advanced/logs": "Logs", + "advanced/logs": "רישומים", "advanced/errors": "שגיאות", "advanced/cache": "עוגיות", - "development/logger": "Logger", + "development/logger": "כותב הרישומים", "development/info": "מידע", "rebuild-and-restart-forum": "בנה והפעל מחדש את הפורום", "restart-forum": "הפעל מחדש את הפורום", "logout": "התנתק", - "view-forum": "צפה בפורום", + "view-forum": "כניסה לפורום", "search.placeholder": "לחץ "/" בכדי לחפש הגדרה", "search.no-results": "אין תוצאות...", diff --git a/public/language/he/email.json b/public/language/he/email.json index 9e1e4c93a0..20b9ebaa02 100644 --- a/public/language/he/email.json +++ b/public/language/he/email.json @@ -21,31 +21,31 @@ "reset.notify.text1": "אנו מודיעים לך שב%1, סיסמתך שונתה בהצלחה.", "reset.notify.text2": "אם לא אישרת בקשה זו, אנא הודע למנהל מיד.", "digest.latest_topics": "נושאים אחרונים מ%1", - "digest.top-topics": "Top topics from %1", - "digest.popular-topics": "Popular topics from %1", + "digest.top-topics": "נושאים עם הכי הרבה הצבעות מ-%1", + "digest.popular-topics": "הנושאים הכי פופולריים מ-%1", "digest.cta": "לחץ כאן כדי לבקר ב %1", "digest.unsub.info": "תקציר זה נשלח אליך על-פי הגדרות החשבון שלך.", "digest.day": "יום", "digest.week": "שבוע", "digest.month": "חודש", "digest.subject": "מקבץ עבור %1", - "digest.title.day": "Your Daily Digest", - "digest.title.week": "Your Weekly Digest", - "digest.title.month": "Your Monthly Digest", + "digest.title.day": "התקציר היומי שלך", + "digest.title.week": "התקציר השבועי שלך", + "digest.title.month": "התקציר החודשי שלך", "notif.chat.subject": "הודעת צ'אט חדשה התקבלה מ%1", "notif.chat.cta": "לחץ כאן כדי להמשיך את השיחה", "notif.chat.unsub.info": "התראה הצ'אט הזו נשלחה אליך על-פי הגדרות החשבון שלך.", "notif.post.unsub.info": "התראת הפוסט הזו נשלחה אליך על-פי הגדרות החשבון שלך.", - "notif.post.unsub.one-click": "Alternatively, unsubscribe from future emails like this, by clicking", - "notif.cta": "To the forum", - "notif.cta-new-reply": "View Post", - "notif.cta-new-chat": "View Chat", - "notif.test.short": "Testing Notifications", - "notif.test.long": "This is a test of the notifications email. Send help!", + "notif.post.unsub.one-click": "ניתן גם להפסיק את קבלת המיילים כמו זה, בלחיצה על", + "notif.cta": "כניסה לפורום", + "notif.cta-new-reply": "הצג פוסט", + "notif.cta-new-chat": "הצג צ'אט", + "notif.test.short": "בדיקת התראות.", + "notif.test.long": "זוהי בדיקה של ההתראות במייל.", "test.text1": "זהו אימייל ניסיון על מנת לוודא שהגדרות המייל בוצעו כהלכה בהגדרות NodeBB.", "unsub.cta": "לחץ כאן לשנות הגדרות אלו", - "unsubscribe": "unsubscribe", - "unsub.success": "You will no longer receive emails from the %1 mailing list", + "unsubscribe": "בטל רישום", + "unsub.success": "אתה לא תקבל יותר מיילים מרשימת התפוצה של %1", "banned.subject": "הורחקת מ %1", "banned.text1": "המשתמש %1 הורחק מ %2.", "banned.text2": "הרחקה זו תמשך עד %1", diff --git a/public/language/he/error.json b/public/language/he/error.json index fa55378caf..47ca223064 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -9,7 +9,7 @@ "invalid-tid": "זהוי נושא שגוי", "invalid-pid": "זהוי פוסט שגוי", "invalid-uid": "זהוי משתמש שגוי", - "invalid-date": "A valid date must be provided", + "invalid-date": "יש לציין תאריך תקין", "invalid-username": "שם משתמש שגוי", "invalid-email": "אימייל שגוי", "invalid-fullname": "שם מלא לא תקין", @@ -30,16 +30,16 @@ "email-invited": "כבר נשלחה הזמנה למייל זה", "email-not-confirmed": "אין באפשרותך לפרסם עד אישור הודעת הדוא\"ל שלך, לחץ כאן כדי לאשר את הדוא\"ל שלך.", "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.", + "email-not-confirmed-email-sent": "האימייל שלך עדין לא אושר. אנא בדוק בתיבת הדואר בנוגע לאישור האימייל שנשלח לך על ידנו. לא תוכל לכתוב פוסטים ולהשתמש בצ'אט לפני אימות המייל שלך.", "no-email-to-confirm": "פורום זה דורש אישור בדוא\"ל, אנא לחץ כאן כדי להכניס לדואר אלקטרוני", "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.", - "digest-not-enabled": "This user does not have digests enabled, or the system default is not configured to send digests", + "sendmail-not-found": "תוכנת sendmail לא נמצאה, נא בדוק שהיא מותקת וניתנת להרצה על ידי המשתמש שמריץ את NodeBB.", + "digest-not-enabled": "משתמש זה ביטל את התקצירים, או שברירת המחדל של המערכת היא לכבות תקצירים.", "username-too-short": "שם משתמש קצר מדי", "username-too-long": "שם משתמש ארוך מדי", "password-too-long": "הסיסמה ארוכה מדי", - "reset-rate-limited": "Too many password reset requests (rate limited)", + "reset-rate-limited": "יותר מידי בקשות לאימות סיסמא (הקצב מוגבל)", "user-banned": "המשתמש מושעה", "user-banned-reason": "מצטערים, חשבון זה הורחק (סיבה: %1)", "user-banned-reason-until": "מצטערים, חשבון זה הורחק עד %1 (סיבה: %2)", @@ -63,11 +63,11 @@ "post-edit-duration-expired-days": "אתה רשאי לערוך פוסט(ים) רק למשך %1 ימים מרגע פרסומו", "post-edit-duration-expired-days-hours": "אתה רשאי לערוך פוסט(ים) רק למשך %1 שעות %2 דקות מרגע פרסומו(ם)", "post-delete-duration-expired": "אתה רשאי למחוק פוסט(ים) רק למשך %1 שניות מרגע פרסומו", - "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting", - "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting", - "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting", - "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting", - "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting", + "post-delete-duration-expired-minutes": "הנך רשאי למחוק תגובה עד %1 דק(ות) מרגע פרסום התגובה.", + "post-delete-duration-expired-minutes-seconds": "הנך רשאי למחוק תגובה עד %1 דק(ות) ו-%2 שני(ות) מרגע פרסום התגובה.", + "post-delete-duration-expired-hours": "הנך רשאי למחוק תגובה עד %1 שע(ות) מרגע פרסום התגובה.", + "post-delete-duration-expired-hours-minutes": "הנך רשאי למחוק פוסט למשך %1 שע(ות) ו-%2 דק(ות) מרגע פרסומו.", + "post-delete-duration-expired-days": "אתה רשאי למחוק פוסט(ים) רק למשך %1 ימים מרגע פרסומם", "post-delete-duration-expired-days-hours": "אתה מורשה למחוק פוסט רק %1 ימים ו %2 שעות אחרי פרסומו", "cant-delete-topic-has-reply": "אינך יכול למחוק נושא אחרי שכבר הגיבו בו.", "cant-delete-topic-has-replies": "לא ניתן למחוק את הנושא לאחר שקיבל %1 תגובות", @@ -85,7 +85,7 @@ "still-uploading": "אנא המתן לסיום ההעלאות", "file-too-big": "הגודל המקסימלי של הקובץ הוא %1 קילובייט - אנא העלה קובץ קטן יותר", "guest-upload-disabled": "העלאת אורחים אינה מאופשרת", - "cors-error": "Unable to upload image due to misconfigured CORS", + "cors-error": "לא ניתן להעלות את התמונה עקב שגיאת CORS.", "already-bookmarked": "כבר הוספת פוסט זה לרשימת המסומנים", "already-unbookmarked": "כבר הסרת פוסט זה מרשימת המסומנים", "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!", @@ -95,7 +95,7 @@ "invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1", "invalid-image-extension": "פורמט תמונה לא תקין", "invalid-file-type": "פורמט הקובץ לא תקין. הפורמטים המורשים הם: %1", - "invalid-image-dimensions": "Image dimensions are too big", + "invalid-image-dimensions": "ממדי התמונה גדולים מדי", "group-name-too-short": "שם הקבוצה קצר מדי", "group-name-too-long": "שם הקבוצה ארוך מידי", "group-already-exists": "הקבוצה כבר קיימת", @@ -105,8 +105,8 @@ "group-needs-owner": "קבוצה זו חייבת לפחות מנהל אחד", "group-already-invited": "משתמש זה כבר הוזמן", "group-already-requested": "בקשת החברות שלך כבר נשלחה", - "group-join-disabled": "You are not able to join this group at this time", - "group-leave-disabled": "You are not able to leave this group at this time", + "group-join-disabled": "אתה לא רשאי להצטרף לקבוצה כרגע", + "group-leave-disabled": "אתה לא רשאי לעזוב את הקבוצה כרגע", "post-already-deleted": "פוסט זה כבר נמחק", "post-already-restored": "פוסט זה כבר שוחזר", "topic-already-deleted": "נושא זה כבר נמחק", @@ -126,34 +126,34 @@ "cant-edit-chat-message": "אתה לא רשאי לערוך הודעה זו", "cant-remove-last-user": "אינך יכול למחוק את המשתמש האחרון", "cant-delete-chat-message": "אתה לא רשאי למחוק הודעה זו", - "chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting", - "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-edit-duration-expired": "אתה רשאי לערוך הודעות צ'אט רק ל-%1 שניות לאחר הפרסום", + "chat-delete-duration-expired": "הנך רשאי למחוק הודעת צ'אט עד %1 דק(ות) מרגע פרסום התגובה.", + "chat-deleted-already": "הודעות הצ'אט הזו כבר נמחקה.", + "chat-restored-already": "הודעות הצ'אט הזו כבר שוחזרה.", "already-voting-for-this-post": "הצבעת כבר בנושא זה", "reputation-system-disabled": "מערכת המוניטין לא פעילה.", "downvoting-disabled": "היכולת להצביע נגד לא פעילה", "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה", "not-enough-reputation-to-flag": "אין לך מוניטין מספק על מנת לסמן את הפוסט הזה", - "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", - "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", - "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", - "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture", - "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture", - "post-already-flagged": "You have already flagged this post", - "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", + "not-enough-reputation-min-rep-website": "אין לך מספיק מוניטין כדי להוסיף אתר", + "not-enough-reputation-min-rep-aboutme": "אין לך מספיק מוניטין כדי להוסיף טקסט אודות", + "not-enough-reputation-min-rep-signature": "אין לך מספיק מוניטין כדי להוסיף חתימה", + "not-enough-reputation-min-rep-profile-picture": "אין לך מספיק מוניטין כדי להוסיף תמונת פרופיל", + "not-enough-reputation-min-rep-cover-picture": "אין לך מספיק מוניטין כדי להוסיף תמונת רקע", + "post-already-flagged": "כבר דיווחת על הפוסט הזה", + "user-already-flagged": "כבר דיווחת על המשתמש הזה", + "post-flagged-too-many-times": "התקבל כבר דיווח על פוסט זה.", + "user-flagged-too-many-times": "התקבל דיווח על משתמש זה.", "self-vote": "אי אפשר להצביע בפרסום שיצרת", - "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", + "too-many-downvotes-today": "אתה יכול להצביע נגד %1 פעמים ביום", + "too-many-downvotes-today-user": "אתה יכול להצביע נגד משתמש %1 פעמים ביום", "reload-failed": "אירעה תקלה ב NodeBB בזמן הטעינה של: \"%1\". המערכת תמשיך להגיש דפים קיימים, אבל כדאי שתשחזר את הפעולות שלך מהפעם האחרונה שהמערכת עבדה כראוי.", "registration-error": "שגיאה בהרשמה", "parse-error": "אירעה שגיאה בעת בעת ניתוח תגובת השרת", "wrong-login-type-email": "בבקשה השתמש בכתובת המייל שלך להתחברות", "wrong-login-type-username": "בבקשה השתמש בשם המשתמש שלך להתחברות", "sso-registration-disabled": "ההרשמה בוטלה ל%1 מהחשבונות, תחילה הרשם עם כתובת דוא\"ל בבקשה", - "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", + "sso-multiple-association": "אתה לא יכול לחבר מספר חשבונות משירות זה לחשבון שלך. אנא בטל את שיוך החשבון הקיים ונסה שוב.", "invite-maximum-met": "הזמנת את הכמות המירבית של אנשים (%1 מתוך %2).", "no-session-found": "לא נמצאו מושבי התחברות!", "not-in-room": "משתמש זה לא בצ'אט", @@ -163,13 +163,13 @@ "invalid-session": "מושב לא תואם", "invalid-session-text": "נראה שסשן ההתחברות שלך כבר לא פעיל. אנא טען מחדש את העמוד.", "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!", - "cannot-block-self": "You cannot block yourself!", - "cannot-block-privileged": "You cannot block administrators or global moderators", - "cannot-block-guest": "Guest are not able to block other users", - "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" + "cant-move-to-same-topic": "אתה לא יכול להעביר פוסט לאותו נושא!", + "cant-move-topic-to-same-category": "לא ניתן להעביר נושא לאותה קטגוריה!", + "cannot-block-self": "אתה לא יכול לחסום את עצמך!", + "cannot-block-privileged": "אתה לא יכול לחסום מנהלים ראשיים ומנהלים גלובליים", + "cannot-block-guest": "אורח לא יכול לחסום משתמשים אחרים", + "already-blocked": "המשתמש כבר חסום", + "already-unblocked": "המשתמש כבר לא חסום", + "no-connection": "נראה שיש בעיות בחיבור האינטרנט שלך..", + "plugin-not-whitelisted": "לא ניתן להתקין את התוסף – ניתן להתקין דרך הניהול רק תוספים שנמצאים ברשימה הלבנה של מנהל החבילות של NodeBB." } \ No newline at end of file diff --git a/public/language/he/flags.json b/public/language/he/flags.json index 1656b0bbf3..bd60a02dbf 100644 --- a/public/language/he/flags.json +++ b/public/language/he/flags.json @@ -67,7 +67,7 @@ "sort-upvotes": "הכי הרבה הצבעות", "sort-replies": "הכי הרבה תגובות", - "modal-title": "Report Content", + "modal-title": "תוכן הדיווח", "modal-body": "אנא ציין את הסיבה לסימון %1 %2 לצורך בקרה. לחלופין, השתמש באחד מכפתורי הדיווח המהיר אם אפשר.", "modal-reason-spam": "זבל", "modal-reason-offensive": "פוגעני", @@ -79,7 +79,7 @@ "modal-submit-confirm-text": "כבר ציינת סיבה. האם אתה בטוח שאתה רוצה לשלוח על ידי דיווח-מהיר?", "modal-submit-confirm-text-help": "שליחת דיווח מהיר תבטל כל סיבה קודמת שהוגדרה.", - "bulk-actions": "Bulk Actions", + "bulk-actions": "פעולות כלליות", "bulk-resolve": "השלם דיווחים", "bulk-success": "%1 דיווחים עודכנו" } \ No newline at end of file diff --git a/public/language/he/ip-blacklist.json b/public/language/he/ip-blacklist.json index 5f1b6a2ffe..7208f8842b 100644 --- a/public/language/he/ip-blacklist.json +++ b/public/language/he/ip-blacklist.json @@ -1,6 +1,6 @@ { "lead": "רשימת IP שחורה", - "description": "Occasionally, a user account ban is not enough of a deterrant. Other times, restricting access to the forum to a specific IP or a range of IPs is the best way to protect a forum. In these scenarios, you can add troublesome IP addresses or entire CIDR blocks to this blacklist, and they will be prevented from logging in to or registering a new account.", + "description": "לעיתים, הרחקת חשבון משתמש אינו מספיק כדי להרתיע. בפעמים אחרות, הגבלת הגישה לפורום ל- IP ספציפי או לטווח של IP היא הדרך הטובה ביותר להגן על הפורום. בתרחישים אלה, תוכלו להוסיף כתובות IP מטרידות או טווחי CIDR שלמים לרשימה השחורה הזו, וימנע מהם להיכנס לחשבון חדש או לרשום אותו.", "active-rules": "כללים פעילים", "validate": "בדיקת רשימה", "apply": "החל רשימה", @@ -14,6 +14,6 @@ "alerts.applied-success": "הרשימה השחורה נשמרה", "analytics.blacklist-hourly": "Figure 1 – כתובות נחסמו ביחס לשעה.", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "analytics.blacklist-daily": "Figure 2 – כתובות נחסמו ביחס ליום.", "ip-banned": "כתובת הIP הורחקה." } \ No newline at end of file diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 797ca6f387..99b0474c1f 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -35,7 +35,7 @@ "user_posted_to_dual": "%1 ו%2 הגיבו ל: %3", "user_posted_to_multiple": "%1 ו%2 אחרים הגיבו ל: %3", "user_posted_topic": "%1 העלה נושא חדש: %2", - "user_edited_post": "%1 has edited a post in %2", + "user_edited_post": "%1 ערך פוסט ב%2", "user_started_following_you": "%1 התחיל לעקוב אחריך.", "user_started_following_you_dual": "%1 ו-%2 התחילו לעקוב אחריך.", "user_started_following_you_multiple": "%1 ו%2 התחילו לעקוב אחריך.", @@ -43,9 +43,9 @@ "new_register_multiple": "ישנן %1 בקשות הרשמה שמחכות לבדיקה.", "flag_assigned_to_you": "דיווח %1 הוקצה עבורך", "post_awaiting_review": "הפוסט ממתין לאישור", - "profile-exported": "%1 profile exported, click to download", - "posts-exported": "%1 posts exported, click to download", - "uploads-exported": "%1 uploads exported, click to download", + "profile-exported": "%1 פרופיל יוצא, לחץ כדי להוריד.", + "posts-exported": "%1 פוסטים יוצאו, לחץ כדי להוריד.", + "uploads-exported": "%1 העלאות יוצאו, לחץ כדי להוריד.", "email-confirmed": "כתובת המייל אושרה", "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.", "email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.", @@ -56,13 +56,13 @@ "notification_and_email": "התראות & דוא\"ל", "notificationType_upvote": "כאשר מישהו מצביע בעד הפוסט שלך", "notificationType_new-topic": "כשמישהו שאתה עוקב אחריו פרסם נושא", - "notificationType_new-reply": "כשתגובה חדשה מפורסמת בנושא שאתה צופה בו", - "notificationType_post-edit": "When a post is edited in a topic you are watching", + "notificationType_new-reply": "כשתגובה חדשה מפורסמת בנושא שאתה עוקב אחריו", + "notificationType_post-edit": "כשפוסט נערך בנושא שאתה עוקב אחריו", "notificationType_follow": "כשמישהו מתחיל לעקוב אחריך", "notificationType_new-chat": "כשאתה מקבל הודעת צאט", - "notificationType_new-group-chat": "When you receive a group chat message", + "notificationType_new-group-chat": "כשאתה מקבל הודעת צ'אט קבוצתית", "notificationType_group-invite": "כשאתה מקבל הזמנה מקבוצה", - "notificationType_group-request-membership": "When someone requests to join a group you own", + "notificationType_group-request-membership": "כשמישהו מבקש להירשם לקבוצה שאתה מנהל", "notificationType_new-register": "כאשר מישהו מתווסף לתור הרישום", "notificationType_post-queue": "כשהודעה חדשה נכנסת לתור", "notificationType_new-post-flag": "כאשר פוסט מסומן", diff --git a/public/language/he/register.json b/public/language/he/register.json index 5e66599e67..0905771a84 100644 --- a/public/language/he/register.json +++ b/public/language/he/register.json @@ -18,8 +18,8 @@ "agree_to_terms_of_use": "אני מסכים לתנאי השימוש", "terms_of_use_error": "אתה מוכרח להסכים לתנאי השימוש", "registration-added-to-queue": "הבקשה שלך להרשמה נשלחה. תקבל בקרוב מייל אישור לכתובת האימייל שהכנסת כשמנהל יאשר את הבקשה.", - "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.", + "registration-queue-average-time": "הזמן הממוצע לאישור משתמשים הוא %1 שעות ו-%2 דקות.", + "registration-queue-auto-approve-time": "חשבונך יאושר תוך %1 שעות.", "interstitial.intro": "אנו דורשים מידע נוסף לפני שנוכל ליצור עבורך את החשבון.", "interstitial.errors-found": "לא הצלחנו להשלים את הרישום שלך:", "gdpr_agree_data": "אני מסכים שפורום זה יאגור ויעבד את נתוני האישיים", diff --git a/public/language/he/reset_password.json b/public/language/he/reset_password.json index 10f58e8c7c..38f8fa4b3e 100644 --- a/public/language/he/reset_password.json +++ b/public/language/he/reset_password.json @@ -7,10 +7,10 @@ "wrong_reset_code.message": "קוד האיפוס שקבלנו שגוי. אנא נסה שוב, או בקש קוד איפוס חדש.", "new_password": "סיסמה חדשה", "repeat_password": "אמת סיסמה", - "changing_password": "Changing Password", + "changing_password": "משנה סיסמה", "enter_email": "אנא הקלד את כתובת האימייל שלך ואנו נשלח לך הוראות כיצד לאפס את חשבונך", "enter_email_address": "הכנס כתובת אימייל", - "password_reset_sent": "If the specified address corresponds to an existing user account, a password reset email was sent. Please note that only one email will be sent per minute.", + "password_reset_sent": "אם כתובת המייל משוייכת לחשבון קיים, לכתובת המוגדרת נשלח מייל לשחזור חשבון. שים לב שרק מייל שחזור אחד ישלח כל דקה.", "invalid_email": "מייל שגוי / כתובת מייל לא נמצאה", "password_too_short": "הסיסמה שבחרת קצרה מדי, אנא בחר סיסמה שונה.", "passwords_do_not_match": "הסיסמאות שהזנת אינן תואמות.", diff --git a/public/language/he/search.json b/public/language/he/search.json index a6682f3938..fcad1a9ea0 100644 --- a/public/language/he/search.json +++ b/public/language/he/search.json @@ -31,7 +31,7 @@ "sort-by": "סדר על-פי", "last-reply-time": "תאריך תגובה אחרון", "topic-title": "כותרת הנושא", - "topic-votes": "Topic votes", + "topic-votes": "הצבעות בנושא", "number-of-replies": "מספר התגובות", "number-of-views": "מספר הצפיות", "topic-start-date": "זמן תחילת הנושא", @@ -44,6 +44,6 @@ "search-preferences-saved": "חפש העדפות שנשמרו", "search-preferences-cleared": "חפש העדפות שנוקו", "show-results-as": "צפה בתוצאות בתור", - "see-more-results": "See more results (%1)", - "search-in-category": "Search in \"%1\"" + "see-more-results": "צפה בתוצאות נוספות (%1)", + "search-in-category": "חפש ב-\"%1\"" } \ No newline at end of file diff --git a/public/language/he/tags.json b/public/language/he/tags.json index 1e52cbc67c..6604da7815 100644 --- a/public/language/he/tags.json +++ b/public/language/he/tags.json @@ -4,5 +4,5 @@ "enter_tags_here": "הכנס תגים כאן, כאשר כל אחד בין %1 ל%2 תווים.", "enter_tags_here_short": "הכנס תגיות", "no_tags": "אין עדיין תגיות.", - "select_tags": "Select Tags" + "select_tags": "בחר תגיות" } \ No newline at end of file diff --git a/public/language/he/users.json b/public/language/he/users.json index 86d603aaf6..eb9adf7bea 100644 --- a/public/language/he/users.json +++ b/public/language/he/users.json @@ -11,7 +11,7 @@ "online-only": "אונליין בלבד", "invite": "הזמן", "prompt-email": "מיילים:", - "groups-to-join": "Groups to be joined when invite is accepted:", + "groups-to-join": "קבוצות שתירשם אליהם כאשר ההזמנה תאושר:", "invitation-email-sent": "מייל הזמנה נשלח ל%1", "user_list": "רשימת משתמשים", "recent_topics": "נושאים אחרונים", diff --git a/public/language/hr/admin/manage/privileges.json b/public/language/hr/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/hr/admin/manage/privileges.json +++ b/public/language/hr/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/hu/admin/manage/privileges.json b/public/language/hu/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/hu/admin/manage/privileges.json +++ b/public/language/hu/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/id/admin/manage/privileges.json b/public/language/id/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/id/admin/manage/privileges.json +++ b/public/language/id/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/it/admin/manage/privileges.json b/public/language/it/admin/manage/privileges.json index 1d3327aab7..3e10a33b8e 100644 --- a/public/language/it/admin/manage/privileges.json +++ b/public/language/it/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Privilegi di gruppo", "user-privileges": "Privilegi utente", "edit-privileges": "Modifica privilegi", + "select-clear-all": "Select/Clear All", "chat": "Chat", "upload-images": "Carica immagini", "upload-files": "Carica file", diff --git a/public/language/ja/admin/manage/privileges.json b/public/language/ja/admin/manage/privileges.json index c747ae74fd..8afef9882b 100644 --- a/public/language/ja/admin/manage/privileges.json +++ b/public/language/ja/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "チャット", "upload-images": "画像をアップロード", "upload-files": "ファイルをアップロード", diff --git a/public/language/ko/admin/manage/privileges.json b/public/language/ko/admin/manage/privileges.json index 797e19bd85..f135f9a1b8 100644 --- a/public/language/ko/admin/manage/privileges.json +++ b/public/language/ko/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "대화", "upload-images": "이미지 업로드", "upload-files": "파일 업로드", diff --git a/public/language/lt/admin/manage/privileges.json b/public/language/lt/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/lt/admin/manage/privileges.json +++ b/public/language/lt/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/lv/admin/manage/privileges.json b/public/language/lv/admin/manage/privileges.json index 3a030df713..1bd5ca057c 100644 --- a/public/language/lv/admin/manage/privileges.json +++ b/public/language/lv/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Sarunāties", "upload-images": "Augšupielādēt bildes", "upload-files": "Augšupielādēt failus", diff --git a/public/language/ms/admin/manage/privileges.json b/public/language/ms/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/ms/admin/manage/privileges.json +++ b/public/language/ms/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/nb/admin/manage/privileges.json b/public/language/nb/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/nb/admin/manage/privileges.json +++ b/public/language/nb/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/nl/admin/manage/privileges.json b/public/language/nl/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/nl/admin/manage/privileges.json +++ b/public/language/nl/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/pl/admin/manage/privileges.json b/public/language/pl/admin/manage/privileges.json index fa3530abac..4e845d4e35 100644 --- a/public/language/pl/admin/manage/privileges.json +++ b/public/language/pl/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Uprawnienia grup", "user-privileges": "Uprawnienia użytkownika", "edit-privileges": "Edytuj uprawnienia", + "select-clear-all": "Select/Clear All", "chat": "Dostęp do czatu", "upload-images": "Przesyłanie zdjęć", "upload-files": "Przesyłanie plików", diff --git a/public/language/pt-BR/admin/manage/privileges.json b/public/language/pt-BR/admin/manage/privileges.json index a54d8b9712..8c669d01a5 100644 --- a/public/language/pt-BR/admin/manage/privileges.json +++ b/public/language/pt-BR/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Conversar", "upload-images": "Enviar Imagens", "upload-files": "Enviar Arquivos", diff --git a/public/language/pt-PT/admin/manage/privileges.json b/public/language/pt-PT/admin/manage/privileges.json index 81e7ad9634..ca35e46541 100644 --- a/public/language/pt-PT/admin/manage/privileges.json +++ b/public/language/pt-PT/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Privilégios de Grupos", "user-privileges": "Privilégios de Utilizadores", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Conversa", "upload-images": "Enviar Imagens", "upload-files": "Enviar Ficheiros", diff --git a/public/language/ro/admin/manage/privileges.json b/public/language/ro/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/ro/admin/manage/privileges.json +++ b/public/language/ro/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/ru/admin/manage/privileges.json b/public/language/ru/admin/manage/privileges.json index 556d5cce86..a09c20ab31 100644 --- a/public/language/ru/admin/manage/privileges.json +++ b/public/language/ru/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Права групп", "user-privileges": "Права пользователей", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Чат", "upload-images": "Загрузка изображений", "upload-files": "Загрузка файлов", diff --git a/public/language/rw/admin/manage/privileges.json b/public/language/rw/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/rw/admin/manage/privileges.json +++ b/public/language/rw/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/sc/admin/manage/privileges.json b/public/language/sc/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/sc/admin/manage/privileges.json +++ b/public/language/sc/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/sk/admin/manage/privileges.json b/public/language/sk/admin/manage/privileges.json index 45f4974589..b787c7dd0f 100644 --- a/public/language/sk/admin/manage/privileges.json +++ b/public/language/sk/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Konverzácia", "upload-images": "Nahrať obrázky", "upload-files": "Nahrať súbory", diff --git a/public/language/sl/admin/manage/privileges.json b/public/language/sl/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/sl/admin/manage/privileges.json +++ b/public/language/sl/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/sr/admin/manage/privileges.json b/public/language/sr/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/sr/admin/manage/privileges.json +++ b/public/language/sr/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/sv/admin/manage/privileges.json b/public/language/sv/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/sv/admin/manage/privileges.json +++ b/public/language/sv/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/th/admin/manage/privileges.json b/public/language/th/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/th/admin/manage/privileges.json +++ b/public/language/th/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/tr/admin/manage/privileges.json b/public/language/tr/admin/manage/privileges.json index 821d8607bf..fd11b7201d 100644 --- a/public/language/tr/admin/manage/privileges.json +++ b/public/language/tr/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Grup Ayrıcalıkları", "user-privileges": "Kullanıcı Ayrıcalıkları", "edit-privileges": "Ayrıcalıkları Düzenle", + "select-clear-all": "Select/Clear All", "chat": "Sohbet", "upload-images": "Resim Yükle", "upload-files": "Dosya Yükle", diff --git a/public/language/uk/admin/manage/privileges.json b/public/language/uk/admin/manage/privileges.json index 08558a58bd..d1ddb942f3 100644 --- a/public/language/uk/admin/manage/privileges.json +++ b/public/language/uk/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "Group Privileges", "user-privileges": "User Privileges", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "Чат", "upload-images": "Завантаження Зображень", "upload-files": "Завантаження Файлів", diff --git a/public/language/vi/admin/manage/privileges.json b/public/language/vi/admin/manage/privileges.json index 3b24b1cc3e..d90fb7893d 100644 --- a/public/language/vi/admin/manage/privileges.json +++ b/public/language/vi/admin/manage/privileges.json @@ -4,6 +4,7 @@ "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", diff --git a/public/language/zh-CN/admin/manage/privileges.json b/public/language/zh-CN/admin/manage/privileges.json index d48c61b0e9..3d8b8bbd72 100644 --- a/public/language/zh-CN/admin/manage/privileges.json +++ b/public/language/zh-CN/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "群组权限", "user-privileges": "用户权限", "edit-privileges": "编辑权限", + "select-clear-all": "Select/Clear All", "chat": "对话", "upload-images": "上传图片", "upload-files": "上传文件", diff --git a/public/language/zh-TW/admin/manage/privileges.json b/public/language/zh-TW/admin/manage/privileges.json index b80f3bf5f6..88d37d2f19 100644 --- a/public/language/zh-TW/admin/manage/privileges.json +++ b/public/language/zh-TW/admin/manage/privileges.json @@ -4,6 +4,7 @@ "group-privileges": "群組權限", "user-privileges": "使用者權限", "edit-privileges": "Edit Privileges", + "select-clear-all": "Select/Clear All", "chat": "聊天", "upload-images": "上傳圖片", "upload-files": "上傳檔案", From c8554b78b9e937687c1caf56fb0d3fb0333d3d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 10:30:33 -0500 Subject: [PATCH 022/116] fix: #8968, don't show topic search if search is not enabled --- public/src/app.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/src/app.js b/public/src/app.js index 4bec1e1e69..7e61d467be 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -444,6 +444,9 @@ app.cacheBuster = null; } app.enableTopicSearch = function (options) { + if (!config.searchEnabled) { + return; + } /* eslint-disable-next-line */ var searchOptions = Object.assign({ in: 'titles' }, options.searchOptions); var quickSearchResults = options.searchElements.resultEl; From 22715d54131e2d768e76c589fcd144e5a11f3bc6 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 10:29:44 -0500 Subject: [PATCH 023/116] refactor: add TopicObjectSlim common schema --- .../components/schemas/TopicObject.yaml | 66 +++- public/openapi/read/topic/tid/id.yaml | 60 +--- public/openapi/read/topic/topic_id.yaml | 46 +-- public/openapi/read/unread.yaml | 306 ++++++++---------- 4 files changed, 209 insertions(+), 269 deletions(-) diff --git a/public/openapi/components/schemas/TopicObject.yaml b/public/openapi/components/schemas/TopicObject.yaml index 590872e03e..2e5085158f 100644 --- a/public/openapi/components/schemas/TopicObject.yaml +++ b/public/openapi/components/schemas/TopicObject.yaml @@ -13,8 +13,7 @@ TopicObject: description: A category identifier mainPid: type: number - description: The post id of the first post in this topic (also called the - "original post") + description: The post id of the first post in this topic (also called the "original post") title: type: string slug: @@ -55,6 +54,7 @@ TopicObject: description: An ISO 8601 formatted date string (complementing `timestamp`) lastposttimeISO: type: string + description: An ISO 8601 formatted date string (complementing `lastposttime`) votes: type: number category: @@ -230,5 +230,65 @@ TopicObject: description: A topic identifier thumb: type: string + pinExpiry: + type: number + description: A UNIX timestamp indicating when a pinned topic will no longer be pinned (i.e. the pin has expired) + pinExpiryISO: + type: string + description: "`pinExpiry` rendered as an ISO 8601 format" required: - - tid \ No newline at end of file + - tid +TopicObjectSlim: + description: The output of a call to `Topics.getTopicField`, these properties are always present no matter the fields passed in + type: object + properties: + tid: + type: number + description: A topic identifier + uid: + type: number + description: A user identifier + cid: + type: number + description: A category identifier + mainPid: + type: number + description: The post id of the first post in this topic (also called the "original post") + postcount: + type: number + viewcount: + type: number + postercount: + type: number + deleted: + type: number + deleterUid: + type: number + locked: + type: number + pinned: + type: number + description: Whether or not this particular topic is pinned to the top of the + category + timestamp: + type: number + timestampISO: + type: string + description: An ISO 8601 formatted date string (complementing `timestamp`) + lastposttime: + type: number + lastposttimeISO: + type: string + description: An ISO 8601 formatted date string (complementing `lastposttime`) + pinExpiry: + type: number + description: A UNIX timestamp indicating when a pinned topic will no longer be pinned (i.e. the pin has expired) + pinExpiryISO: + type: string + description: "`pinExpiry` rendered as an ISO 8601 format" + upvotes: + type: number + downvotes: + type: number + votes: + type: number \ No newline at end of file diff --git a/public/openapi/read/topic/tid/id.yaml b/public/openapi/read/topic/tid/id.yaml index cdc638a1f5..5305a99c7f 100644 --- a/public/openapi/read/topic/tid/id.yaml +++ b/public/openapi/read/topic/tid/id.yaml @@ -15,50 +15,16 @@ get: content: application/json: schema: - type: object - properties: - tid: - type: number - uid: - type: number - cid: - type: number - mainPid: - type: number - teaserPid: - type: number - nullable: true - title: - type: string - slug: - type: string - timestamp: - type: number - lastposttime: - type: number - postercount: - type: number - postcount: - type: number - viewcount: - type: number - deleted: - type: number - locked: - type: number - pinned: - type: number - upvotes: - type: number - downvotes: - type: number - deleterUid: - type: number - titleRaw: - type: string - timestampISO: - type: string - lastposttimeISO: - type: string - votes: - type: number \ No newline at end of file + allOf: + - $ref: ../../../components/schemas/TopicObject.yaml#/TopicObjectSlim + - type: object + properties: + teaserPid: + type: number + nullable: true + title: + type: string + slug: + type: string + titleRaw: + type: string \ No newline at end of file diff --git a/public/openapi/read/topic/topic_id.yaml b/public/openapi/read/topic/topic_id.yaml index 88081d23dc..67f7ef3096 100644 --- a/public/openapi/read/topic/topic_id.yaml +++ b/public/openapi/read/topic/topic_id.yaml @@ -30,62 +30,18 @@ get: application/json: schema: allOf: + - $ref: ../../components/schemas/TopicObject.yaml#/TopicObjectSlim - type: object properties: - tid: - type: number - description: A topic identifier - uid: - type: number - description: A user identifier - cid: - type: number - description: A category identifier title: type: string slug: type: string - timestamp: - type: number - lastposttime: - type: number - postcount: - type: number - viewcount: - type: number - postercount: - type: number - description: The number of unique users who made a post in this topic - mainPid: - type: number - description: The post id of the first post in this topic (also called the - "original post") teaserPid: type: number nullable: true - upvotes: - type: number - downvotes: - type: number - deleted: - type: number - locked: - type: number - pinned: - type: number - description: Whether or not this particular topic is pinned to the top of the - category - deleterUid: - type: number titleRaw: type: string - timestampISO: - type: string - description: An ISO 8601 formatted date string (complementing `timestamp`) - lastposttimeISO: - type: string - votes: - type: number tags: type: array items: diff --git a/public/openapi/read/unread.yaml b/public/openapi/read/unread.yaml index a5fe83348e..e2b48faee9 100644 --- a/public/openapi/read/unread.yaml +++ b/public/openapi/read/unread.yaml @@ -22,162 +22,42 @@ get: topics: type: array items: - type: object - properties: - tid: - type: number - description: A topic identifier - uid: - type: number - description: A user identifier - cid: - type: number - description: A category identifier - mainPid: - type: number - description: The post id of the first post in this topic (also called the - "original post") - title: - type: string - slug: - type: string - timestamp: - type: number - lastposttime: - type: number - postcount: - type: number - viewcount: - type: number - postercount: - type: number - teaserPid: - type: number - nullable: true - upvotes: - type: number - downvotes: - type: number - deleterUid: - type: number - deleted: - type: number - locked: - type: number - pinned: - type: number - description: Whether or not this particular topic is pinned to the top of the - category - titleRaw: - type: string - timestampISO: - type: string - description: An ISO 8601 formatted date string (complementing `timestamp`) - lastposttimeISO: - type: string - votes: - type: number - category: - type: object + allOf: + - $ref: ../components/schemas/TopicObject.yaml#/TopicObjectSlim + - type: object properties: - cid: - type: number - description: A category identifier - name: + title: type: string slug: type: string - icon: - type: string - backgroundImage: - nullable: true - imageClass: + teaserPid: + type: number nullable: true + titleRaw: type: string - bgColor: - type: string - color: - type: string - disabled: - type: number - user: - type: object - properties: - uid: - type: number - description: A user identifier - username: - type: string - description: A friendly name for a given user account - displayname: - type: string - description: This is either username or fullname depending on forum and user settings - fullname: - type: string - userslug: - type: string - description: An URL-safe variant of the username (i.e. lower-cased, spaces - removed, etc.) - reputation: - type: number - postcount: - type: number - picture: - nullable: true - type: string - signature: - nullable: true - type: string - banned: - type: number - status: - type: string - icon:text: - type: string - description: A single-letter representation of a username. This is used in the - auto-generated icon given to users without - an avatar - icon:bgColor: - type: string - description: A six-character hexadecimal colour code assigned to the user. This - value is used in conjunction with - `icon:text` for the user's auto-generated - icon - example: "#f44336" - banned_until_readable: - type: string - required: - - uid - - username - - userslug - - reputation - - postcount - - picture - - signature - - banned - - status - - icon:text - - icon:bgColor - - banned_until_readable - teaser: - type: object - nullable: true - properties: - pid: - type: number - uid: - type: number - description: A user identifier - timestamp: - type: number - tid: - type: number - description: A topic identifier - content: - type: string - timestampISO: - type: string - description: An ISO 8601 formatted date string (complementing `timestamp`) + category: + type: object + properties: + cid: + type: number + description: A category identifier + name: + type: string + slug: + type: string + icon: + type: string + backgroundImage: + nullable: true + imageClass: + nullable: true + type: string + bgColor: + type: string + color: + type: string + disabled: + type: number user: type: object properties: @@ -187,47 +67,125 @@ get: username: type: string description: A friendly name for a given user account + displayname: + type: string + description: This is either username or fullname depending on forum and user settings + fullname: + type: string userslug: type: string description: An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) + reputation: + type: number + postcount: + type: number picture: nullable: true type: string + signature: + nullable: true + type: string + banned: + type: number + status: + type: string icon:text: type: string description: A single-letter representation of a username. This is used in the - auto-generated icon given to users - without an avatar + auto-generated icon given to users without + an avatar icon:bgColor: type: string description: A six-character hexadecimal colour code assigned to the user. This value is used in conjunction with - `icon:text` for the user's - auto-generated icon + `icon:text` for the user's auto-generated + icon example: "#f44336" + banned_until_readable: + type: string + required: + - uid + - username + - userslug + - reputation + - postcount + - picture + - signature + - banned + - status + - icon:text + - icon:bgColor + - banned_until_readable + teaser: + type: object + nullable: true + properties: + pid: + type: number + uid: + type: number + description: A user identifier + timestamp: + type: number + tid: + type: number + description: A topic identifier + content: + type: string + timestampISO: + type: string + description: An ISO 8601 formatted date string (complementing `timestamp`) + user: + type: object + properties: + uid: + type: number + description: A user identifier + username: + type: string + description: A friendly name for a given user account + userslug: + type: string + description: An URL-safe variant of the username (i.e. lower-cased, spaces + removed, etc.) + picture: + nullable: true + type: string + icon:text: + type: string + description: A single-letter representation of a username. This is used in the + auto-generated icon given to users + without an avatar + icon:bgColor: + type: string + description: A six-character hexadecimal colour code assigned to the user. This + value is used in conjunction with + `icon:text` for the user's + auto-generated icon + example: "#f44336" + index: + type: number + tags: + type: array + items: + $ref: ../components/schemas/TagObject.yaml#/TagObject + isOwner: + type: boolean + ignored: + type: boolean + unread: + type: boolean + bookmark: + nullable: true + unreplied: + type: boolean + icons: + type: array + items: + type: string index: type: number - tags: - type: array - items: - $ref: ../components/schemas/TagObject.yaml#/TagObject - isOwner: - type: boolean - ignored: - type: boolean - unread: - type: boolean - bookmark: - nullable: true - unreplied: - type: boolean - icons: - type: array - items: - type: string - index: - type: number topicCount: type: number title: From ad8e7700371b1fc305f512ebdb1ff50f102bfe5f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 10:30:03 -0500 Subject: [PATCH 024/116] feat: add pinExpiry and pinExpiryISO to topic data --- src/topics/data.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/topics/data.js b/src/topics/data.js index 720d2e63ad..f518a5f5c0 100644 --- a/src/topics/data.js +++ b/src/topics/data.js @@ -11,7 +11,7 @@ const plugins = require('../plugins'); const intFields = [ 'tid', 'cid', 'uid', 'mainPid', 'postcount', 'viewcount', 'postercount', 'deleted', 'locked', 'pinned', - 'timestamp', 'upvotes', 'downvotes', 'lastposttime', + 'pinExpiry', 'timestamp', 'upvotes', 'downvotes', 'lastposttime', 'deleterUid', ]; @@ -110,6 +110,10 @@ function modifyTopic(topic, fields) { topic.lastposttimeISO = utils.toISOString(topic.lastposttime); } + if (topic.hasOwnProperty('pinExpiry')) { + topic.pinExpiryISO = utils.toISOString(topic.pinExpiry); + } + if (topic.hasOwnProperty('upvotes') && topic.hasOwnProperty('downvotes')) { topic.votes = topic.upvotes - topic.downvotes; } From 5c3deb4b0ec96b03690b3655502c2f61ba40f982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 10:46:25 -0500 Subject: [PATCH 025/116] fix: #8973, fix timestamp on ban modal --- public/src/sockets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/sockets.js b/public/src/sockets.js index 4c8e1bc5f3..97c95affdf 100644 --- a/public/src/sockets.js +++ b/public/src/sockets.js @@ -179,7 +179,7 @@ socket = window.socket; } function onEventBanned(data) { - var message = data.until ? '[[error:user-banned-reason-until, ' + $.timeago(data.until) + ', ' + data.reason + ']]' : '[[error:user-banned-reason, ' + data.reason + ']]'; + var message = data.until ? '[[error:user-banned-reason-until, ' + utils.toISOString(data.until) + ', ' + data.reason + ']]' : '[[error:user-banned-reason, ' + data.reason + ']]'; bootbox.alert({ title: '[[error:user-banned]]', From 12b3aa0d8f6ded12fdfdf6b45f765df6a5aae4b9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 10:54:55 -0500 Subject: [PATCH 026/116] feat: add translation key for pin icon label with expiry --- public/language/en-GB/topic.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/language/en-GB/topic.json b/public/language/en-GB/topic.json index 8dc2f22401..05b89bb4fc 100644 --- a/public/language/en-GB/topic.json +++ b/public/language/en-GB/topic.json @@ -32,6 +32,7 @@ "tools": "Tools", "locked": "Locked", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", From ad60bc0641d0aaf5f2719d41e5c44d7df4a0b9be Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Nov 2020 15:59:15 +0000 Subject: [PATCH 027/116] fix(deps): update dependency nodebb-theme-persona to v10.2.89 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index d7a7ef3357..f0e0928cdd 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.88", + "nodebb-theme-persona": "10.2.89", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.4", "nodebb-widget-essentials": "4.1.2", From 19fe24933424a7923c6aa25d964dcbbb04493a6d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Nov 2020 16:01:23 +0000 Subject: [PATCH 028/116] fix(deps): update dependency nodebb-theme-vanilla to v11.3.5 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index f0e0928cdd..982b415a83 100644 --- a/install/package.json +++ b/install/package.json @@ -105,7 +105,7 @@ "nodebb-theme-lavender": "5.0.14", "nodebb-theme-persona": "10.2.89", "nodebb-theme-slick": "1.3.3", - "nodebb-theme-vanilla": "11.3.4", + "nodebb-theme-vanilla": "11.3.5", "nodebb-widget-essentials": "4.1.2", "nodemailer": "^6.4.6", "nprogress": "0.2.0", From 5664807d1807857ff663d2c766b190044ec2dfbf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Nov 2020 16:01:15 +0000 Subject: [PATCH 029/116] fix(deps): update dependency nodebb-theme-persona to v10.2.90 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 982b415a83..6899030510 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.89", + "nodebb-theme-persona": "10.2.90", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.5", "nodebb-widget-essentials": "4.1.2", From 5b269bc5aa0df2590eedb3c2c7a0aed425ff1f23 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 11:05:09 -0500 Subject: [PATCH 030/116] chore: fallbacks for nodebb.topic --- public/language/ar/topic.json | 1 + public/language/bg/topic.json | 1 + public/language/bn/topic.json | 1 + public/language/cs/topic.json | 1 + public/language/da/topic.json | 1 + public/language/de/topic.json | 1 + public/language/el/topic.json | 1 + public/language/en-US/topic.json | 1 + public/language/en-x-pirate/topic.json | 1 + public/language/es/topic.json | 1 + public/language/et/topic.json | 1 + public/language/fa-IR/topic.json | 1 + public/language/fi/topic.json | 1 + public/language/fr/topic.json | 1 + public/language/gl/topic.json | 1 + public/language/he/topic.json | 1 + public/language/hr/topic.json | 1 + public/language/hu/topic.json | 1 + public/language/id/topic.json | 1 + public/language/it/topic.json | 1 + public/language/ja/topic.json | 1 + public/language/ko/topic.json | 1 + public/language/lt/topic.json | 1 + public/language/lv/topic.json | 1 + public/language/ms/topic.json | 1 + public/language/nb/topic.json | 1 + public/language/nl/topic.json | 1 + public/language/pl/topic.json | 1 + public/language/pt-BR/topic.json | 1 + public/language/pt-PT/topic.json | 1 + public/language/ro/topic.json | 1 + public/language/ru/topic.json | 1 + public/language/rw/topic.json | 1 + public/language/sc/topic.json | 1 + public/language/sk/topic.json | 1 + public/language/sl/topic.json | 1 + public/language/sr/topic.json | 1 + public/language/sv/topic.json | 1 + public/language/th/topic.json | 1 + public/language/tr/topic.json | 1 + public/language/uk/topic.json | 1 + public/language/vi/topic.json | 1 + public/language/zh-CN/topic.json | 1 + public/language/zh-TW/topic.json | 1 + 44 files changed, 44 insertions(+) diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 7a4d167f84..934a527745 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -29,6 +29,7 @@ "tools": "أدوات", "locked": "مقفل", "pinned": "مثبت", + "pinned-with-expiry": "Pinned until %1", "moved": "منقول", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index ae33515955..ca391a1e80 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -29,6 +29,7 @@ "tools": "Инструменти", "locked": "Заключена", "pinned": "Закачена", + "pinned-with-expiry": "Pinned until %1", "moved": "Преместена", "moved-from": "Преместена от %1", "copy-ip": "Копиране на IP адреса", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index f896cdbd24..2b83a71e0a 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -29,6 +29,7 @@ "tools": "টুলস", "locked": "বন্ধ", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 4a51e68865..7e2dea8dad 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -29,6 +29,7 @@ "tools": "Nástroje", "locked": "Uzamknuto", "pinned": "Připnuto", + "pinned-with-expiry": "Pinned until %1", "moved": "Přesunuto", "moved-from": "Moved from %1", "copy-ip": "Kopírovat IP", diff --git a/public/language/da/topic.json b/public/language/da/topic.json index 94c5dacfb0..746ee0321e 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -29,6 +29,7 @@ "tools": "Værktøjer", "locked": "Låst", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Flyttet", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index b0cee934e6..2530c85fb1 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -29,6 +29,7 @@ "tools": "Werkzeuge", "locked": "Gesperrt", "pinned": "Angeheftet", + "pinned-with-expiry": "Pinned until %1", "moved": "Verschoben", "moved-from": "Moved from %1", "copy-ip": "IP-Adresse Kopieren", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index 7f28aeb626..fb2de10e43 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -29,6 +29,7 @@ "tools": "Εργαλεία", "locked": "Κλειδωμένο", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json index a38f9433fc..6d2c704c8e 100644 --- a/public/language/en-US/topic.json +++ b/public/language/en-US/topic.json @@ -29,6 +29,7 @@ "tools": "Tools", "locked": "Locked", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index a38f9433fc..6d2c704c8e 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -29,6 +29,7 @@ "tools": "Tools", "locked": "Locked", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index 98c6231be0..bb83a4de4a 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -29,6 +29,7 @@ "tools": "Herramientas", "locked": "Cerrado", "pinned": "Fijo", + "pinned-with-expiry": "Pinned until %1", "moved": "Movido", "moved-from": "Moved from %1", "copy-ip": "Copiar IP", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index 7e1a451d1c..266a5ff264 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -29,6 +29,7 @@ "tools": "Tööriistad", "locked": "Lukustatud", "pinned": "Märgistatud", + "pinned-with-expiry": "Pinned until %1", "moved": "Liigutatud", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index 57a6712040..3d6763045c 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -29,6 +29,7 @@ "tools": "ابزارها", "locked": "قفل شده است", "pinned": "سنجاق شده", + "pinned-with-expiry": "Pinned until %1", "moved": "منتقل شده", "moved-from": "Moved from %1", "copy-ip": "کپی IP", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index e3508fef34..1e280acdee 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -29,6 +29,7 @@ "tools": "Työkalut", "locked": "Lukittu", "pinned": "Kiinnitetty", + "pinned-with-expiry": "Pinned until %1", "moved": "Siirretty", "moved-from": "Moved from %1", "copy-ip": "Kopioi IP", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 399972e7a7..a76f9693c1 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -29,6 +29,7 @@ "tools": "Outils", "locked": "Verrouillé", "pinned": "Épinglé", + "pinned-with-expiry": "Pinned until %1", "moved": "Déplacé", "moved-from": "Déplacé de %1", "copy-ip": "Copier l'IP", diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index 91bacd38cb..fc1f5b2d63 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -29,6 +29,7 @@ "tools": "Ferramentas", "locked": "Pechado", "pinned": "Fixo", + "pinned-with-expiry": "Pinned until %1", "moved": "Movido", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index f7f3c94bff..851d3f65a5 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -29,6 +29,7 @@ "tools": "כלים", "locked": "נעול", "pinned": "נעוץ", + "pinned-with-expiry": "Pinned until %1", "moved": "הועבר", "moved-from": "הועבר מ-%1", "copy-ip": "העתק IP", diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index fd3c6ce0a3..a27401f276 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -29,6 +29,7 @@ "tools": "Alati", "locked": "Zaključano", "pinned": "Zakačeno", + "pinned-with-expiry": "Pinned until %1", "moved": "Premješteno", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index b5ddcc01db..889c0c8289 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -29,6 +29,7 @@ "tools": "Eszközök", "locked": "Zárolva", "pinned": "Rögzített", + "pinned-with-expiry": "Pinned until %1", "moved": "Áthelyezett", "moved-from": "Moved from %1", "copy-ip": "IP-cím másolása", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 93a3d03f86..d806d3d2b4 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -29,6 +29,7 @@ "tools": "Perangkat", "locked": "Terkunci", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 4de7332d7d..8106215698 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -29,6 +29,7 @@ "tools": "Strumenti", "locked": "Bloccato", "pinned": "Appeso", + "pinned-with-expiry": "Pinned until %1", "moved": "Spostato", "moved-from": "Spostato da %1", "copy-ip": "Copia indirizzo IP", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 9c1bb2accf..d02cf2f6fe 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -29,6 +29,7 @@ "tools": "ツール", "locked": "ロック", "pinned": "ピンされた", + "pinned-with-expiry": "Pinned until %1", "moved": "移動しました", "moved-from": "Moved from %1", "copy-ip": "IPをコピー", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index f28052fc2a..aa8dc7edaa 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -29,6 +29,7 @@ "tools": "도구", "locked": "잠긴 게시물", "pinned": "고정된 게시물", + "pinned-with-expiry": "Pinned until %1", "moved": "이동된 게시물", "moved-from": "Moved from %1", "copy-ip": "IP 복사", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index a6c2f24fe4..1a6ac1157e 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -29,6 +29,7 @@ "tools": "Įrankiai", "locked": "Užrakinta", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Perkelta", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/lv/topic.json b/public/language/lv/topic.json index c7065f7216..2009861e0e 100644 --- a/public/language/lv/topic.json +++ b/public/language/lv/topic.json @@ -29,6 +29,7 @@ "tools": "Rīki", "locked": "Slēgtie", "pinned": "Piespraustie", + "pinned-with-expiry": "Pinned until %1", "moved": "Pārvietots", "moved-from": "Moved from %1", "copy-ip": "Kopēt IP adresi", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index 2cce10e948..37779531e6 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -29,6 +29,7 @@ "tools": "Perkakas", "locked": "Kunci", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index ae86a6dba1..403af0984a 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -29,6 +29,7 @@ "tools": "Verktøy", "locked": "Låst", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index df807acdbf..559701bac0 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -29,6 +29,7 @@ "tools": "Extra", "locked": "Gesloten", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Verplaatst", "moved-from": "Moved from %1", "copy-ip": "Kopieer IP", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 6975bc7338..eced539558 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -29,6 +29,7 @@ "tools": "Narzędzia", "locked": "Zablokowany", "pinned": "Przypięty", + "pinned-with-expiry": "Pinned until %1", "moved": "Przeniesiony", "moved-from": "Moved from %1", "copy-ip": "Kopiuj IP", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 50198172b4..a314182af6 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -29,6 +29,7 @@ "tools": "Ferramentas", "locked": "Trancado", "pinned": "Fixado", + "pinned-with-expiry": "Pinned until %1", "moved": "Movido", "moved-from": "Moved from %1", "copy-ip": "Copiar IP", diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index 968100b863..83ce7a5f4b 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -29,6 +29,7 @@ "tools": "Ferramentas", "locked": "Bloqueado", "pinned": "Afixado", + "pinned-with-expiry": "Pinned until %1", "moved": "Movido", "moved-from": "Moved from %1", "copy-ip": "Copiar IP", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 29468abb41..6c0cb6a3dd 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -29,6 +29,7 @@ "tools": "Unelte", "locked": "Închis", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 8bd0e00f81..95007ad2a5 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -29,6 +29,7 @@ "tools": "Действия", "locked": "Закрыта", "pinned": "Прикреплена", + "pinned-with-expiry": "Pinned until %1", "moved": "Перенесена", "moved-from": "Moved from %1", "copy-ip": "Копировать IP", diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index 62fc31c281..fcec29f32d 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -29,6 +29,7 @@ "tools": "Ibikoresho", "locked": "Birafungiranye", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index 1068121b5e..732ba8656a 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -29,6 +29,7 @@ "tools": "Ainas", "locked": "Locked", "pinned": "Pinned", + "pinned-with-expiry": "Pinned until %1", "moved": "Moved", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index 055ecf9a24..bf5e9eab74 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -29,6 +29,7 @@ "tools": "Nástroje", "locked": "Uzamknuté", "pinned": "Pripnuté", + "pinned-with-expiry": "Pinned until %1", "moved": "Presunuté", "moved-from": "Moved from %1", "copy-ip": "Kopírovať IP adresu", diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index 50a1770a2f..35d240096d 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -29,6 +29,7 @@ "tools": "Orodja", "locked": "Zaklenjeno", "pinned": "Pripeto", + "pinned-with-expiry": "Pinned until %1", "moved": "Premaknjeno", "moved-from": "Moved from %1", "copy-ip": "Copy IP", diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index 7d0c11555f..659be3f156 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -29,6 +29,7 @@ "tools": "Алатке", "locked": "Закључано", "pinned": "Закачено", + "pinned-with-expiry": "Pinned until %1", "moved": "Премештено", "moved-from": "Moved from %1", "copy-ip": "Копирај IP", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index aac9c5dc61..e663a7c1d1 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -29,6 +29,7 @@ "tools": "Verktyg", "locked": "Låst", "pinned": "Fäst", + "pinned-with-expiry": "Pinned until %1", "moved": "Flyttad", "moved-from": "Moved from %1", "copy-ip": "Kopiera IP", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index af5b612a0f..20e407e618 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -29,6 +29,7 @@ "tools": "เครื่องมือ", "locked": "ถูกล็อก", "pinned": "ถูกปักหมุด", + "pinned-with-expiry": "Pinned until %1", "moved": "ถูกย้าย", "moved-from": "Moved from %1", "copy-ip": "คัดลอก IP", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index 0816900cb2..145c676adf 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -29,6 +29,7 @@ "tools": "Araçlar", "locked": "Kilitli", "pinned": "Sabitlendi", + "pinned-with-expiry": "Pinned until %1", "moved": "Taşındı", "moved-from": "Şuradan taşındı: %1", "copy-ip": "IP Kopyala", diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index afc79fc17f..bd2d6bd39b 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -29,6 +29,7 @@ "tools": "Інструменти", "locked": "Заблокована", "pinned": "Закріплена", + "pinned-with-expiry": "Pinned until %1", "moved": "Переміщена", "moved-from": "Moved from %1", "copy-ip": "Копіювати IP", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index a4115ca2c5..a3cf7bdfaa 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -29,6 +29,7 @@ "tools": "Công cụ", "locked": "Khóa", "pinned": "Đã ghim", + "pinned-with-expiry": "Pinned until %1", "moved": "Chuyển đi", "moved-from": "Moved from %1", "copy-ip": "Sao chép IP", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 6580a4cfcf..6f7796d154 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -29,6 +29,7 @@ "tools": "工具", "locked": "已锁定", "pinned": "已固定", + "pinned-with-expiry": "Pinned until %1", "moved": "已移动", "moved-from": "移自1%版 ", "copy-ip": "复制IP", diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index 4a28540245..7ff78f52aa 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -29,6 +29,7 @@ "tools": "工具", "locked": "已鎖定", "pinned": "已置頂", + "pinned-with-expiry": "Pinned until %1", "moved": "已移動", "moved-from": "Moved from %1", "copy-ip": "複製IP", From fdca8b16ca3a8ddb2d5ad409ea7bedc814b67b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 11:17:28 -0500 Subject: [PATCH 031/116] fix: #8974, dont show wrong message on register queue configs don't support booleans --- install/data/defaults.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/data/defaults.json b/install/data/defaults.json index 2682dde707..29ece08946 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -111,7 +111,7 @@ "maximumInvites": 0, "username:disableEdit": 0, "email:disableEdit": 0, - "email:smtpTransport:pool": false, + "email:smtpTransport:pool": 0, "hideFullname": 0, "hideEmail": 0, "showFullnameAsDisplayName": 0, @@ -140,7 +140,7 @@ "necroThreshold": 7, "categoryWatchState": "watching", "submitPluginUsage": 1, - "showAverageApprovalTime": true, + "showAverageApprovalTime": 1, "autoApproveTime": 0, "maxUserSessions": 10, "useCompression": 0, From dadb2527dae113a023af2517947f94d80ceb1fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 11:34:14 -0500 Subject: [PATCH 032/116] fix: #8974, with password login for approval queue --- src/user/approval.js | 5 ++++- src/user/password.js | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/user/approval.js b/src/user/approval.js index 8ea5916610..507aa7ef1b 100644 --- a/src/user/approval.js +++ b/src/user/approval.js @@ -66,7 +66,10 @@ module.exports = function (User) { } const creation_time = await db.sortedSetScore('registration:queue', username); const uid = await User.create(userData); - await User.setUserField(uid, 'password', userData.hashedPassword); + await User.setUserFields(uid, { + password: userData.hashedPassword, + 'password:shaWrapped': 1, + }); await removeFromQueue(username); await markNotificationRead(username); await plugins.hooks.fire('filter:register.complete', { uid: uid }); diff --git a/src/user/password.js b/src/user/password.js index acb89a6c60..23a2816fd8 100644 --- a/src/user/password.js +++ b/src/user/password.js @@ -17,7 +17,10 @@ module.exports = function (User) { User.isPasswordCorrect = async function (uid, password, ip) { password = password || ''; - var { password: hashedPassword, 'password:shaWrapped': shaWrapped } = await db.getObjectFields('user:' + uid, ['password', 'password:shaWrapped']); + var { + password: hashedPassword, + 'password:shaWrapped': shaWrapped, + } = await db.getObjectFields('user:' + uid, ['password', 'password:shaWrapped']); if (!hashedPassword) { // Non-existant user, submit fake hash for comparison hashedPassword = ''; From 1e7cf1cbc442feed48659047463245706f806d50 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 11:54:27 -0500 Subject: [PATCH 033/116] fix: #8971, disallow flags of privileged users (mods, gmods, admins) --- public/language/en-GB/error.json | 1 + src/controllers/accounts/helpers.js | 1 + src/flags.js | 9 +++++++++ src/privileges/posts.js | 12 ++++++++++-- src/privileges/users.js | 18 ++++++++++++++++++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index 1b054dee4e..1b0b005805 100644 --- a/public/language/en-GB/error.json +++ b/public/language/en-GB/error.json @@ -169,6 +169,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", diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index ed07c2a6f9..08a9fd260d 100644 --- a/src/controllers/accounts/helpers.js +++ b/src/controllers/accounts/helpers.js @@ -70,6 +70,7 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID) { userData.isSelfOrAdminOrGlobalModerator = isSelf || isAdmin || isGlobalModerator; userData.canEdit = results.canEdit; userData.canBan = results.canBanUser; + userData.canFlag = (await privileges.users.canFlag(callerUID, userData.uid)).flag; userData.canChangePassword = isAdmin || (isSelf && !meta.config['password:disableEdit']); userData.isSelf = isSelf; userData.isFollowing = results.isFollowing; diff --git a/src/flags.js b/src/flags.js index ae954d1607..8bf57257fd 100644 --- a/src/flags.js +++ b/src/flags.js @@ -251,6 +251,15 @@ Flags.validate = async function (payload) { throw new Error('[[error:user-banned]]'); } + // Disallow flagging of profiles/content of privileged users + const [targetPrivileged, reporterPrivileged] = await Promise.all([ + user.isPrivileged(target.uid), + user.isPrivileged(reporter.uid), + ]); + if (targetPrivileged && !reporterPrivileged) { + throw new Error('[[error:cant-flag-privileged]]'); + } + if (payload.type === 'post') { const editable = await privileges.posts.canEdit(payload.id, payload.uid); if (!editable.flag && !meta.config['reputation:disabled'] && reporter.reputation < meta.config['min:rep:flag']) { diff --git a/src/privileges/posts.js b/src/privileges/posts.js index cfbfeedb1c..c7ab882aed 100644 --- a/src/privileges/posts.js +++ b/src/privileges/posts.js @@ -176,12 +176,20 @@ module.exports = function (privileges) { }; privileges.posts.canFlag = async function (pid, uid) { - const [userReputation, isAdminOrModerator] = await Promise.all([ + const targetUid = await posts.getPostField(pid, 'uid'); + const [userReputation, isAdminOrModerator, targetPrivileged, reporterPrivileged] = await Promise.all([ user.getUserField(uid, 'reputation'), isAdminOrMod(pid, uid), + user.isPrivileged(targetUid), + user.isPrivileged(uid), ]); const minimumReputation = meta.config['min:rep:flag']; - const canFlag = isAdminOrModerator || (userReputation >= minimumReputation); + let canFlag = isAdminOrModerator || (userReputation >= minimumReputation); + + if (targetPrivileged && !reporterPrivileged) { + canFlag = false; + } + return { flag: canFlag }; }; diff --git a/src/privileges/users.js b/src/privileges/users.js index b23df4d198..4c40f3a3f7 100644 --- a/src/privileges/users.js +++ b/src/privileges/users.js @@ -3,6 +3,8 @@ const _ = require('lodash'); +const user = require('../user'); +const meta = require('../meta'); const groups = require('../groups'); const plugins = require('../plugins'); const helpers = require('./helpers'); @@ -107,6 +109,22 @@ module.exports = function (privileges) { return data.canBan; }; + privileges.users.canFlag = async function (callerUid, uid) { + const [userReputation, targetPrivileged, reporterPrivileged] = await Promise.all([ + user.getUserField(callerUid, 'reputation'), + user.isPrivileged(uid), + user.isPrivileged(callerUid), + ]); + const minimumReputation = meta.config['min:rep:flag']; + let canFlag = reporterPrivileged || (userReputation >= minimumReputation); + + if (targetPrivileged && !reporterPrivileged) { + canFlag = false; + } + + return { flag: canFlag }; + }; + privileges.users.hasBanPrivilege = async uid => await hasGlobalPrivilege('ban', uid); privileges.users.hasInvitePrivilege = async uid => await hasGlobalPrivilege('invite', uid); From 82ca3760120ee229d412cdfd48001221acb8bb08 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 11:58:05 -0500 Subject: [PATCH 034/116] chore: fallbacks for nodebb.error --- public/language/ar/error.json | 1 + public/language/bg/error.json | 1 + public/language/bn/error.json | 1 + public/language/cs/error.json | 1 + public/language/da/error.json | 1 + public/language/de/error.json | 1 + public/language/el/error.json | 1 + public/language/en-US/error.json | 1 + public/language/en-x-pirate/error.json | 1 + public/language/es/error.json | 1 + public/language/et/error.json | 1 + public/language/fa-IR/error.json | 1 + public/language/fi/error.json | 1 + public/language/fr/error.json | 1 + public/language/gl/error.json | 1 + public/language/he/error.json | 1 + public/language/hr/error.json | 1 + public/language/hu/error.json | 1 + public/language/id/error.json | 1 + public/language/it/error.json | 1 + public/language/ja/error.json | 1 + public/language/ko/error.json | 1 + public/language/lt/error.json | 1 + public/language/lv/error.json | 1 + public/language/ms/error.json | 1 + public/language/nb/error.json | 1 + public/language/nl/error.json | 1 + public/language/pl/error.json | 1 + public/language/pt-BR/error.json | 1 + public/language/pt-PT/error.json | 1 + public/language/ro/error.json | 1 + public/language/ru/error.json | 1 + public/language/rw/error.json | 1 + public/language/sc/error.json | 1 + public/language/sk/error.json | 1 + public/language/sl/error.json | 1 + public/language/sr/error.json | 1 + public/language/sv/error.json | 1 + public/language/th/error.json | 1 + public/language/tr/error.json | 1 + public/language/uk/error.json | 1 + public/language/vi/error.json | 1 + public/language/zh-CN/error.json | 1 + public/language/zh-TW/error.json | 1 + 44 files changed, 44 insertions(+) diff --git a/public/language/ar/error.json b/public/language/ar/error.json index db0e62c4a1..4da828ca70 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -144,6 +144,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", diff --git a/public/language/bg/error.json b/public/language/bg/error.json index adbbe80085..7af90b3802 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "Вече сте докладвали този потребител", "post-flagged-too-many-times": "Тази публикация вече е докладвана от други хора", "user-flagged-too-many-times": "Този потребител вече е докладван от други хора", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "Не можете да гласувате за собствената си публикация", "too-many-downvotes-today": "Можете да гласувате отрицателно не повече от %1 пъти на ден", "too-many-downvotes-today-user": "Можете да гласувате отрицателно за потребител не повече от %1 пъти на ден", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 870e3ea1df..9e22c50bab 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -144,6 +144,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", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 54ac427e51..f3a8b77a3f 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -144,6 +144,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": "U svého vlastního příspěvku nemůžete hlasovat", "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", diff --git a/public/language/da/error.json b/public/language/da/error.json index b343475b1b..42217160cc 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -144,6 +144,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", diff --git a/public/language/de/error.json b/public/language/de/error.json index a04522f273..22fe0affb4 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "Du hast diesen Benutzer bereits gemeldet", "post-flagged-too-many-times": "Dieser Beitrag wurde bereits von anderen Benutzern gemeldet", "user-flagged-too-many-times": "Dieser Benutzer wurde bereits von anderen Benutzern gemeldet", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "Du kannst deine eigenen Beiträge nicht bewerten", "too-many-downvotes-today": "Du kannst nur %1 mal am Tag eine schlechte Bewertung abgeben", "too-many-downvotes-today-user": "Du kannst einen Benutzer nur %1 mal am Tag schlecht bewerten", diff --git a/public/language/el/error.json b/public/language/el/error.json index 4f706777c7..bbdfc500da 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -144,6 +144,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", diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index c50e9c05cd..bc38125be6 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -144,6 +144,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", diff --git a/public/language/en-x-pirate/error.json b/public/language/en-x-pirate/error.json index c50e9c05cd..bc38125be6 100644 --- a/public/language/en-x-pirate/error.json +++ b/public/language/en-x-pirate/error.json @@ -144,6 +144,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", diff --git a/public/language/es/error.json b/public/language/es/error.json index 342c3a3c10..d75ccad60c 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -144,6 +144,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": "No puedes votar en tu propio mensaje", "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", diff --git a/public/language/et/error.json b/public/language/et/error.json index 93b5d2f213..3523645fe1 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -144,6 +144,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", diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json index b2b5726174..4c48464af9 100644 --- a/public/language/fa-IR/error.json +++ b/public/language/fa-IR/error.json @@ -144,6 +144,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": "شما نمی توانید به پست خود رای بدهید", "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", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 8befaea4bd..7bb5b3fb35 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -144,6 +144,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", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 0dfa71bab6..7b3d6ebfde 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "Vous avez déjà signalé cet utilisateur", "post-flagged-too-many-times": "Ce message a déjà été signalé par d'autres", "user-flagged-too-many-times": "Cet utilisateur a déjà été signalé par d'autres", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "Vous ne pouvez pas voter sur votre propre message", "too-many-downvotes-today": "Vous ne pouvez noter négativement que %1 fois par jour", "too-many-downvotes-today-user": "Vous ne pouvez noter négativement un utilisateur que %1 fois par jour", diff --git a/public/language/gl/error.json b/public/language/gl/error.json index 3377d8805b..fe9e6b72f9 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -144,6 +144,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", diff --git a/public/language/he/error.json b/public/language/he/error.json index 47ca223064..ba156680e9 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "כבר דיווחת על המשתמש הזה", "post-flagged-too-many-times": "התקבל כבר דיווח על פוסט זה.", "user-flagged-too-many-times": "התקבל דיווח על משתמש זה.", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "אי אפשר להצביע בפרסום שיצרת", "too-many-downvotes-today": "אתה יכול להצביע נגד %1 פעמים ביום", "too-many-downvotes-today-user": "אתה יכול להצביע נגד משתמש %1 פעמים ביום", diff --git a/public/language/hr/error.json b/public/language/hr/error.json index be8b52316f..d0ad8e654e 100644 --- a/public/language/hr/error.json +++ b/public/language/hr/error.json @@ -144,6 +144,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", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index ec4ab33aff..b76bf3d750 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -144,6 +144,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", diff --git a/public/language/id/error.json b/public/language/id/error.json index 615ee12b07..4d2f48fddf 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -144,6 +144,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", diff --git a/public/language/it/error.json b/public/language/it/error.json index c5fcbb72fb..e1b85f3897 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "Hai già segnalato questo utente", "post-flagged-too-many-times": "Questo post è già stato segnalato da altri", "user-flagged-too-many-times": "Questo utente è già stato segnalato da altri", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "Non puoi votare la tua stessa discussione", "too-many-downvotes-today": "È possibile votare negativamente solo %1 volta al giorno", "too-many-downvotes-today-user": "È possibile votare negativamente un utente solo %1 volta al giorno", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index 29e9d24829..bf39fa6c01 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -144,6 +144,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": "自分のポストに評価することはできません。", "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", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index b6c411577e..54c7ea2ed5 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -144,6 +144,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": "자신의 게시물에는 투표 할 수 없습니다.", "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", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 3f1535d6d3..18ecdae867 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -144,6 +144,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": "Negalima balsuoti už savo įrašą", "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", diff --git a/public/language/lv/error.json b/public/language/lv/error.json index a206838a88..40ba1b62c1 100644 --- a/public/language/lv/error.json +++ b/public/language/lv/error.json @@ -144,6 +144,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": "Nevar balsot pats par savu rakstu", "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", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 2844037466..5bc1e320a3 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -144,6 +144,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", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 7a6406736a..1e56997cd2 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -144,6 +144,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", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 6dab2ab6ee..17f7860afe 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "Je hebt deze gebruiker al gerapporteerd", "post-flagged-too-many-times": "Dit bericht is al door anderen gerapporteerd", "user-flagged-too-many-times": "Deze gebruiker is al door anderen gerapporteerd", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "Het is niet mogelijk om op je eigen bericht te stemmen", "too-many-downvotes-today": "Je kunt slecht %1 keer per dag downvoten", "too-many-downvotes-today-user": "Je kunt een gebruiker slecht %1 keer per dag downvoten", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 9d9d0264b8..00cb18650d 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "Ten użytkownik został już przez ciebie oflagowany", "post-flagged-too-many-times": "Ten post został już oflagowany przez innych użytkowników", "user-flagged-too-many-times": "Ten użytkownik został już oflagowany przez innych użytkowników", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "Nie możesz głosować na swój własny wpis.", "too-many-downvotes-today": "Możesz głosować przeciw postowi tylko %1 razy dziennie", "too-many-downvotes-today-user": "Możesz głosować przeciwko użytkownikowi tylko %1 razy dziennie", diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json index 8659e2babe..ccc6730a55 100644 --- a/public/language/pt-BR/error.json +++ b/public/language/pt-BR/error.json @@ -144,6 +144,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": "Você não pode votar no seu próprio 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", diff --git a/public/language/pt-PT/error.json b/public/language/pt-PT/error.json index 68cee9c04d..5c679c6621 100644 --- a/public/language/pt-PT/error.json +++ b/public/language/pt-PT/error.json @@ -144,6 +144,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": "Não podes votar na tua própria publicação", "too-many-downvotes-today": "Tu só podes votar negativamente %1 vezes por dia", "too-many-downvotes-today-user": "Tu só podes votar negativamente um utilizador %1 vezes por dia", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 6b3a0ce877..3ae027e399 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -144,6 +144,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", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 073729fefa..703554e400 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "Вы уже пожаловались на этого пользователя", "post-flagged-too-many-times": "На это сообщение уже пожаловались другие пользователи", "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": "Вы не можете голосовать за свои собственные сообщения", "too-many-downvotes-today": "Вы можете проголосовать против только %1 раз за день", "too-many-downvotes-today-user": "Вы можете проголосовать против участника только %1 раз за день.", diff --git a/public/language/rw/error.json b/public/language/rw/error.json index 9dc57e058e..41de06bec4 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -144,6 +144,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", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index c50e9c05cd..bc38125be6 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -144,6 +144,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", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index ab126c2bb8..9095048ff2 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -144,6 +144,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": "Za svoj vlastný príspevok nemôžete hlasovať", "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", diff --git a/public/language/sl/error.json b/public/language/sl/error.json index a90966f1d1..4b5b3c9f06 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -144,6 +144,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", diff --git a/public/language/sr/error.json b/public/language/sr/error.json index 1ce2004430..bdf711e82c 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -144,6 +144,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": "Не можете гласати за своју поруку", "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", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 8a41d072b9..78ced4cccf 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -144,6 +144,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": "Du kan inte rösta på ditt eget inlägg.", "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", diff --git a/public/language/th/error.json b/public/language/th/error.json index 4d35c24254..f614f6c299 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -144,6 +144,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", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 9d70592675..ddef7c83dd 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "Bu kullanıcıyı önceden şikayet etmişsiniz.", "post-flagged-too-many-times": "Bu ileti başkaları tarafından halihazırda şikayet edilmiş.", "user-flagged-too-many-times": "Bu kullanıcı başkaları tarafından halihazırda şikayet edilmiş.", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "Kendi iletinize oy veremezsiniz", "too-many-downvotes-today": "Bir günde sadece %1 eksi oy verebilirsiniz", "too-many-downvotes-today-user": "Bir kullanıcıya bir günde sadece %1 eksi oy verebilirsiniz", diff --git a/public/language/uk/error.json b/public/language/uk/error.json index b9a542a5ec..88733c3b30 100644 --- a/public/language/uk/error.json +++ b/public/language/uk/error.json @@ -144,6 +144,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": "Ви не можете проголосувати за власний пост", "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", diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 458760585f..68b71c19ce 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -144,6 +144,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": "Bạn không thể tự bầu cho bài đăng của mình", "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", diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index bdb7df459a..295f877add 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -144,6 +144,7 @@ "user-already-flagged": "您已举报此用户", "post-flagged-too-many-times": "此贴已被其他用户举报", "user-flagged-too-many-times": "此用户已被其他用户举报", + "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "您不能对您自己的帖子投票", "too-many-downvotes-today": "您每天只能踩 %1 次", "too-many-downvotes-today-user": "您每天只能对一个用户踩 %1 次", diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json index 3bdcf3ba32..c68df18241 100644 --- a/public/language/zh-TW/error.json +++ b/public/language/zh-TW/error.json @@ -144,6 +144,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": "您不能讚您自己的貼文", "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", From bf171adc8362decff3473958ee9b5a723fc464c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 12:26:45 -0500 Subject: [PATCH 035/116] fix: #8979 --- install/data/defaults.json | 1 + src/controllers/tags.js | 1 + 2 files changed, 2 insertions(+) diff --git a/install/data/defaults.json b/install/data/defaults.json index 29ece08946..aee61b65df 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -104,6 +104,7 @@ "maximumGroupTitleLength": 40, "preventTopicDeleteAfterReplies": 0, "feeds:disableSitemap": 0, + "feeds:disableRSS": 0, "sitemapTopics": 500, "maintenanceMode": 0, "maintenanceModeStatus": 503, diff --git a/src/controllers/tags.js b/src/controllers/tags.js index 9191aa07c3..1484a12a37 100644 --- a/src/controllers/tags.js +++ b/src/controllers/tags.js @@ -53,6 +53,7 @@ tagsController.getTag = async function (req, res) { templateData.pagination = pagination.create(page, pageCount); helpers.addLinkTags({ url: 'tags/' + tag, res: req.res, tags: templateData.pagination.rel }); + templateData['feeds:disableRSS'] = meta.config['feeds:disableRSS']; templateData.rssFeedUrl = nconf.get('relative_path') + '/tags/' + tag + '.rss'; res.render('tag', templateData); }; From f4d217d829b67efa0f4de7a9ac2efbe8771128b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 12:38:43 -0500 Subject: [PATCH 036/116] fix: #8980, fix lang string --- src/socket.io/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 9dad7cda4b..9d57d08c68 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -165,7 +165,8 @@ async function checkMaintenance(socket) { if (isAdmin) { return; } - throw new Error('[[error:forum-maintenance]]'); + const validator = require('validator'); + throw new Error('[[pages:maintenance.text, ' + validator.escape(String(meta.config.title || 'NodeBB')) + ']]'); } const getSessionAsync = util.promisify((sid, callback) => db.sessionStore.get(sid, (err, sessionObj) => callback(err, sessionObj || null))); From 88e5cda5b4a0e56488f01e34eef54173069f05cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 12:46:12 -0500 Subject: [PATCH 037/116] fix: spec for /tag --- public/openapi/read/tags/tag.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/openapi/read/tags/tag.yaml b/public/openapi/read/tags/tag.yaml index cae61daf61..aaa2138a37 100644 --- a/public/openapi/read/tags/tag.yaml +++ b/public/openapi/read/tags/tag.yaml @@ -255,6 +255,8 @@ get: type: string rssFeedUrl: type: string + feeds:disableRSS: + type: boolean required: - topics - tag From f5714452b1824431d36a4fba534f07856035485d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Nov 2020 17:53:52 +0000 Subject: [PATCH 038/116] fix(deps): update dependency nodebb-plugin-markdown to v8.12.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 6899030510..72e50323fe 100644 --- a/install/package.json +++ b/install/package.json @@ -97,7 +97,7 @@ "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-markdown": "8.12.2", "nodebb-plugin-mentions": "2.13.5", "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.7.6", From 1b1205a9ced3f8033ed7c652efeea451c01fc23c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 13:36:25 -0500 Subject: [PATCH 039/116] fix(spec): broken test due to canFlag addition --- .../components/schemas/UserObject.yaml | 2 + .../openapi/read/user/userslug/watched.yaml | 191 +----------------- 2 files changed, 3 insertions(+), 190 deletions(-) diff --git a/public/openapi/components/schemas/UserObject.yaml b/public/openapi/components/schemas/UserObject.yaml index 2edc402156..d1621e13df 100644 --- a/public/openapi/components/schemas/UserObject.yaml +++ b/public/openapi/components/schemas/UserObject.yaml @@ -412,6 +412,8 @@ UserObjectFull: type: boolean canBan: type: boolean + canFlag: + type: boolean canChangePassword: type: boolean isSelf: diff --git a/public/openapi/read/user/userslug/watched.yaml b/public/openapi/read/user/userslug/watched.yaml index 9069465791..11e6cf9266 100644 --- a/public/openapi/read/user/userslug/watched.yaml +++ b/public/openapi/read/user/userslug/watched.yaml @@ -16,200 +16,11 @@ get: application/json: schema: allOf: - - $ref: ../../../components/schemas/UserObject.yaml#/UserObject + - $ref: ../../../components/schemas/UserObject.yaml#/UserObjectFull - type: object properties: - aboutmeParsed: - type: string - age: - type: number - emailClass: - type: string - ips: - type: array - items: - type: string - counts: - type: object - properties: - best: - type: number - blocks: - type: number - bookmarks: - type: number - categoriesWatched: - type: number - downvoted: - type: number - followers: - type: number - following: - type: number - groups: - type: number - ignored: - type: number - posts: - type: number - topics: - type: number - uploaded: - type: number - upvoted: - type: number - watched: - type: number - isBlocked: - type: boolean - blocksCount: - type: number - yourid: - type: number - theirid: - type: number - isTargetAdmin: - type: boolean - isAdmin: - type: boolean - isGlobalModerator: - type: boolean - isModerator: - type: boolean - isAdminOrGlobalModerator: - type: boolean - isAdminOrGlobalModeratorOrModerator: - type: boolean - isSelfOrAdminOrGlobalModerator: - type: boolean - canEdit: - type: boolean - canBan: - type: boolean - canChangePassword: - type: boolean - isSelf: - type: boolean - isFollowing: - type: boolean - hasPrivateChat: - type: number - showHidden: - type: boolean - groups: - type: array - items: - type: object - properties: - name: - type: string - slug: - type: string - createtime: - type: number - userTitle: - type: string - description: - type: string - memberCount: - type: number - deleted: - oneOf: - - type: string - - type: number - hidden: - type: number - system: - type: number - private: - type: number - ownerUid: - type: number - icon: - type: string - labelColor: - type: string - userTitleEnabled: - type: number - disableJoinRequests: - type: number - disableLeave: - type: number - nameEncoded: - type: string - displayName: - type: string - textColor: - type: string - createtimeISO: - type: string - cover:thumb:url: - type: string - cover:url: - type: string - cover:position: - type: string - disableSignatures: - type: boolean - reputation:disabled: - type: boolean - downvote:disabled: - type: boolean - profile_links: - type: array - items: - type: object - properties: - id: - type: string - route: - type: string - name: - type: string - visibility: - type: object - properties: - self: - type: boolean - other: - type: boolean - moderator: - type: boolean - globalMod: - type: boolean - admin: - type: boolean - canViewInfo: - type: boolean - public: - type: boolean - icon: - type: string - sso: - type: array - items: - type: object - properties: - associated: - type: boolean - url: - type: string - deauthUrl: - type: string - name: - type: string - icon: - type: string - websiteLink: - type: string - websiteName: - type: string moderationNote: type: string - username:disableEdit: - type: boolean - email:disableEdit: - type: boolean topics: type: array items: From 007a3258a01532c38fd4fce6281b4b9e2799783d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 15:12:55 -0500 Subject: [PATCH 040/116] feat: add handler for 501 api response --- src/controllers/helpers.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 62ee51106c..78772b065d 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -448,6 +448,12 @@ helpers.generateError = (statusCode, message) => { case 500: payload.status.code = 'internal-server-error'; payload.status.message = message || payload.status.message; + break; + + case 501: + payload.status.code = 'not-implemented'; + payload.status.message = message || 'The route you are trying to call is not implemented yet, please try again tomorrow'; + break; } return payload; From 6e6a7a8f8a9a75500ba1f336cabc882234212f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 15:38:22 -0500 Subject: [PATCH 041/116] fix: #8969, export csv to file --- public/language/en-GB/admin/manage/users.json | 4 ++- public/language/en-GB/notifications.json | 1 + public/src/admin/manage/users.js | 28 ++++++++++++++++ src/controllers/admin/users.js | 33 +++++++++++-------- src/socket.io/admin/user.js | 25 ++++++++++++++ src/user/admin.js | 29 +++++++++++++++- src/views/admin/manage/users.tpl | 2 +- 7 files changed, 106 insertions(+), 16 deletions(-) diff --git a/public/language/en-GB/admin/manage/users.json b/public/language/en-GB/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/en-GB/admin/manage/users.json +++ b/public/language/en-GB/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/en-GB/notifications.json b/public/language/en-GB/notifications.json index 17d7a23bdf..92811490ff 100644 --- a/public/language/en-GB/notifications.json +++ b/public/language/en-GB/notifications.json @@ -50,6 +50,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index bba44bf21d..a6f9c887d3 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -13,6 +13,34 @@ define('admin/manage/users', [ ajaxify.go(window.location.pathname + '?' + qs); }); + $('.export-csv').on('click', function () { + socket.once('event:export-users-csv', function () { + app.removeAlert('export-users-start'); + app.alert({ + alert_id: 'export-users', + type: 'success', + title: '[[global:alert.success]]', + message: '[[admin/manage/users:export-users-completed]]', + clickfn: function () { + window.location.href = config.relative_path + '/api/admin/users/csv'; + }, + timeout: 0, + }); + }); + socket.emit('admin.user.exportUsersCSV', {}, function (err) { + if (err) { + return app.alertError(err); + } + app.alert({ + alert_id: 'export-users-start', + message: '[[admin/manage/users:export-users-started]]', + timeout: (ajaxify.data.userCount / 5000) * 500, + }); + }); + + return false; + }); + function getSelectedUids() { var uids = []; diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js index ccb7fa1e42..2e5cd2438a 100644 --- a/src/controllers/admin/users.js +++ b/src/controllers/admin/users.js @@ -1,6 +1,5 @@ 'use strict'; -const nconf = require('nconf'); const validator = require('validator'); const user = require('../../user'); @@ -242,7 +241,7 @@ async function render(req, res, data) { filterBy.forEach(function (filter) { data['filterBy_' + validator.escape(String(filter))] = true; }); - + data.userCount = await db.getObjectField('global', 'userCount'); if (data.adminInviteOnly) { data.showInviteButton = await privileges.users.isAdministrator(req.uid); } else { @@ -252,19 +251,27 @@ async function render(req, res, data) { res.render('admin/manage/users', data); } -usersController.getCSV = async function (req, res) { - var referer = req.headers.referer; - - if (!referer || !referer.replace(nconf.get('url'), '').startsWith('/admin/manage/users')) { - return res.status(403).send('[[error:invalid-origin]]'); - } - events.log({ +usersController.getCSV = async function (req, res, next) { + await events.log({ type: 'getUsersCSV', uid: req.uid, ip: req.ip, }); - const data = await user.getUsersCSV(); - res.attachment('users.csv'); - res.setHeader('Content-Type', 'text/csv'); - res.end(data); + const path = require('path'); + const { baseDir } = require('../../constants').paths; + res.sendFile('users.csv', { + root: path.join(baseDir, 'build/export'), + headers: { + 'Content-Type': 'text/csv', + 'Content-Disposition': 'attachment; filename=users.csv', + }, + }, function (err) { + if (err) { + if (err.code === 'ENOENT') { + res.locals.isAPI = false; + return next(); + } + return next(err); + } + }); }; diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js index 91dfb49646..bf0325e484 100644 --- a/src/socket.io/admin/user.js +++ b/src/socket.io/admin/user.js @@ -1,6 +1,7 @@ 'use strict'; const async = require('async'); +const winston = require('winston'); const db = require('../../database'); const api = require('../../api'); @@ -157,3 +158,27 @@ User.loadGroups = async function (socket, uids) { }); return { users: userData }; }; + +User.exportUsersCSV = async function (socket) { + await events.log({ + type: 'exportUsersCSV', + uid: socket.uid, + ip: socket.ip, + }); + setTimeout(async function () { + try { + await user.exportUsersCSV(); + socket.emit('event:export-users-csv'); + const notifications = require('../../notifications'); + const n = await notifications.create({ + bodyShort: '[[notifications:users-csv-exported]]', + path: '/api/admin/users/csv', + nid: 'users:csv:export', + from: socket.uid, + }); + await notifications.push(n, [socket.uid]); + } catch (err) { + winston.error(err); + } + }, 0); +}; diff --git a/src/user/admin.js b/src/user/admin.js index 981fd921b4..45226bfe85 100644 --- a/src/user/admin.js +++ b/src/user/admin.js @@ -1,9 +1,12 @@ 'use strict'; +const fs = require('fs'); +const path = require('path'); const winston = require('winston'); const validator = require('validator'); +const { baseDir } = require('../constants').paths; const db = require('../database'); const plugins = require('../plugins'); const batch = require('../batch'); @@ -36,11 +39,35 @@ module.exports = function (User) { await batch.processSortedSet('users:joindate', async (uids) => { const usersData = await User.getUsersFields(uids, data.fields); csvContent += usersData.reduce((memo, user) => { - memo += user.email + ',' + user.username + ',' + user.uid + '\n'; + memo += data.fields.map(field => user[field]).join(',') + '\n'; return memo; }, ''); }, {}); return csvContent; }; + + User.exportUsersCSV = async function () { + winston.verbose('[user/exportUsersCSV] Exporting User CSV data'); + + const data = await plugins.hooks.fire('filter:user.csvFields', { fields: ['email', 'username', 'uid'] }); + const fd = await fs.promises.open( + path.join(baseDir, 'build/export', 'users.csv'), + 'w' + ); + fs.promises.appendFile(fd, data.fields.join(',') + '\n'); + await batch.processSortedSet('users:joindate', async (uids) => { + const usersData = await User.getUsersFields(uids, data.fields.slice()); + let line = ''; + usersData.forEach(function (user) { + line += data.fields.map(field => user[field]).join(',') + '\n'; + }); + + await fs.promises.appendFile(fd, line); + }, { + batch: 5000, + interval: 250, + }); + await fd.close(); + }; }; diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 826ed34411..0cdd099ae2 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -6,7 +6,7 @@ - [[admin/manage/users:download-csv]] + [[admin/manage/users:download-csv]]
    From 88a60473d90f86ec27de46f79d9038f5ee4276fe Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 15:45:09 -0500 Subject: [PATCH 042/116] fix(spec): breaking tests --- test/controllers-admin.js | 40 ++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/test/controllers-admin.js b/test/controllers-admin.js index 61a6217ed8..42bbbc90ca 100644 --- a/test/controllers-admin.js +++ b/test/controllers-admin.js @@ -17,8 +17,10 @@ describe('Admin Controllers', function () { var tid; var cid; var pid; + let regularPid; var adminUid; var regularUid; + let regular2Uid; var moderatorUid; var jar; @@ -36,24 +38,30 @@ describe('Admin Controllers', function () { regularUid: function (next) { user.create({ username: 'regular' }, next); }, + regular2Uid: function (next) { + user.create({ username: 'regular2' }, next); + }, moderatorUid: function (next) { user.create({ username: 'moderator', password: 'modmod' }, next); }, - }, function (err, results) { + }, async function (err, results) { if (err) { return done(err); } adminUid = results.adminUid; regularUid = results.regularUid; + regular2Uid = results.regular2Uid; moderatorUid = results.moderatorUid; cid = results.category.cid; - topics.post({ uid: adminUid, title: 'test topic title', content: 'test topic content', cid: results.category.cid }, function (err, result) { - assert.ifError(err); - tid = result.topicData.tid; - pid = result.postData.pid; - done(); - }); + const adminPost = await topics.post({ uid: adminUid, title: 'test topic title', content: 'test topic content', cid: results.category.cid }); + assert.ifError(err); + tid = adminPost.topicData.tid; + pid = adminPost.postData.pid; + + const regularPost = await topics.post({ uid: regular2Uid, title: 'regular user\'s test topic title', content: 'test topic content', cid: results.category.cid }); + regularPid = regularPost.postData.pid; + done(); }); }); @@ -610,12 +618,22 @@ describe('Admin Controllers', function () { }); }); + it('should error when you attempt to flag a privileged user\'s post', async () => { + var socketFlags = require('../src/socket.io/flags'); + var oldValue = meta.config['min:rep:flag']; + try { + await socketFlags.create({ uid: regularUid }, { id: pid, type: 'post', reason: 'spam' }); + } catch (err) { + assert.strictEqual(err.message, '[[error:cant-flag-privileged]]'); + } + }); + it('should error with not enough reputation to flag', function (done) { var socketFlags = require('../src/socket.io/flags'); var oldValue = meta.config['min:rep:flag']; meta.config['min:rep:flag'] = 1000; - socketFlags.create({ uid: regularUid }, { id: pid, type: 'post', reason: 'spam' }, function (err) { - assert.equal(err.message, '[[error:not-enough-reputation-to-flag]]'); + socketFlags.create({ uid: regularUid }, { id: regularPid, type: 'post', reason: 'spam' }, function (err) { + assert.strictEqual(err.message, '[[error:not-enough-reputation-to-flag]]'); meta.config['min:rep:flag'] = oldValue; done(); }); @@ -625,7 +643,7 @@ describe('Admin Controllers', function () { var socketFlags = require('../src/socket.io/flags'); var oldValue = meta.config['min:rep:flag']; meta.config['min:rep:flag'] = 0; - socketFlags.create({ uid: regularUid }, { id: pid, type: 'post', reason: 'spam' }, function (err, flagId) { + socketFlags.create({ uid: regularUid }, { id: regularPid, type: 'post', reason: 'spam' }, function (err, flagId) { meta.config['min:rep:flag'] = oldValue; assert.ifError(err); request(nconf.get('url') + '/api/flags/' + flagId, { jar: moderatorJar, json: true }, function (err, res, body) { @@ -633,7 +651,7 @@ describe('Admin Controllers', function () { assert(body); assert(body.reports); assert(Array.isArray(body.reports)); - assert.equal(body.reports[0].reporter.username, 'regular'); + assert.strictEqual(body.reports[0].reporter.username, 'regular'); done(); }); }); From acb576662e93babaae3045234f1779f0d2eb2543 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 15:51:56 -0500 Subject: [PATCH 043/116] fix(spec): from 6e6a7a8f8a9a75500ba1f336cabc882234212f88 --- public/openapi/read/admin/manage/users.yaml | 2 ++ src/controllers/admin/users.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/openapi/read/admin/manage/users.yaml b/public/openapi/read/admin/manage/users.yaml index c3278c007b..80dbed1728 100644 --- a/public/openapi/read/admin/manage/users.yaml +++ b/public/openapi/read/admin/manage/users.yaml @@ -27,6 +27,8 @@ get: type: string sort_lastonline: type: boolean + userCount: + type: number showInviteButton: type: boolean inviteOnly: diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js index 2e5cd2438a..438b0aae78 100644 --- a/src/controllers/admin/users.js +++ b/src/controllers/admin/users.js @@ -241,7 +241,7 @@ async function render(req, res, data) { filterBy.forEach(function (filter) { data['filterBy_' + validator.escape(String(filter))] = true; }); - data.userCount = await db.getObjectField('global', 'userCount'); + data.userCount = parseInt(await db.getObjectField('global', 'userCount'), 10); if (data.adminInviteOnly) { data.showInviteButton = await privileges.users.isAdministrator(req.uid); } else { From 4afdf8bc275ea6f73527711422af54afe6ab1604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 16:04:44 -0500 Subject: [PATCH 044/116] fix: spec, remove old tests --- public/openapi/read/admin/manage/users.yaml | 2 ++ test/controllers-admin.js | 23 --------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/public/openapi/read/admin/manage/users.yaml b/public/openapi/read/admin/manage/users.yaml index c3278c007b..713ccb9c7b 100644 --- a/public/openapi/read/admin/manage/users.yaml +++ b/public/openapi/read/admin/manage/users.yaml @@ -15,6 +15,8 @@ get: type: array items: $ref: ../../../components/schemas/UserObject.yaml#/UserObjectACP + userCount: + type: number page: type: number pageCount: diff --git a/test/controllers-admin.js b/test/controllers-admin.js index 61a6217ed8..fe88abd456 100644 --- a/test/controllers-admin.js +++ b/test/controllers-admin.js @@ -255,29 +255,6 @@ describe('Admin Controllers', function () { }); }); - it('should return 403 if no referer', function (done) { - request(nconf.get('url') + '/api/admin/users/csv', { jar: jar }, function (err, res, body) { - assert.ifError(err); - assert.equal(res.statusCode, 403); - assert.equal(body, '[[error:invalid-origin]]'); - done(); - }); - }); - - it('should return 403 if referer is not /admin/users/csv', function (done) { - request(nconf.get('url') + '/api/admin/users/csv', { - jar: jar, - headers: { - referer: '/topic/1/test', - }, - }, function (err, res, body) { - assert.ifError(err); - assert.equal(res.statusCode, 403); - assert.equal(body, '[[error:invalid-origin]]'); - done(); - }); - }); - it('should load /admin/users/csv', function (done) { request(nconf.get('url') + '/api/admin/users/csv', { jar: jar, From 3de692cd522aa72f3cab9fbfd48285a737560917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 16:07:52 -0500 Subject: [PATCH 045/116] fix: csv test --- test/controllers-admin.js | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/test/controllers-admin.js b/test/controllers-admin.js index 09691f4766..3befc0367c 100644 --- a/test/controllers-admin.js +++ b/test/controllers-admin.js @@ -264,16 +264,22 @@ describe('Admin Controllers', function () { }); it('should load /admin/users/csv', function (done) { - request(nconf.get('url') + '/api/admin/users/csv', { - jar: jar, - headers: { - referer: nconf.get('url') + '/admin/manage/users', - }, - }, function (err, res, body) { + const socketAdmin = require('../src/socket.io/admin'); + socketAdmin.user.exportUsersCSV({ uid: adminUid }, {}, function (err) { assert.ifError(err); - assert.equal(res.statusCode, 200); - assert(body); - done(); + setTimeout(function () { + request(nconf.get('url') + '/api/admin/users/csv', { + jar: jar, + headers: { + referer: nconf.get('url') + '/admin/manage/users', + }, + }, function (err, res, body) { + assert.ifError(err); + assert.equal(res.statusCode, 200); + assert(body); + done(); + }); + }, 2000); }); }); From cbbda45102fd95ec934c038f1be577db0f8b25ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 16:10:30 -0500 Subject: [PATCH 046/116] fix: remove dupe --- public/openapi/read/admin/manage/users.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/openapi/read/admin/manage/users.yaml b/public/openapi/read/admin/manage/users.yaml index 05c651b318..80dbed1728 100644 --- a/public/openapi/read/admin/manage/users.yaml +++ b/public/openapi/read/admin/manage/users.yaml @@ -15,8 +15,6 @@ get: type: array items: $ref: ../../../components/schemas/UserObject.yaml#/UserObjectACP - userCount: - type: number page: type: number pageCount: From 77a6dbacc408fd46f8cce7615a4e4b75c5ab0f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 16:15:01 -0500 Subject: [PATCH 047/116] fix: api test --- test/api.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/api.js b/test/api.js index e67774f4ad..535e7ea19e 100644 --- a/test/api.js +++ b/test/api.js @@ -127,10 +127,12 @@ describe('API', async () => { fs.closeSync(fs.openSync(path.resolve(nconf.get('upload_path'), 'files/test.txt'), 'w')); const socketUser = require('../src/socket.io/user'); + const socketAdmin = require('../src/socket.io/admin'); // export data for admin user await socketUser.exportProfile({ uid: adminUid }, { uid: adminUid }); await socketUser.exportPosts({ uid: adminUid }, { uid: adminUid }); await socketUser.exportUploads({ uid: adminUid }, { uid: adminUid }); + await socketAdmin.user.exportUsersCSV({ uid: adminUid }, {}); // wait for export child process to complete await wait(5000); From b596e948268b23e26c9ec84b347fffb30c37a240 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Nov 2020 16:26:32 -0500 Subject: [PATCH 048/116] fix: tests --- test/flags.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/flags.js b/test/flags.js index b0f6fcac1f..1bbd764827 100644 --- a/test/flags.js +++ b/test/flags.js @@ -740,9 +740,10 @@ describe('Flags', function () { const category = await Categories.create({ name: 'private category' }); await Privileges.categories.rescind(['groups:topics:read'], category.cid, 'registered-users'); + await Groups.join('private category', uid3); const result = await Topics.post({ cid: category.cid, - uid: adminUid, + uid: uid3, title: 'private topic', content: 'private post', }); From d3c04afb98611e152cafbd4cb804e3a689f86cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 16:36:23 -0500 Subject: [PATCH 049/116] fix: #8982, copy color on tag rename, dont copy if target exists refresh page on tag rename --- public/language/en-GB/admin/manage/tags.json | 3 ++- public/src/admin/manage/tags.js | 1 + src/topics/tags.js | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/public/language/en-GB/admin/manage/tags.json b/public/language/en-GB/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/en-GB/admin/manage/tags.json +++ b/public/language/en-GB/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/src/admin/manage/tags.js b/public/src/admin/manage/tags.js index 699d2ddffa..512e0732d7 100644 --- a/public/src/admin/manage/tags.js +++ b/public/src/admin/manage/tags.js @@ -159,6 +159,7 @@ define('admin/manage/tags', [ return app.alertError(err.message); } app.alertSuccess('[[admin/manage/tags:alerts.update-success]]'); + ajaxify.refresh(); }); }, }, diff --git a/src/topics/tags.js b/src/topics/tags.js index 967322da64..1aa573e3e1 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -90,6 +90,15 @@ module.exports = function (Topics) { } newTagName = utils.cleanUpTag(newTagName, meta.config.maximumTagLength); await Topics.createEmptyTag(newTagName); + const targetExists = await db.isSortedSetMember('tags:topic:count', newTagName); + const tagData = await db.getObject('tag:' + tag); + if (tagData && !targetExists) { + await db.setObject('tag:' + newTagName, { + color: tagData.color, + bgColor: tagData.bgColor, + }); + } + await batch.processSortedSet('tag:' + tag + ':topics', async function (tids) { const scores = await db.sortedSetScores('tag:' + tag + ':topics', tids); await db.sortedSetAdd('tag:' + newTagName + ':topics', scores, tids); From 9ab4fb412b7db57f6ba1d8dcffab768e872f356d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 16:37:33 -0500 Subject: [PATCH 050/116] fix: order --- src/topics/tags.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/topics/tags.js b/src/topics/tags.js index 1aa573e3e1..c68b7b9594 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -89,8 +89,8 @@ module.exports = function (Topics) { return; } newTagName = utils.cleanUpTag(newTagName, meta.config.maximumTagLength); - await Topics.createEmptyTag(newTagName); const targetExists = await db.isSortedSetMember('tags:topic:count', newTagName); + await Topics.createEmptyTag(newTagName); const tagData = await db.getObject('tag:' + tag); if (tagData && !targetExists) { await db.setObject('tag:' + newTagName, { From 1269103fbb087c43d845fd303bf538106550e39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Nov 2020 16:56:18 -0500 Subject: [PATCH 051/116] fix: #8984, post-queue ux --- public/language/en-GB/post-queue.json | 4 +++- public/src/client/post-queue.js | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/public/language/en-GB/post-queue.json b/public/language/en-GB/post-queue.json index b5f73c5613..24eae3ad7d 100644 --- a/public/language/en-GB/post-queue.json +++ b/public/language/en-GB/post-queue.json @@ -8,5 +8,7 @@ "content": "Content", "posted": "Posted", "reply-to": "Reply to \"%1\"", - "content-editable": "You can click on individual content to edit before posting." + "content-editable": "You can click on individual content to edit before posting.", + "category-editable": "Click to edit the category of this new topic", + "title-editable": "Click to edit the title of this new topic" } \ No newline at end of file diff --git a/public/src/client/post-queue.js b/public/src/client/post-queue.js index cc52615539..06d2e5b56a 100644 --- a/public/src/client/post-queue.js +++ b/public/src/client/post-queue.js @@ -58,7 +58,12 @@ define('forum/post-queue', [ category: category, }], }, function (html) { - $this.replaceWith(html.find('.topic-category')); + if ($this.find('.category-text').length) { + $this.find('.category-text').text(html.find('.topic-category .category-text').text()); + } else { + // for backwards compatibility, remove in 1.16.0 + $this.replaceWith(html.find('.topic-category')); + } }); }); }); @@ -92,7 +97,17 @@ define('forum/post-queue', [ if (err) { return app.alertError(err); } - preview.html(titleEdit ? data.postData.title : data.postData.content); + if (titleEdit) { + if (preview.find('.title-text').length) { + preview.find('.title-text').text(data.postData.title); + } else { + // for backwards compatibility, remove in 1.16.0 + preview.html(data.postData.title); + } + } else { + preview.html(data.postData.content); + } + textarea.parent().addClass('hidden'); preview.removeClass('hidden'); }); From fad2d342669d251f43d33863c43e5dcd98a7626a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Nov 2020 17:07:54 -0500 Subject: [PATCH 052/116] fix(deps): update dependency autoprefixer to v10.0.4 (#8985) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 72e50323fe..f3ae8761dc 100644 --- a/install/package.json +++ b/install/package.json @@ -39,7 +39,7 @@ "ace-builds": "^1.4.9", "archiver": "^5.0.0", "async": "^3.2.0", - "autoprefixer": "10.0.3", + "autoprefixer": "10.0.4", "bcryptjs": "2.4.3", "benchpressjs": "2.3.0", "body-parser": "^1.19.0", From 8258536a0b23354f7901e79cf8f4a5190ef1c215 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Nov 2020 17:13:00 -0500 Subject: [PATCH 053/116] fix(deps): update dependency nodebb-theme-persona to v10.2.91 (#8986) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index f3ae8761dc..03b8b84696 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.90", + "nodebb-theme-persona": "10.2.91", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.5", "nodebb-widget-essentials": "4.1.2", From 6c980db1e8cee0bb0058e496a85465a7af76582b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Nov 2020 17:13:10 -0500 Subject: [PATCH 054/116] fix(deps): update dependency nodebb-theme-vanilla to v11.3.6 (#8987) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 03b8b84696..873020678d 100644 --- a/install/package.json +++ b/install/package.json @@ -105,7 +105,7 @@ "nodebb-theme-lavender": "5.0.14", "nodebb-theme-persona": "10.2.91", "nodebb-theme-slick": "1.3.3", - "nodebb-theme-vanilla": "11.3.5", + "nodebb-theme-vanilla": "11.3.6", "nodebb-widget-essentials": "4.1.2", "nodemailer": "^6.4.6", "nprogress": "0.2.0", From eb5a5b6ac2bd6fa4737f6b71b185eb60254c2619 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sat, 28 Nov 2020 09:06:46 +0000 Subject: [PATCH 055/116] Latest translations and fallbacks --- public/language/ar/admin/manage/tags.json | 3 ++- public/language/ar/admin/manage/users.json | 4 +++- public/language/ar/notifications.json | 1 + public/language/bg/admin/manage/tags.json | 3 ++- public/language/bg/admin/manage/users.json | 4 +++- public/language/bg/notifications.json | 1 + public/language/bn/admin/manage/tags.json | 3 ++- public/language/bn/admin/manage/users.json | 4 +++- public/language/bn/notifications.json | 1 + public/language/cs/admin/manage/tags.json | 3 ++- public/language/cs/admin/manage/users.json | 4 +++- public/language/cs/notifications.json | 1 + public/language/da/admin/manage/tags.json | 3 ++- public/language/da/admin/manage/users.json | 4 +++- public/language/da/notifications.json | 1 + public/language/de/admin/manage/tags.json | 3 ++- public/language/de/admin/manage/users.json | 4 +++- public/language/de/notifications.json | 1 + public/language/el/admin/manage/tags.json | 3 ++- public/language/el/admin/manage/users.json | 4 +++- public/language/el/notifications.json | 1 + public/language/en-US/admin/manage/tags.json | 3 ++- public/language/en-US/admin/manage/users.json | 4 +++- public/language/en-US/notifications.json | 1 + public/language/en-x-pirate/admin/manage/tags.json | 3 ++- public/language/en-x-pirate/admin/manage/users.json | 4 +++- public/language/en-x-pirate/notifications.json | 1 + public/language/es/admin/manage/tags.json | 3 ++- public/language/es/admin/manage/users.json | 4 +++- public/language/es/notifications.json | 1 + public/language/et/admin/manage/tags.json | 3 ++- public/language/et/admin/manage/users.json | 4 +++- public/language/et/notifications.json | 1 + public/language/fa-IR/admin/manage/tags.json | 3 ++- public/language/fa-IR/admin/manage/users.json | 4 +++- public/language/fa-IR/notifications.json | 3 ++- public/language/fi/admin/manage/tags.json | 3 ++- public/language/fi/admin/manage/users.json | 4 +++- public/language/fi/notifications.json | 1 + public/language/fr/admin/manage/tags.json | 3 ++- public/language/fr/admin/manage/users.json | 4 +++- public/language/fr/notifications.json | 1 + public/language/gl/admin/manage/tags.json | 3 ++- public/language/gl/admin/manage/users.json | 4 +++- public/language/gl/notifications.json | 1 + public/language/he/admin/manage/tags.json | 3 ++- public/language/he/admin/manage/users.json | 4 +++- public/language/he/notifications.json | 1 + public/language/hr/admin/manage/tags.json | 3 ++- public/language/hr/admin/manage/users.json | 4 +++- public/language/hr/notifications.json | 1 + public/language/hu/admin/manage/tags.json | 3 ++- public/language/hu/admin/manage/users.json | 4 +++- public/language/hu/notifications.json | 1 + public/language/id/admin/manage/tags.json | 3 ++- public/language/id/admin/manage/users.json | 4 +++- public/language/id/notifications.json | 1 + public/language/it/admin/manage/tags.json | 3 ++- public/language/it/admin/manage/users.json | 4 +++- public/language/it/notifications.json | 1 + public/language/ja/admin/manage/tags.json | 3 ++- public/language/ja/admin/manage/users.json | 4 +++- public/language/ja/notifications.json | 1 + public/language/ko/admin/manage/tags.json | 3 ++- public/language/ko/admin/manage/users.json | 4 +++- public/language/ko/notifications.json | 1 + public/language/lt/admin/manage/tags.json | 3 ++- public/language/lt/admin/manage/users.json | 4 +++- public/language/lt/notifications.json | 1 + public/language/lv/admin/manage/tags.json | 3 ++- public/language/lv/admin/manage/users.json | 4 +++- public/language/lv/notifications.json | 1 + public/language/ms/admin/manage/tags.json | 3 ++- public/language/ms/admin/manage/users.json | 4 +++- public/language/ms/notifications.json | 1 + public/language/nb/admin/manage/tags.json | 3 ++- public/language/nb/admin/manage/users.json | 4 +++- public/language/nb/notifications.json | 1 + public/language/nl/admin/manage/tags.json | 3 ++- public/language/nl/admin/manage/users.json | 4 +++- public/language/nl/notifications.json | 1 + public/language/pl/admin/manage/tags.json | 3 ++- public/language/pl/admin/manage/users.json | 4 +++- public/language/pl/notifications.json | 1 + public/language/pt-BR/admin/manage/tags.json | 3 ++- public/language/pt-BR/admin/manage/users.json | 4 +++- public/language/pt-BR/notifications.json | 1 + public/language/pt-PT/admin/manage/tags.json | 3 ++- public/language/pt-PT/admin/manage/users.json | 4 +++- public/language/pt-PT/notifications.json | 1 + public/language/ro/admin/manage/tags.json | 3 ++- public/language/ro/admin/manage/users.json | 4 +++- public/language/ro/notifications.json | 1 + public/language/ru/admin/manage/tags.json | 3 ++- public/language/ru/admin/manage/users.json | 4 +++- public/language/ru/notifications.json | 1 + public/language/rw/admin/manage/tags.json | 3 ++- public/language/rw/admin/manage/users.json | 4 +++- public/language/rw/notifications.json | 1 + public/language/sc/admin/manage/tags.json | 3 ++- public/language/sc/admin/manage/users.json | 4 +++- public/language/sc/notifications.json | 1 + public/language/sk/admin/manage/tags.json | 3 ++- public/language/sk/admin/manage/users.json | 4 +++- public/language/sk/notifications.json | 1 + public/language/sl/admin/manage/tags.json | 3 ++- public/language/sl/admin/manage/users.json | 4 +++- public/language/sl/notifications.json | 1 + public/language/sr/admin/manage/tags.json | 3 ++- public/language/sr/admin/manage/users.json | 4 +++- public/language/sr/notifications.json | 1 + public/language/sv/admin/manage/tags.json | 3 ++- public/language/sv/admin/manage/users.json | 4 +++- public/language/sv/notifications.json | 1 + public/language/th/admin/manage/tags.json | 3 ++- public/language/th/admin/manage/users.json | 4 +++- public/language/th/notifications.json | 1 + public/language/tr/admin/manage/tags.json | 3 ++- public/language/tr/admin/manage/users.json | 4 +++- public/language/tr/notifications.json | 1 + public/language/uk/admin/manage/tags.json | 3 ++- public/language/uk/admin/manage/users.json | 4 +++- public/language/uk/notifications.json | 1 + public/language/vi/admin/manage/tags.json | 3 ++- public/language/vi/admin/manage/users.json | 4 +++- public/language/vi/notifications.json | 1 + public/language/zh-CN/admin/manage/tags.json | 3 ++- public/language/zh-CN/admin/manage/users.json | 4 +++- public/language/zh-CN/notifications.json | 1 + public/language/zh-TW/admin/manage/tags.json | 3 ++- public/language/zh-TW/admin/manage/users.json | 4 +++- public/language/zh-TW/notifications.json | 1 + 132 files changed, 265 insertions(+), 89 deletions(-) diff --git a/public/language/ar/admin/manage/tags.json b/public/language/ar/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/ar/admin/manage/tags.json +++ b/public/language/ar/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/ar/admin/manage/users.json b/public/language/ar/admin/manage/users.json index dee2572a42..749de7fe42 100644 --- a/public/language/ar/admin/manage/users.json +++ b/public/language/ar/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 9f349b3895..819a2cca70 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني", "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.", "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.", diff --git a/public/language/bg/admin/manage/tags.json b/public/language/bg/admin/manage/tags.json index 367fe3e107..7ec5df8967 100644 --- a/public/language/bg/admin/manage/tags.json +++ b/public/language/bg/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Редактиране на етикет(и)", "alerts.confirm-delete": "Наистина ли искате да изтриете избраните етикети?", - "alerts.update-success": "Етикетът е променен!" + "alerts.update-success": "Етикетът е променен!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/bg/admin/manage/users.json b/public/language/bg/admin/manage/users.json index 2c2d93a9b6..7db8519052 100644 --- a/public/language/bg/admin/manage/users.json +++ b/public/language/bg/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Е-пощи: ", "alerts.email-sent-to": "Беше изпратено е-писмо за потвърждение до %1", - "alerts.x-users-found": "Намерени потребители: %1 (%2 секунди)" + "alerts.x-users-found": "Намерени потребители: %1 (%2 секунди)", + "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." } \ No newline at end of file diff --git a/public/language/bg/notifications.json b/public/language/bg/notifications.json index f975415a91..38d6d9768f 100644 --- a/public/language/bg/notifications.json +++ b/public/language/bg/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "Профилът на %1 е изнесен, щракнете за сваляне", "posts-exported": "Публикациите на %1 са изнесени, щракнете за сваляне", "uploads-exported": "Качванията на %1 са изнесени, щракнете за сваляне", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Е-пощата беше потвърдена", "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.", "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.", diff --git a/public/language/bn/admin/manage/tags.json b/public/language/bn/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/bn/admin/manage/tags.json +++ b/public/language/bn/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/bn/admin/manage/users.json b/public/language/bn/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/bn/admin/manage/users.json +++ b/public/language/bn/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index 6c99b29edd..248e76ba9f 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে", "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।", "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।", diff --git a/public/language/cs/admin/manage/tags.json b/public/language/cs/admin/manage/tags.json index 58ca0a5582..17275c38bd 100644 --- a/public/language/cs/admin/manage/tags.json +++ b/public/language/cs/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Upravení značky(ek)", "alerts.confirm-delete": "Chcete odstranit vybranou značku?", - "alerts.update-success": "Značka aktualizována." + "alerts.update-success": "Značka aktualizována.", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/cs/admin/manage/users.json b/public/language/cs/admin/manage/users.json index 49a2ca54c2..5e5b25e621 100644 --- a/public/language/cs/admin/manage/users.json +++ b/public/language/cs/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "E-maily:", "alerts.email-sent-to": "E-mail s pozvánkou byl odeslán na %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." } \ No newline at end of file diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index 6fe457883d..92df4c807f 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-mail potvrzen", "email-confirmed-message": "Děkujeme za ověření vaší e-mailové adresy. Váš účet je nyní aktivní.", "email-confirm-error-message": "Nastal problém s ověřením vaší e-mailové adresy. Kód je pravděpodobně neplatný nebo jeho platnost vypršela.", diff --git a/public/language/da/admin/manage/tags.json b/public/language/da/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/da/admin/manage/tags.json +++ b/public/language/da/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/da/admin/manage/users.json b/public/language/da/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/da/admin/manage/users.json +++ b/public/language/da/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json index daa04bcf68..cdd6eb9e2a 100644 --- a/public/language/da/notifications.json +++ b/public/language/da/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email bekræftet", "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.", "email-confirm-error-message": "Der var et problem med valideringen af din emailadresse. Bekræftelses koden var muligvis forkert eller udløbet.", diff --git a/public/language/de/admin/manage/tags.json b/public/language/de/admin/manage/tags.json index bd278a78f4..e75bdd6d74 100644 --- a/public/language/de/admin/manage/tags.json +++ b/public/language/de/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "Wollen Sie die ausgewählten Tags löschen?", - "alerts.update-success": "Tag aktualisiert!" + "alerts.update-success": "Tag aktualisiert!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/de/admin/manage/users.json b/public/language/de/admin/manage/users.json index c4e0cc50e0..9971a96729 100644 --- a/public/language/de/admin/manage/users.json +++ b/public/language/de/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "E-Mails:", "alerts.email-sent-to": "Eine Einladungsemail wurde an %1 gesendet", - "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." } \ No newline at end of file diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 53407294d2..7a1a44e201 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 Profil exportiert, klicke zum downloaden", "posts-exported": "%1 Posts exportiert, klicke zum downloaden", "uploads-exported": "%1 Uploads exportiert, klicke zum downloaden", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-Mail bestätigt", "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.", "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.", diff --git a/public/language/el/admin/manage/tags.json b/public/language/el/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/el/admin/manage/tags.json +++ b/public/language/el/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/el/admin/manage/users.json b/public/language/el/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/el/admin/manage/users.json +++ b/public/language/el/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json index 248c0a6034..b327e75ce9 100644 --- a/public/language/el/notifications.json +++ b/public/language/el/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/en-US/admin/manage/tags.json b/public/language/en-US/admin/manage/tags.json index 943ccc96ea..19a02a8f41 100644 --- a/public/language/en-US/admin/manage/tags.json +++ b/public/language/en-US/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/en-US/admin/manage/users.json b/public/language/en-US/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/en-US/admin/manage/users.json +++ b/public/language/en-US/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/en-US/notifications.json b/public/language/en-US/notifications.json index c5d367fae2..a6ede1b96b 100644 --- a/public/language/en-US/notifications.json +++ b/public/language/en-US/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/en-x-pirate/admin/manage/tags.json b/public/language/en-x-pirate/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/en-x-pirate/admin/manage/tags.json +++ b/public/language/en-x-pirate/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/en-x-pirate/admin/manage/users.json b/public/language/en-x-pirate/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/en-x-pirate/admin/manage/users.json +++ b/public/language/en-x-pirate/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/en-x-pirate/notifications.json b/public/language/en-x-pirate/notifications.json index 26adae26f2..16d11fe565 100644 --- a/public/language/en-x-pirate/notifications.json +++ b/public/language/en-x-pirate/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/es/admin/manage/tags.json b/public/language/es/admin/manage/tags.json index a22c14e0bf..20aca4d09f 100644 --- a/public/language/es/admin/manage/tags.json +++ b/public/language/es/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "¿Quieres borrar las etiquetas (tags) seleccionadas?", - "alerts.update-success": "¡Etiqueta (tag) Actualizada!" + "alerts.update-success": "¡Etiqueta (tag) Actualizada!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/es/admin/manage/users.json b/public/language/es/admin/manage/users.json index cc7470da65..59be70aa0a 100644 --- a/public/language/es/admin/manage/users.json +++ b/public/language/es/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Correos electrónico:", "alerts.email-sent-to": "Un email de invitación ha sido enviado a %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." } \ No newline at end of file diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index cd0b726262..9986f6568b 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Correo electrónico confirmado", "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.", "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró...", diff --git a/public/language/et/admin/manage/tags.json b/public/language/et/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/et/admin/manage/tags.json +++ b/public/language/et/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/et/admin/manage/users.json b/public/language/et/admin/manage/users.json index ed9ce13b8d..aa1ffcbc55 100644 --- a/public/language/et/admin/manage/users.json +++ b/public/language/et/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails: ", "alerts.email-sent-to": "Kutse on saadetud %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." } \ No newline at end of file diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index 0db60d7e5c..36df3e9e19 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Emaili aadress kinnitatud", "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja on nüüd täielikult aktiveeritud.", "email-confirm-error-message": "Emaili aadressi kinnitamisel tekkis viga. Võibolla kinnituskood oli vale või aegunud.", diff --git a/public/language/fa-IR/admin/manage/tags.json b/public/language/fa-IR/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/fa-IR/admin/manage/tags.json +++ b/public/language/fa-IR/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/manage/users.json b/public/language/fa-IR/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/fa-IR/admin/manage/users.json +++ b/public/language/fa-IR/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/fa-IR/notifications.json b/public/language/fa-IR/notifications.json index 8d1290fa11..bb8b735575 100644 --- a/public/language/fa-IR/notifications.json +++ b/public/language/fa-IR/notifications.json @@ -35,7 +35,7 @@ "user_posted_to_dual": "%1 و %2 پاسخ به پست دادند در: %3", "user_posted_to_multiple": "%1 و %2 نفر دیگر به پست شما پاسخ ارسال کرده‌اند در: %3", "user_posted_topic": "%1 یک موضوع جدید ارسال کرده: %2", - "user_edited_post": "%1 has edited a post in %2", + "user_edited_post": "%1 پستی را در %2 ویرایش کرد", "user_started_following_you": "%1 شروع به دنبال کردن شما کرده", "user_started_following_you_dual": "%1 و %2 شروع به دنبال کردن شما کرده.", "user_started_following_you_multiple": "%1 و %2 نفر دیگر شروع به دنبال کردن شما کرده.", @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "ایمیل تایید شد", "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.", "email-confirm-error-message": "خطایی در تایید آدرس ایمیل شما پیش آمده است. ممکن است کد نا‌معتبر و یا منقضی شده باشد.", diff --git a/public/language/fi/admin/manage/tags.json b/public/language/fi/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/fi/admin/manage/tags.json +++ b/public/language/fi/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/fi/admin/manage/users.json b/public/language/fi/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/fi/admin/manage/users.json +++ b/public/language/fi/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 733c1a70a2..b822b8be43 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Sähköpostiosoite vahvistettu", "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.", "email-confirm-error-message": "Ongelma sähköpostiosoitteen vahvistamisessa. Ehkäpä koodi oli virheellinen tai vanhentunut.", diff --git a/public/language/fr/admin/manage/tags.json b/public/language/fr/admin/manage/tags.json index 1b3d33898b..8816a107d3 100644 --- a/public/language/fr/admin/manage/tags.json +++ b/public/language/fr/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Modification des tag(s)", "alerts.confirm-delete": "Vous-voulez réellement supprimer les mots-clés sélectionnés ?", - "alerts.update-success": "Mot-clés mis à jour !" + "alerts.update-success": "Mot-clés mis à jour !", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/fr/admin/manage/users.json b/public/language/fr/admin/manage/users.json index 47804c678c..6b646e2253 100644 --- a/public/language/fr/admin/manage/users.json +++ b/public/language/fr/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails: ", "alerts.email-sent-to": "Un e-mail d'invitation a été envoyé à %1", - "alerts.x-users-found": "%1 utilisateur(s) trouvé(s), (%2 secondes)" + "alerts.x-users-found": "%1 utilisateur(s) trouvé(s), (%2 secondes)", + "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." } \ No newline at end of file diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index ef664344c6..6ea3aac1fc 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profil exporté, cliquez pour le télécharger", "posts-exported": "%1 messages exportés, cliquez pour les télécharger", "uploads-exported": "%1 envois exportés, cliquez pour les télécharger", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email vérifié", "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.", "email-confirm-error-message": "Il y a un un problème dans la vérification de votre adresse email. Le code est peut être invalide ou a expiré.", diff --git a/public/language/gl/admin/manage/tags.json b/public/language/gl/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/gl/admin/manage/tags.json +++ b/public/language/gl/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/gl/admin/manage/users.json b/public/language/gl/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/gl/admin/manage/users.json +++ b/public/language/gl/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json index 059c57d3fb..fe57395043 100644 --- a/public/language/gl/notifications.json +++ b/public/language/gl/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Correo confirmado", "email-confirmed-message": "Grazas por validar o teu correo. A túa conta agora está activada.", "email-confirm-error-message": "Houbo un problema validando o teu correo. Poida que o código fose inválido ou expirase. ", diff --git a/public/language/he/admin/manage/tags.json b/public/language/he/admin/manage/tags.json index d9125f0f6b..29037c4b58 100644 --- a/public/language/he/admin/manage/tags.json +++ b/public/language/he/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "האם תרצה למחוק את התגים שנבחרו?", - "alerts.update-success": "תג עודכן!" + "alerts.update-success": "תג עודכן!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/he/admin/manage/users.json b/public/language/he/admin/manage/users.json index 40cd43692c..51d31a4abe 100644 --- a/public/language/he/admin/manage/users.json +++ b/public/language/he/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails: ", "alerts.email-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." } \ No newline at end of file diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 99b0474c1f..4af174edf8 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 פרופיל יוצא, לחץ כדי להוריד.", "posts-exported": "%1 פוסטים יוצאו, לחץ כדי להוריד.", "uploads-exported": "%1 העלאות יוצאו, לחץ כדי להוריד.", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "כתובת המייל אושרה", "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.", "email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.", diff --git a/public/language/hr/admin/manage/tags.json b/public/language/hr/admin/manage/tags.json index 8e06024ebf..896330b733 100644 --- a/public/language/hr/admin/manage/tags.json +++ b/public/language/hr/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "Želite li obrisati odabrane oznake?", - "alerts.update-success": "Oznake promijenjene!" + "alerts.update-success": "Oznake promijenjene!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/hr/admin/manage/users.json b/public/language/hr/admin/manage/users.json index 2c5159a8a1..62ab61921a 100644 --- a/public/language/hr/admin/manage/users.json +++ b/public/language/hr/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails: ", "alerts.email-sent-to": "Email pozivnica je poslana %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." } \ No newline at end of file diff --git a/public/language/hr/notifications.json b/public/language/hr/notifications.json index 4e43f28e4d..f5dda50f81 100644 --- a/public/language/hr/notifications.json +++ b/public/language/hr/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email potvrđen", "email-confirmed-message": "Hvala na potvrdi emaila. Vaš račun je sada aktivan.", "email-confirm-error-message": "Nastao je problem pri potvrdi Vaše email adrese. Provjerite kod ili zatražite novi.", diff --git a/public/language/hu/admin/manage/tags.json b/public/language/hu/admin/manage/tags.json index 4f8ccebc0c..eaab0d5e3e 100644 --- a/public/language/hu/admin/manage/tags.json +++ b/public/language/hu/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "Biztosan törölni akarod a kijelölt címkéket?", - "alerts.update-success": "Címke frissítve!" + "alerts.update-success": "Címke frissítve!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/hu/admin/manage/users.json b/public/language/hu/admin/manage/users.json index 02b914aa3d..101f11cc89 100644 --- a/public/language/hu/admin/manage/users.json +++ b/public/language/hu/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails: ", "alerts.email-sent-to": "Meghívó email elküldve %1 részére", - "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." } \ No newline at end of file diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index 46b386ca38..a22aadf9fb 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-mail megerősítve", "email-confirmed-message": "Köszönjük az e-mail címed megerősítését. A fiókod mostantól teljesen aktiválva van.", "email-confirm-error-message": "Probléma lépett fel az e-mail címed megerősítésekor. Talán a kód érvénytelen volt vagy lejárt.", diff --git a/public/language/id/admin/manage/tags.json b/public/language/id/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/id/admin/manage/tags.json +++ b/public/language/id/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/id/admin/manage/users.json b/public/language/id/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/id/admin/manage/users.json +++ b/public/language/id/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json index 57f60009db..3aa54ade76 100644 --- a/public/language/id/notifications.json +++ b/public/language/id/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email telah Dikonfirmasi", "email-confirmed-message": "Terimakasih telah melakukan validasi email. Akunmu saat ini telah aktif sepenuhnya.", "email-confirm-error-message": "Terjadi masalah saat melakukan validasi emailmu. Mungkin terjadi kesalahan kode atau waktu habis.", diff --git a/public/language/it/admin/manage/tags.json b/public/language/it/admin/manage/tags.json index 330fb2b6d4..23727a12da 100644 --- a/public/language/it/admin/manage/tags.json +++ b/public/language/it/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Modifica tag(s)", "alerts.confirm-delete": "Vuoi eliminare i tag selezionati?", - "alerts.update-success": "Tag aggiornato!" + "alerts.update-success": "Tag aggiornato!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/it/admin/manage/users.json b/public/language/it/admin/manage/users.json index e50ac05793..a4701733f4 100644 --- a/public/language/it/admin/manage/users.json +++ b/public/language/it/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails:", "alerts.email-sent-to": "Un invito è stato inviato tramite mail a %1", - "alerts.x-users-found": "%1 utente(i) trovato(i), (%2 secondi)" + "alerts.x-users-found": "%1 utente(i) trovato(i), (%2 secondi)", + "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." } \ No newline at end of file diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 567d3bc315..ff4325a0d6 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profilo esportato, clicca per scaricare", "posts-exported": "%1 post esportati, clicca per scaricare", "uploads-exported": "%1 caricamenti esportati, clicca per scaricare", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email Confermata", "email-confirmed-message": "Grazie per aver validato la tua email. Il tuo account è ora completamente attivato.", "email-confirm-error-message": "C'è stato un problema nella validazione del tuo indirizzo email. Potrebbe essere il codice non valido o scaduto.", diff --git a/public/language/ja/admin/manage/tags.json b/public/language/ja/admin/manage/tags.json index b91a7e70ed..c4527324bd 100644 --- a/public/language/ja/admin/manage/tags.json +++ b/public/language/ja/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "選択したタグを削除しますか？", - "alerts.update-success": "タグが更新されました!" + "alerts.update-success": "タグが更新されました!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/ja/admin/manage/users.json b/public/language/ja/admin/manage/users.json index 945dd5b912..749eb52751 100644 --- a/public/language/ja/admin/manage/users.json +++ b/public/language/ja/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "メール:", "alerts.email-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." } \ No newline at end of file diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index 7686ab1f78..6f12785401 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Eメールが確認されました", "email-confirmed-message": "メールアドレス検証をして頂き、ありがとうございます。あなたのアカウントは完全にアクティブになりました。", "email-confirm-error-message": "あなたのEメールアドレス検証に問題があります。コードが無効か、期限切れです。", diff --git a/public/language/ko/admin/manage/tags.json b/public/language/ko/admin/manage/tags.json index c45148e32e..cef6411323 100644 --- a/public/language/ko/admin/manage/tags.json +++ b/public/language/ko/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "선택된 태그들을 삭제하시겠습니까?", - "alerts.update-success": "태그가 업데이트 됐습니다! " + "alerts.update-success": "태그가 업데이트 됐습니다! ", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/ko/admin/manage/users.json b/public/language/ko/admin/manage/users.json index 547bd5b3ea..36bb82be32 100644 --- a/public/language/ko/admin/manage/users.json +++ b/public/language/ko/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "이메일:", "alerts.email-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." } \ No newline at end of file diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index b0b29021d9..e70e3cc139 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "이메일 인증 되었습니다", "email-confirmed-message": "이메일을 인증해주셔서 감사합니다. 계정이 완전히 활성화되었습니다.", "email-confirm-error-message": "이메일 주소를 인증하지 못했습니다. 코드가 올바르지 않거나 만료 되었을 수 있습니다.", diff --git a/public/language/lt/admin/manage/tags.json b/public/language/lt/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/lt/admin/manage/tags.json +++ b/public/language/lt/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/lt/admin/manage/users.json b/public/language/lt/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/lt/admin/manage/users.json +++ b/public/language/lt/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index c7f4446e04..f40d0ce4e1 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "El. paštas patvirtintas", "email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.", "email-confirm-error-message": "Įvyko klaida mėginant patvirtinti Jūsų el. pašto adresą. Galbūt kodas yra neteisingas, arba nebegalioajantis.", diff --git a/public/language/lv/admin/manage/tags.json b/public/language/lv/admin/manage/tags.json index 4fa0d518bd..81a6b55e69 100644 --- a/public/language/lv/admin/manage/tags.json +++ b/public/language/lv/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "Vai vēlies izdzēst šīs birkas?", - "alerts.update-success": "Birka atjaunināta!" + "alerts.update-success": "Birka atjaunināta!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/lv/admin/manage/users.json b/public/language/lv/admin/manage/users.json index 6858618b4c..7e0c24c196 100644 --- a/public/language/lv/admin/manage/users.json +++ b/public/language/lv/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "E-pasta adreses:", "alerts.email-sent-to": "Ielūguma e-pasts ir nosūtīts %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." } \ No newline at end of file diff --git a/public/language/lv/notifications.json b/public/language/lv/notifications.json index cced8052fe..8ae6e46820 100644 --- a/public/language/lv/notifications.json +++ b/public/language/lv/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-pasta adrese ir apstiprināta", "email-confirmed-message": "Paldies, ka apstiprināji e-pasta adresi. Tavs konts tagad ir pilnībā aktivizēts.", "email-confirm-error-message": "Tavā e-pasta adreses apstiprināšanā radās problēma. Iespējams, kods ir nederīgs vai ir beidzies derīguma termiņš.", diff --git a/public/language/ms/admin/manage/tags.json b/public/language/ms/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/ms/admin/manage/tags.json +++ b/public/language/ms/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/ms/admin/manage/users.json b/public/language/ms/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/ms/admin/manage/users.json +++ b/public/language/ms/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index 598476cc8b..a81c5b85eb 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Emel Disahkan", "email-confirmed-message": "Terima kasih kerana mengesahkan emel anda. Akaun anda telah diaktifkan sepenuhnya.", "email-confirm-error-message": "Berlaku masalah semasa mengesahkan emel anda. Mungkin kod tidak sah atau tamat tempoh.", diff --git a/public/language/nb/admin/manage/tags.json b/public/language/nb/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/nb/admin/manage/tags.json +++ b/public/language/nb/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/nb/admin/manage/users.json b/public/language/nb/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/nb/admin/manage/users.json +++ b/public/language/nb/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 54f955a650..9df75acb22 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-post bekreftet", "email-confirmed-message": "Takk for at du har validert din e-post. Kontoen din er nå fullstendig aktivert.", "email-confirm-error-message": "Det oppsto et problem under valdiering av din e-post. Koden kan ha vært ugyldig eller ha utløpt.", diff --git a/public/language/nl/admin/manage/tags.json b/public/language/nl/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/nl/admin/manage/tags.json +++ b/public/language/nl/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/nl/admin/manage/users.json b/public/language/nl/admin/manage/users.json index 264d03f5c2..8605af8759 100644 --- a/public/language/nl/admin/manage/users.json +++ b/public/language/nl/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index 6c77277819..8c42a8b9bd 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profiel geëxporteerd, klik om te downloaden", "posts-exported": "%1 berichten geëxporteerd, klik om te downloaden", "uploads-exported": "%1 uploads geëxporteerd, klik om te downloaden", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-mailadres bevestigd", "email-confirmed-message": "Bedankt voor het bevestigen van je e-mailadres. Je account is nu volledig geactiveerd.", "email-confirm-error-message": "Er was een probleem met het bevestigen van dit e-mailadres. Misschien is de code niet goed ingevoerd of was de beschikbare tijd inmiddels verstreken.", diff --git a/public/language/pl/admin/manage/tags.json b/public/language/pl/admin/manage/tags.json index 5066828fe8..93df2a4858 100644 --- a/public/language/pl/admin/manage/tags.json +++ b/public/language/pl/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "edytowanie tagu/tagów", "alerts.confirm-delete": "Czy na pewno chcesz usunąć zaznaczone tagi?", - "alerts.update-success": "Zaktualizowano tag-a!" + "alerts.update-success": "Zaktualizowano tag-a!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/pl/admin/manage/users.json b/public/language/pl/admin/manage/users.json index 0d7bb6006b..35d02e8344 100644 --- a/public/language/pl/admin/manage/users.json +++ b/public/language/pl/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Adresy e-mail:", "alerts.email-sent-to": "Wysłano zaproszenie do %1", - "alerts.x-users-found": "Znaleziono %1 użytkownika(-ów), (czas wyszukiwania: %2 s)" + "alerts.x-users-found": "Znaleziono %1 użytkownika(-ów), (czas wyszukiwania: %2 s)", + "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." } \ No newline at end of file diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index ae37815cc8..2469c671ee 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1profil wyeksportowany, kliknij tutaj by pobrać", "posts-exported": "%1postów wyeksportowane, kliknij tutaj by pobrać", "uploads-exported": "%1przesłanych plików wyeksportowane, kliknij tutaj by pobrać", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-mail potwierdzony", "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.", "email-confirm-error-message": "Wystąpił problem przy aktywacji - kod jest błędny lub przestarzały", diff --git a/public/language/pt-BR/admin/manage/tags.json b/public/language/pt-BR/admin/manage/tags.json index 2327ae5dda..4e1111bae4 100644 --- a/public/language/pt-BR/admin/manage/tags.json +++ b/public/language/pt-BR/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "Você deseja excluir as tags selecionadas?", - "alerts.update-success": "Tag Atualizada!" + "alerts.update-success": "Tag Atualizada!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/pt-BR/admin/manage/users.json b/public/language/pt-BR/admin/manage/users.json index 258ec02721..2d301cb0a2 100644 --- a/public/language/pt-BR/admin/manage/users.json +++ b/public/language/pt-BR/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "E-mails:", "alerts.email-sent-to": "Um e-mail de convite foi enviado para %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." } \ No newline at end of file diff --git a/public/language/pt-BR/notifications.json b/public/language/pt-BR/notifications.json index c06ba4e7ca..ac8c90376b 100644 --- a/public/language/pt-BR/notifications.json +++ b/public/language/pt-BR/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email Confirmado", "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.", "email-confirm-error-message": "Houve um problema ao validar o seu endereço de email. Talvez o código era invalido ou tenha expirado.", diff --git a/public/language/pt-PT/admin/manage/tags.json b/public/language/pt-PT/admin/manage/tags.json index 289947a4f4..acae5a098c 100644 --- a/public/language/pt-PT/admin/manage/tags.json +++ b/public/language/pt-PT/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editar etiqueta(s)", "alerts.confirm-delete": "Queres mesmo apagar os marcadores selecionados?", - "alerts.update-success": "Etiqueta Atualizada!" + "alerts.update-success": "Etiqueta Atualizada!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/pt-PT/admin/manage/users.json b/public/language/pt-PT/admin/manage/users.json index cc7cc01dbf..0ff9bd3c67 100644 --- a/public/language/pt-PT/admin/manage/users.json +++ b/public/language/pt-PT/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "E-mails:", "alerts.email-sent-to": "Foi enviado um e-mail de convite para %1", - "alerts.x-users-found": "%1 utilizador(es) encontrado(s), (%2 segundos)" + "alerts.x-users-found": "%1 utilizador(es) encontrado(s), (%2 segundos)", + "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." } \ No newline at end of file diff --git a/public/language/pt-PT/notifications.json b/public/language/pt-PT/notifications.json index cda956aa54..a51fdf329d 100644 --- a/public/language/pt-PT/notifications.json +++ b/public/language/pt-PT/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-mail confirmado", "email-confirmed-message": "Obrigado por validares o teu endereço de e-mail. A tua conta está agora totalmente ativa.", "email-confirm-error-message": "Ocorreu um problema a validar o teu endereço de e-mail. Talvez o código seja inválido ou já tenha expirado.", diff --git a/public/language/ro/admin/manage/tags.json b/public/language/ro/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/ro/admin/manage/tags.json +++ b/public/language/ro/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/ro/admin/manage/users.json b/public/language/ro/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/ro/admin/manage/users.json +++ b/public/language/ro/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index 175ee9c7e2..48e51096a7 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email confirmat", "email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.", "email-confirm-error-message": "A fost o problemă cu activarea adresei tale de email. Poate codul de activare a fost invalid sau expirat.", diff --git a/public/language/ru/admin/manage/tags.json b/public/language/ru/admin/manage/tags.json index 99e67826d4..fa61412bc2 100644 --- a/public/language/ru/admin/manage/tags.json +++ b/public/language/ru/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Редактирование меток", "alerts.confirm-delete": "Вы хотите удалить выбранные метки?", - "alerts.update-success": "Метка обновлена!" + "alerts.update-success": "Метка обновлена!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/ru/admin/manage/users.json b/public/language/ru/admin/manage/users.json index 250b492b1e..45de5bdd6a 100644 --- a/public/language/ru/admin/manage/users.json +++ b/public/language/ru/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Адреса электронной почты:", "alerts.email-sent-to": "Письмо с приглашением для %1 отправлено", - "alerts.x-users-found": "%1 пользователь(ей) найдено, (%2 секунды)" + "alerts.x-users-found": "%1 пользователь(ей) найдено, (%2 секунды)", + "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." } \ No newline at end of file diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index a8a05f48a9..c9c9c59b45 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "Профиль %1 экспортирован, нажмите для загрузки", "posts-exported": "Посты %1 экспортированы, нажмите для загрузки", "uploads-exported": "Вложения %1 экспортированы, нажмите для загрузки", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Электронная почта подтверждена", "email-confirmed-message": "Спасибо за подтверждение адреса электронной почты. Ваша учётная запись активирована.", "email-confirm-error-message": "Ошибка проверки адреса электронной почты. Возможно, код подтверждения введён неправильно или у него истёк срок действия.", diff --git a/public/language/rw/admin/manage/tags.json b/public/language/rw/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/rw/admin/manage/tags.json +++ b/public/language/rw/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/rw/admin/manage/users.json b/public/language/rw/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/rw/admin/manage/users.json +++ b/public/language/rw/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json index fc6ea70cf4..4fb985e978 100644 --- a/public/language/rw/notifications.json +++ b/public/language/rw/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email Yemejwe", "email-confirmed-message": "Urakoze kugaragaza ko email yawe ikora. Ubu ngubu konte yawe irakora nta kabuza. ", "email-confirm-error-message": "Havutse ikibazo mu gushaka kumenya niba email yawe ikora. Ushobora kuba wakoresheje kode itari yo cyangwa se yarengeje igihe. ", diff --git a/public/language/sc/admin/manage/tags.json b/public/language/sc/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/sc/admin/manage/tags.json +++ b/public/language/sc/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/sc/admin/manage/users.json b/public/language/sc/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/sc/admin/manage/users.json +++ b/public/language/sc/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index 590e3aeb62..5d3155833c 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/sk/admin/manage/tags.json b/public/language/sk/admin/manage/tags.json index 08e465d8bf..3805eec2ac 100644 --- a/public/language/sk/admin/manage/tags.json +++ b/public/language/sk/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "Chcete odstrániť vybranú značku?", - "alerts.update-success": "Značka bola aktualizovaná!" + "alerts.update-success": "Značka bola aktualizovaná!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/sk/admin/manage/users.json b/public/language/sk/admin/manage/users.json index 90bced49e6..3e27ba25dd 100644 --- a/public/language/sk/admin/manage/users.json +++ b/public/language/sk/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails: ", "alerts.email-sent-to": "E-mail s pozvánkou bol odoslaný na %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." } \ No newline at end of file diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index ef9f509cff..372e67f587 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-mail bol potvrdený", "email-confirmed-message": "Ďakujeme za potvrdenie Vášho e-mailu. Váš účet je teraz aktivovaný.", "email-confirm-error-message": "Vyskytla sa chyba pri overení Vašej e-mailovej adresy. ", diff --git a/public/language/sl/admin/manage/tags.json b/public/language/sl/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/sl/admin/manage/tags.json +++ b/public/language/sl/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/sl/admin/manage/users.json b/public/language/sl/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/sl/admin/manage/users.json +++ b/public/language/sl/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/sl/notifications.json b/public/language/sl/notifications.json index 9cf0a326b4..1975b3117e 100644 --- a/public/language/sl/notifications.json +++ b/public/language/sl/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-poštni naslov potrjen", "email-confirmed-message": "Hvala, da ste potrdili svoj e-naslov. Račun je sedaj aktiviran.", "email-confirm-error-message": "Prišlo je do napake pri preverjanju vašega e-poštnega naslova. Morda je bila koda napačna ali pa je potekla.", diff --git a/public/language/sr/admin/manage/tags.json b/public/language/sr/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/sr/admin/manage/tags.json +++ b/public/language/sr/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/sr/admin/manage/users.json b/public/language/sr/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/sr/admin/manage/users.json +++ b/public/language/sr/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json index 2431eef20e..0075dcbbf2 100644 --- a/public/language/sr/notifications.json +++ b/public/language/sr/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 профила извезено, кликните за преузимање", "posts-exported": "%1 порука извезено, кликните за преузимање", "uploads-exported": "%1 отпремања извезено, кликните за преузимање", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Е-пошта је потврђена.", "email-confirmed-message": "Хвала на овери ваше е-поште. Ваш налог је сада у потпуности активан.", "email-confirm-error-message": "Дошло је до проблема са овером ваше е-поште. Можда је код неисправан или је истекао.", diff --git a/public/language/sv/admin/manage/tags.json b/public/language/sv/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/sv/admin/manage/tags.json +++ b/public/language/sv/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/sv/admin/manage/users.json b/public/language/sv/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/sv/admin/manage/users.json +++ b/public/language/sv/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index 14fabefc9a..a05d5fb625 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-post bekräftad", "email-confirmed-message": "Tack för att du bekräftat din e-postadress. Ditt konto är nu fullt ut aktiverat.", "email-confirm-error-message": "Det uppstod ett problem med bekräftelsen av din e-postadress. Kanske var koden felaktig eller ogiltig.", diff --git a/public/language/th/admin/manage/tags.json b/public/language/th/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/th/admin/manage/tags.json +++ b/public/language/th/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/th/admin/manage/users.json b/public/language/th/admin/manage/users.json index bdeb68c61c..9f5f9540c5 100644 --- a/public/language/th/admin/manage/users.json +++ b/public/language/th/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails: ", "alerts.email-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." } \ No newline at end of file diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index b076ad1697..801431742c 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Email ได้รับการยืนยันแล้ว", "email-confirmed-message": "ขอบคุณที่ยืนยัน Email ของคุณ บัญชีของคุณสามารถใช้งานได้แล้ว", "email-confirm-error-message": "มีปัญหาในการยืนยัน Email ของคุณ บางทีรหัสไม่ถูกต้องหรือหมดอายุแล้ว", diff --git a/public/language/tr/admin/manage/tags.json b/public/language/tr/admin/manage/tags.json index 08eb1ec39d..ed70a42fbd 100644 --- a/public/language/tr/admin/manage/tags.json +++ b/public/language/tr/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Etiket(ler)i Düzenle", "alerts.confirm-delete": "Seçilen etiketleri gerçekten silmek istiyor musunuz?", - "alerts.update-success": "Etiket Güncellendi!" + "alerts.update-success": "Etiket Güncellendi!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/tr/admin/manage/users.json b/public/language/tr/admin/manage/users.json index 7f89666304..95bfd7fad7 100644 --- a/public/language/tr/admin/manage/users.json +++ b/public/language/tr/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Eposta:", "alerts.email-sent-to": "%1'e bir davet e-postası gönderildi", - "alerts.x-users-found": "%1 kullanıcı bulundu, (%2 saniye)" + "alerts.x-users-found": "%1 kullanıcı bulundu, (%2 saniye)", + "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." } \ No newline at end of file diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index c6faa84f0c..d554eb5a8a 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profili hazırlandı, indirmek için tıklayınız", "posts-exported": "%1 iletileri hazırlandı, indirmek için tıklayınız", "uploads-exported": "%1 yüklemeleri hazırlandı, indirmek için tıklayınız", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "E-posta onaylandı", "email-confirmed-message": "E-postanızı onayladığınız için teşekkürler. Hesabınız tamamen aktif edildi.", "email-confirm-error-message": "E-posta adresinizi onaylarken bir hata oluştu. Kodunuz geçersiz ya da eski olabilir.", diff --git a/public/language/uk/admin/manage/tags.json b/public/language/uk/admin/manage/tags.json index 3be675b387..4b3aeec452 100644 --- a/public/language/uk/admin/manage/tags.json +++ b/public/language/uk/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "Editing tag(s)", "alerts.confirm-delete": "Бажаєте видалити декілька тегів?", - "alerts.update-success": "Тег оновлено!" + "alerts.update-success": "Тег оновлено!", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/uk/admin/manage/users.json b/public/language/uk/admin/manage/users.json index e00d2d4509..8fb7d8c9aa 100644 --- a/public/language/uk/admin/manage/users.json +++ b/public/language/uk/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "Emails: ", "alerts.email-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." } \ No newline at end of file diff --git a/public/language/uk/notifications.json b/public/language/uk/notifications.json index 7656fcbb5e..a126df0cf4 100644 --- a/public/language/uk/notifications.json +++ b/public/language/uk/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Електронну пошту підтверджено", "email-confirmed-message": "Дякуємо за підтвердження електронної пошти. Ваш акаунт тепер повністю активовано.", "email-confirm-error-message": "При перевірці вашої електронної пошти сталася проблема. Можливо код був недійсним або простроченим.", diff --git a/public/language/vi/admin/manage/tags.json b/public/language/vi/admin/manage/tags.json index 928a6a5068..3976ea97d7 100644 --- a/public/language/vi/admin/manage/tags.json +++ b/public/language/vi/admin/manage/tags.json @@ -14,5 +14,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" } \ No newline at end of file diff --git a/public/language/vi/admin/manage/users.json b/public/language/vi/admin/manage/users.json index d0d95b380f..76488baeb7 100644 --- a/public/language/vi/admin/manage/users.json +++ b/public/language/vi/admin/manage/users.json @@ -102,5 +102,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." } \ No newline at end of file diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index 2f1a7e6048..ae2631d322 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "Đã xác nhận email", "email-confirmed-message": "Cảm ơn bạn đã xác nhận địa chỉ email của bạn. Tài khoản của bạn đã được kích hoạt đầy đủ.", "email-confirm-error-message": "Đã có lỗi khi xác nhận địa chỉ email. Có thể đoạn mã không đúng hoặc đã hết hạn.", diff --git a/public/language/zh-CN/admin/manage/tags.json b/public/language/zh-CN/admin/manage/tags.json index 5dfc831dfc..f805b7b05b 100644 --- a/public/language/zh-CN/admin/manage/tags.json +++ b/public/language/zh-CN/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "编辑标签", "alerts.confirm-delete": "是否要删除所选话题？", - "alerts.update-success": "话题已更新！" + "alerts.update-success": "话题已更新！", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json index 6e707992e9..a10285bc18 100644 --- a/public/language/zh-CN/admin/manage/users.json +++ b/public/language/zh-CN/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "邮件：", "alerts.email-sent-to": "已发送邀请给 %1", - "alerts.x-users-found": "找到 %1 位用户（耗时 %2 秒）" + "alerts.x-users-found": "找到 %1 位用户（耗时 %2 秒）", + "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." } \ No newline at end of file diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json index 45bc43c3b2..3053a85591 100644 --- a/public/language/zh-CN/notifications.json +++ b/public/language/zh-CN/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1资料已导出，点击下载", "posts-exported": "%1帖子已导出，点击下载", "uploads-exported": "%1上传已导出，点击下载", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已完全激活。", "email-confirm-error-message": "验证的您电子邮箱地址时出现了问题。可能是因为验证码无效或已过期。", diff --git a/public/language/zh-TW/admin/manage/tags.json b/public/language/zh-TW/admin/manage/tags.json index e1ea496724..da995a7e21 100644 --- a/public/language/zh-TW/admin/manage/tags.json +++ b/public/language/zh-TW/admin/manage/tags.json @@ -14,5 +14,6 @@ "alerts.editing": "編輯(多個)標籤", "alerts.confirm-delete": "是否要刪除所選標籤？", - "alerts.update-success": "標籤已更新！" + "alerts.update-success": "標籤已更新！", + "reset-colors": "Reset colors" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/manage/users.json b/public/language/zh-TW/admin/manage/users.json index 97f9865efb..9890c9381f 100644 --- a/public/language/zh-TW/admin/manage/users.json +++ b/public/language/zh-TW/admin/manage/users.json @@ -102,5 +102,7 @@ "alerts.prompt-email": "電郵地址：", "alerts.email-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." } \ No newline at end of file diff --git a/public/language/zh-TW/notifications.json b/public/language/zh-TW/notifications.json index 9a982f8970..ac72de5baa 100644 --- a/public/language/zh-TW/notifications.json +++ b/public/language/zh-TW/notifications.json @@ -46,6 +46,7 @@ "profile-exported": "%1 profile exported, click to download", "posts-exported": "%1 posts exported, click to download", "uploads-exported": "%1 uploads exported, click to download", + "users-csv-exported": "Users csv exported, click to download", "email-confirmed": "電子信箱已確認", "email-confirmed-message": "感謝您驗證您的電子信箱。您的帳戶現已完全啟用。", "email-confirm-error-message": "驗證的您電子信箱地址時出現了問題。可能是因為驗證碼無效或已過期。", From 80f0750bd4ef74bb858cd66d6b1008dbcb18032b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 28 Nov 2020 09:21:33 -0500 Subject: [PATCH 056/116] fix: typo in upgrade script, closes #8990 --- src/upgrades/1.15.0/verified_users_group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/upgrades/1.15.0/verified_users_group.js b/src/upgrades/1.15.0/verified_users_group.js index 7f6736b1ef..d09b5fa9e5 100644 --- a/src/upgrades/1.15.0/verified_users_group.js +++ b/src/upgrades/1.15.0/verified_users_group.js @@ -54,7 +54,7 @@ module.exports = { await db.sortedSetAdd( 'group:unverified-users:members', - verified.map(() => now), + unverified.map(() => now), unverified.map(u => u.uid) ); }, { From 7f5efc3e93368fc936db4277e2c877c96a3ed193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 28 Nov 2020 14:43:28 -0500 Subject: [PATCH 057/116] fix: #8992, set email:confirmed for first admin user --- src/user/create.js | 7 +++++-- test/database/hash.js | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/user/create.js b/src/user/create.js index 51e7970e1c..b622a8b5a3 100644 --- a/src/user/create.js +++ b/src/user/create.js @@ -71,8 +71,12 @@ module.exports = function (User) { userData = results.user; const uid = await db.incrObjectField('global', 'nextUid'); + const isFirstUser = uid === 1; userData.uid = uid; + if (isFirstUser) { + userData['email:confirmed'] = 1; + } await db.setObject('user:' + uid, userData); const bulkAdd = [ @@ -97,8 +101,7 @@ module.exports = function (User) { } const groupsToJoin = ['registered-users'].concat( - parseInt(userData.uid, 10) !== 1 ? - 'unverified-users' : 'verified-users' + isFirstUser ? 'verified-users' : 'unverified-users' ); await Promise.all([ diff --git a/test/database/hash.js b/test/database/hash.js index 123967b1da..2fb566d8a6 100644 --- a/test/database/hash.js +++ b/test/database/hash.js @@ -471,7 +471,7 @@ describe('Hash methods', function () { db.incrObjectField('testObject12', 'field1', function (err, newValue) { assert.equal(err, null); assert.equal(arguments.length, 2); - assert.equal(newValue, 1); + assert.strictEqual(newValue, 1); done(); }); }); @@ -480,7 +480,7 @@ describe('Hash methods', function () { db.incrObjectField('testObject11', 'age', function (err, newValue) { assert.equal(err, null); assert.equal(arguments.length, 2); - assert.equal(newValue, 100); + assert.strictEqual(newValue, 100); done(); }); }); From 546f58bf1ff0328ed2df1af5bb2aa7386b679d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 28 Nov 2020 22:03:08 -0500 Subject: [PATCH 058/116] fix: timestamp in queue, add post queue strings --- public/language/en-GB/post-queue.json | 10 +++++++--- src/api/topics.js | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/public/language/en-GB/post-queue.json b/public/language/en-GB/post-queue.json index 24eae3ad7d..bfaa367870 100644 --- a/public/language/en-GB/post-queue.json +++ b/public/language/en-GB/post-queue.json @@ -8,7 +8,11 @@ "content": "Content", "posted": "Posted", "reply-to": "Reply to \"%1\"", - "content-editable": "You can click on individual content to edit before posting.", - "category-editable": "Click to edit the category of this new topic", - "title-editable": "Click to edit the title of this new topic" + "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" } \ No newline at end of file diff --git a/src/api/topics.js b/src/api/topics.js index 3b1f8d0ee4..10ef0a8809 100644 --- a/src/api/topics.js +++ b/src/api/topics.js @@ -48,7 +48,7 @@ topicsAPI.reply = async function (caller, data) { uid: caller.uid, req: apiHelpers.buildReqObject(caller), // For IP recording content: data.content, - timestamp: data.timestamp, + timestamp: Date.now(), fromQueue: false, }; From 346b91eb16b84e2ef018568c4c2858518f31465a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:08:34 -0500 Subject: [PATCH 059/116] fix(deps): update dependency nodebb-theme-persona to v10.2.92 (#8995) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 873020678d..6635ae01cd 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.91", + "nodebb-theme-persona": "10.2.92", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.6", "nodebb-widget-essentials": "4.1.2", From f6765ec74d208dba79505e5c10929f7484b572f5 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sun, 29 Nov 2020 09:06:02 +0000 Subject: [PATCH 060/116] Latest translations and fallbacks --- public/language/he/admin/advanced/events.json | 2 +- public/language/he/admin/manage/privileges.json | 2 +- public/language/it/admin/manage/privileges.json | 2 +- public/language/it/admin/manage/tags.json | 2 +- public/language/it/admin/manage/users.json | 4 ++-- public/language/it/admin/settings/api.json | 6 +++--- public/language/it/error.json | 2 +- public/language/it/notifications.json | 2 +- public/language/it/topic.json | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/public/language/he/admin/advanced/events.json b/public/language/he/admin/advanced/events.json index ec661cd7a2..1e8a7c9a9f 100644 --- a/public/language/he/admin/advanced/events.json +++ b/public/language/he/admin/advanced/events.json @@ -2,7 +2,7 @@ "events": "ארועים", "no-events": "אין ארועים", "control-panel": "בקרת ארועים\n ", - "delete-events": "Delete Events", + "delete-events": "מחיקת ארועים", "filters": "מסננים", "filters-apply": "החל מסננים", "filter-type": "סוג אירוע", diff --git a/public/language/he/admin/manage/privileges.json b/public/language/he/admin/manage/privileges.json index d6b879ccd5..99b6fd8d0b 100644 --- a/public/language/he/admin/manage/privileges.json +++ b/public/language/he/admin/manage/privileges.json @@ -4,7 +4,7 @@ "group-privileges": "הרשאות קבוצתיות", "user-privileges": "הרשאות משתמש", "edit-privileges": "עריכת הרשאות", - "select-clear-all": "Select/Clear All", + "select-clear-all": "בחר / נקה הכל", "chat": "צ'אט", "upload-images": "העלאת תמונות", "upload-files": "העלאת קבצים", diff --git a/public/language/it/admin/manage/privileges.json b/public/language/it/admin/manage/privileges.json index 3e10a33b8e..0b45ece233 100644 --- a/public/language/it/admin/manage/privileges.json +++ b/public/language/it/admin/manage/privileges.json @@ -4,7 +4,7 @@ "group-privileges": "Privilegi di gruppo", "user-privileges": "Privilegi utente", "edit-privileges": "Modifica privilegi", - "select-clear-all": "Select/Clear All", + "select-clear-all": "Seleziona/Cancella tutto", "chat": "Chat", "upload-images": "Carica immagini", "upload-files": "Carica file", diff --git a/public/language/it/admin/manage/tags.json b/public/language/it/admin/manage/tags.json index 23727a12da..13b4822ec2 100644 --- a/public/language/it/admin/manage/tags.json +++ b/public/language/it/admin/manage/tags.json @@ -15,5 +15,5 @@ "alerts.editing": "Modifica tag(s)", "alerts.confirm-delete": "Vuoi eliminare i tag selezionati?", "alerts.update-success": "Tag aggiornato!", - "reset-colors": "Reset colors" + "reset-colors": "Reimposta i colori" } \ No newline at end of file diff --git a/public/language/it/admin/manage/users.json b/public/language/it/admin/manage/users.json index a4701733f4..7e26579712 100644 --- a/public/language/it/admin/manage/users.json +++ b/public/language/it/admin/manage/users.json @@ -103,6 +103,6 @@ "alerts.prompt-email": "Emails:", "alerts.email-sent-to": "Un invito è stato inviato tramite mail a %1", "alerts.x-users-found": "%1 utente(i) trovato(i), (%2 secondi)", - "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." + "export-users-started": "L'esportazione di utenti come csv potrebbe richiedere del tempo. Riceverai una notifica al termine.", + "export-users-completed": "Utenti esportati come csv, clicca qui per scaricare." } \ No newline at end of file diff --git a/public/language/it/admin/settings/api.json b/public/language/it/admin/settings/api.json index cb4a2e1cea..74e57044a0 100644 --- a/public/language/it/admin/settings/api.json +++ b/public/language/it/admin/settings/api.json @@ -1,12 +1,12 @@ { "tokens": "Token", - "settings": "Settings", + "settings": "Impostazioni", "lead-text": "Da questa pagina è possibile configurare l'accesso alle API di scrittura in NodeBB.", "intro": "Per impostazione predefinita, l'API di scrittura autentica gli utenti in base al cookie di sessione, ma NodeBB supporta anche l'autenticazione Bearer tramite token generati tramite questa pagina.", "docs": "Clicca qui per accedere alle specifiche complete dell'API", - "require-https": "Require API usage via HTTPS only", - "require-https-caveat": "Note: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.", + "require-https": "Richiedi utilizzo API solo tramite HTTPS", + "require-https-caveat": "Nota:Alcune installazioni che coinvolgono bilanciatori del carico possono inviare tramite proxy le loro richieste a NodeBB utilizzando HTTP, nel qual caso questa opzione dovrebbe rimanere disabilitata.", "uid": "ID utente", "uid-help-text": "Specificare un ID utente da associare a questo token. Se l'ID utente è 0, sarà considerato un token master, che può assumere l'identità di altri utenti in base al parametro _uid", diff --git a/public/language/it/error.json b/public/language/it/error.json index e1b85f3897..b039e428a1 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -144,7 +144,7 @@ "user-already-flagged": "Hai già segnalato questo utente", "post-flagged-too-many-times": "Questo post è già stato segnalato da altri", "user-flagged-too-many-times": "Questo utente è già stato segnalato da altri", - "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", + "cant-flag-privileged": "Non è consentito contrassegnare i profili o il contenuto degli utenti privilegiati (moderatori/moderatori globali/amministratori)", "self-vote": "Non puoi votare la tua stessa discussione", "too-many-downvotes-today": "È possibile votare negativamente solo %1 volta al giorno", "too-many-downvotes-today-user": "È possibile votare negativamente un utente solo %1 volta al giorno", diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index ff4325a0d6..272549b215 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -46,7 +46,7 @@ "profile-exported": "%1 profilo esportato, clicca per scaricare", "posts-exported": "%1 post esportati, clicca per scaricare", "uploads-exported": "%1 caricamenti esportati, clicca per scaricare", - "users-csv-exported": "Users csv exported, click to download", + "users-csv-exported": "Utenti esportati in CSV, clicca per scaricare", "email-confirmed": "Email Confermata", "email-confirmed-message": "Grazie per aver validato la tua email. Il tuo account è ora completamente attivato.", "email-confirm-error-message": "C'è stato un problema nella validazione del tuo indirizzo email. Potrebbe essere il codice non valido o scaduto.", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 8106215698..7e550482fb 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -29,7 +29,7 @@ "tools": "Strumenti", "locked": "Bloccato", "pinned": "Appeso", - "pinned-with-expiry": "Pinned until %1", + "pinned-with-expiry": "Bloccato fino al %1", "moved": "Spostato", "moved-from": "Spostato da %1", "copy-ip": "Copia indirizzo IP", From 5a137a0dd680d866a385d0aa3f448f7a68b0ac43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 29 Nov 2020 15:38:02 -0500 Subject: [PATCH 061/116] fix: guest handles to user displayname as well --- src/topics/index.js | 6 ++++-- src/topics/posts.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/topics/index.js b/src/topics/index.js index 99adfc9df2..ff864d19a4 100644 --- a/src/topics/index.js +++ b/src/topics/index.js @@ -1,6 +1,7 @@ 'use strict'; var _ = require('lodash'); +const validator = require('validator'); var db = require('../database'); var posts = require('../posts'); @@ -111,9 +112,10 @@ Topics.getTopicsByTids = async function (tids, options) { result.topics.forEach(function (topic, i) { if (topic) { topic.category = result.categoriesMap[topic.cid]; - topic.user = result.usersMap[topic.uid]; + topic.user = topic.uid ? result.usersMap[topic.uid] : { ...result.usersMap[topic.uid] }; if (result.tidToGuestHandle[topic.tid]) { - topic.user.username = result.tidToGuestHandle[topic.tid]; + topic.user.username = validator.escape(result.tidToGuestHandle[topic.tid]); + topic.user.displayname = topic.user.username; } topic.teaser = result.teasers[i] || null; topic.tags = tags[i]; diff --git a/src/topics/posts.js b/src/topics/posts.js index ae631be1ae..9ebf29a315 100644 --- a/src/topics/posts.js +++ b/src/topics/posts.js @@ -68,6 +68,7 @@ module.exports = function (Topics) { // Username override for guests, if enabled if (meta.config.allowGuestHandles && postObj.uid === 0 && postObj.handle) { postObj.user.username = validator.escape(String(postObj.handle)); + postObj.user.displayname = postObj.user.username; } } }); From 3cd0c9a4766463a15e459ff6b4ba5d893dc606aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 29 Nov 2020 15:43:40 -0500 Subject: [PATCH 062/116] fix: #8998, allow guests to use write api to post/reply --- src/routes/write/topics.js | 4 +-- test/topics.js | 52 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/src/routes/write/topics.js b/src/routes/write/topics.js index 744f83aa66..08bd8b2928 100644 --- a/src/routes/write/topics.js +++ b/src/routes/write/topics.js @@ -10,8 +10,8 @@ const setupApiRoute = routeHelpers.setupApiRoute; module.exports = function () { const middlewares = [middleware.authenticate]; - setupApiRoute(router, 'post', '/', [...middlewares, middleware.checkRequired.bind(null, ['cid', 'title', 'content'])], controllers.write.topics.create); - setupApiRoute(router, 'post', '/:tid', [...middlewares, middleware.checkRequired.bind(null, ['content']), middleware.assert.topic], controllers.write.topics.reply); + setupApiRoute(router, 'post', '/', [middleware.authenticateOrGuest, middleware.checkRequired.bind(null, ['cid', 'title', 'content'])], controllers.write.topics.create); + setupApiRoute(router, 'post', '/:tid', [middleware.authenticateOrGuest, middleware.checkRequired.bind(null, ['content']), middleware.assert.topic], controllers.write.topics.reply); setupApiRoute(router, 'delete', '/:tid', [...middlewares], controllers.write.topics.purge); setupApiRoute(router, 'put', '/:tid/state', [...middlewares], controllers.write.topics.restore); diff --git a/test/topics.js b/test/topics.js index 239cf055d5..adf516521a 100644 --- a/test/topics.js +++ b/test/topics.js @@ -5,6 +5,7 @@ const assert = require('assert'); const validator = require('validator'); const nconf = require('nconf'); const request = require('request'); +const util = require('util'); const db = require('./mocks/databasemock'); const topics = require('../src/topics'); @@ -18,6 +19,11 @@ const helpers = require('./helpers'); const socketPosts = require('../src/socket.io/posts'); const socketTopics = require('../src/socket.io/topics'); + +const requestType = util.promisify(function (type, url, opts, cb) { + request[type](url, opts, (err, res, body) => cb(err, { res: res, body: body })); +}); + describe('Topic\'s', function () { var topic; var categoryObj; @@ -111,6 +117,52 @@ describe('Topic\'s', function () { done(); }); }); + + it('should fail to post a topic as guest if no privileges', async function () { + const categoryObj = await categories.create({ + name: 'Test Category', + description: 'Test category created by testing script', + }); + const result = await requestType('post', nconf.get('url') + '/api/v3/topics', { + form: { + title: 'just a title', + cid: categoryObj.cid, + content: 'content for the main post', + }, + json: true, + }); + assert.strictEqual(result.body.status.message, '[[error:no-privileges]]'); + }); + + it('should post a topic as guest if guest group has privileges', async function () { + const categoryObj = await categories.create({ + name: 'Test Category', + description: 'Test category created by testing script', + }); + await privileges.categories.give(['groups:topics:create'], categoryObj.cid, 'guests'); + await privileges.categories.give(['groups:topics:reply'], categoryObj.cid, 'guests'); + + const result = await requestType('post', nconf.get('url') + '/api/v3/topics', { + form: { + title: 'just a title', + cid: categoryObj.cid, + content: 'content for the main post', + }, + json: true, + }); + + assert.strictEqual(result.body.status.code, 'ok'); + assert.strictEqual(result.body.response.title, 'just a title'); + assert.strictEqual(result.body.response.user.username, '[[global:guest]]'); + + const replyResult = await requestType('post', nconf.get('url') + '/api/v3/topics/' + result.body.response.tid, { + form: { + content: 'a reply by guest', + }, + json: true, + }); + assert.strictEqual(replyResult.body.response.content, 'a reply by guest'); + }); }); describe('.reply', function () { From 8adbf54ae635f9201f84e1e1b4dcdef154b80b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 29 Nov 2020 15:50:34 -0500 Subject: [PATCH 063/116] fix: don't show topic search if no search privilege --- public/src/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index 7e61d467be..1d47e7bd01 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -444,7 +444,7 @@ app.cacheBuster = null; } app.enableTopicSearch = function (options) { - if (!config.searchEnabled) { + if (!config.searchEnabled || !app.user.privileges['search:content']) { return; } /* eslint-disable-next-line */ From 5080f35752cdf03115c407ed8bfce750e71b902e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 29 Nov 2020 21:55:07 -0500 Subject: [PATCH 064/116] fix: #8991, logout on password reset, dont verify email if password expired dont allow same password on reset --- public/language/en-GB/error.json | 1 + public/src/app.js | 3 ++- public/src/sockets.js | 3 +++ src/socket.io/admin/user.js | 1 + src/user/reset.js | 25 +++++++++++++++++++++---- test/user.js | 29 +++++++++++++++++++++++++++++ 6 files changed, 57 insertions(+), 5 deletions(-) diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index 1b0b005805..9cbed30fdd 100644 --- a/public/language/en-GB/error.json +++ b/public/language/en-GB/error.json @@ -46,6 +46,7 @@ "username-too-long": "Username too long", "password-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", "user-banned-reason": "Sorry, this account has been banned (Reason: %1)", diff --git a/public/src/app.js b/public/src/app.js index 1d47e7bd01..72dd0faf87 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -180,8 +180,9 @@ app.cacheBuster = null; message = message.message || message; if (message === '[[error:invalid-session]]') { + app.handleInvalidSession(); app.logout(false); - return app.handleInvalidSession(); + return; } app.alert({ diff --git a/public/src/sockets.js b/public/src/sockets.js index 97c95affdf..b83e6956e4 100644 --- a/public/src/sockets.js +++ b/public/src/sockets.js @@ -69,6 +69,9 @@ socket = window.socket; }); socket.on('event:banned', onEventBanned); + socket.on('event:logout', function () { + app.logout(); + }); socket.on('event:alert', function (params) { app.alert(params); }); diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js index bf0325e484..65201d50d3 100644 --- a/src/socket.io/admin/user.js +++ b/src/socket.io/admin/user.js @@ -120,6 +120,7 @@ User.forcePasswordReset = async function (socket, uids) { await db.setObjectField(uids.map(uid => 'user:' + uid), 'passwordExpiry', Date.now()); await user.auth.revokeAllSessions(uids); + uids.forEach(uid => sockets.in('uid_' + uid).emit('event:logout')); }; User.deleteUsers = async function (socket, uids) { diff --git a/src/user/reset.js b/src/user/reset.js index 1e152e6909..eabf826c5a 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -11,6 +11,7 @@ const batch = require('../batch'); const db = require('../database'); const meta = require('../meta'); const emailer = require('../emailer'); +const Password = require('../password'); const UserReset = module.exports; @@ -67,12 +68,28 @@ UserReset.commit = async function (code, password) { if (!uid) { throw new Error('[[error:reset-code-not-valid]]'); } - + const userData = await db.getObjectFields( + 'user:' + uid, + ['password', 'passwordExpiry', 'password:shaWrapped'] + ); + const ok = await Password.compare(password, userData.password, !!parseInt(userData['password:shaWrapped'], 10)); + if (ok) { + throw new Error('[[error:reset-same-password]]'); + } const hash = await user.hashPassword(password); + const data = { + password: hash, + 'password:shaWrapped': 1, + }; - await user.setUserFields(uid, { password: hash, 'email:confirmed': 1, 'password:shaWrapped': 1 }); - await groups.join('verified-users', uid); - await groups.leave('unverified-users', uid); + // don't verify email if password reset is due to expiry + const isPasswordExpired = userData.passwordExpiry && userData.passwordExpiry < Date.now(); + if (!isPasswordExpired) { + data['email:confirmed'] = 1; + await groups.join('verified-users', uid); + await groups.leave('unverified-users', uid); + } + await user.setUserFields(uid, data); await db.deleteObjectField('reset:uid', code); await db.sortedSetRemoveBulk([ ['reset:issueDate', code], diff --git a/test/user.js b/test/user.js index f87fe2bfe5..5b8c7a911f 100644 --- a/test/user.js +++ b/test/user.js @@ -628,6 +628,35 @@ describe('User', function () { }, ], done); }); + + it('.should error if same password is used for reset', async function () { + const uid = await User.create({ username: 'badmemory', email: 'bad@memory.com', password: '123456' }); + const code = await User.reset.generate(uid); + let err; + try { + await User.reset.commit(code, '123456'); + } catch (_err) { + err = _err; + } + assert.strictEqual(err.message, '[[error:reset-same-password]]'); + }); + + it('should not validate email if password reset is due to expiry', async function () { + const uid = await User.create({ username: 'resetexpiry', email: 'reset@expiry.com', password: '123456' }); + let confirmed = await User.getUserField(uid, 'email:confirmed'); + let [verified, unverified] = await groups.isMemberOfGroups(uid, ['verified-users', 'unverified-users']); + assert.strictEqual(confirmed, 0); + assert.strictEqual(verified, false); + assert.strictEqual(unverified, true); + await User.setUserField(uid, 'passwordExpiry', Date.now()); + const code = await User.reset.generate(uid); + await User.reset.commit(code, '654321'); + confirmed = await User.getUserField(uid, 'email:confirmed'); + [verified, unverified] = await groups.isMemberOfGroups(uid, ['verified-users', 'unverified-users']); + assert.strictEqual(confirmed, 0); + assert.strictEqual(verified, false); + assert.strictEqual(unverified, true); + }); }); describe('hash methods', function () { From 4c650aeead73dd2e05272abb2c8a863d10177593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 29 Nov 2020 22:23:50 -0500 Subject: [PATCH 065/116] feat: #8989, convert widget nav to dropdown --- public/src/admin/extend/widgets.js | 11 +++++------ src/views/admin/extend/widgets.tpl | 14 +++++++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index fdb5c565e2..5660cc8f05 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -10,14 +10,13 @@ define('admin/extend/widgets', [ var Widgets = {}; Widgets.init = function () { - $('#widgets .nav-pills a').on('click', function (ev) { + $('#widgets .nav-pills .dropdown-menu a').on('click', function (ev) { var $this = $(this); - $('#widgets .nav-pills li').removeClass('active'); - $this.parent().addClass('active'); - $('#widgets .tab-pane').removeClass('active'); - $('#widgets .tab-pane[data-template="' + $this.attr('data-template') + '"]').addClass('active'); - + var templateName = $this.attr('data-template'); + $('#widgets .tab-pane[data-template="' + templateName + '"]').addClass('active'); + $('#widgets .selected-template').text(templateName); + $('#widgets .nav-pills .dropdown').trigger('click'); ev.preventDefault(); return false; }); diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index 25d03f9829..35555e847d 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -1,9 +1,17 @@
    From c44d9d2f69a41d9fd2e0916c43c18a9712a7689a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Nov 2020 22:27:23 -0500 Subject: [PATCH 066/116] fix(deps): update dependency nodebb-theme-persona to v10.2.93 (#8999) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 6635ae01cd..1996689922 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.92", + "nodebb-theme-persona": "10.2.93", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.6", "nodebb-widget-essentials": "4.1.2", From f25000cb60b1292c25393e926ce21411a0e58069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 29 Nov 2020 22:30:40 -0500 Subject: [PATCH 067/116] fix: pwd reset test --- test/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/user.js b/test/user.js index 5b8c7a911f..8942c32edd 100644 --- a/test/user.js +++ b/test/user.js @@ -1723,7 +1723,7 @@ describe('User', function () { db.getObject('reset:uid', function (err, data) { assert.ifError(err); var code = Object.keys(data)[0]; - socketUser.reset.commit({ uid: 0 }, { code: code, password: 'swordfish' }, function (err) { + socketUser.reset.commit({ uid: 0 }, { code: code, password: 'pwdchange' }, function (err) { assert.ifError(err); done(); }); From 557f0f5631d4adcc29b5a407767ec9b10954908e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 29 Nov 2020 22:41:19 -0500 Subject: [PATCH 068/116] feat: use correct code --- test/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/user.js b/test/user.js index 8942c32edd..2857a1b0f2 100644 --- a/test/user.js +++ b/test/user.js @@ -1722,7 +1722,7 @@ describe('User', function () { it('should commit reset', function (done) { db.getObject('reset:uid', function (err, data) { assert.ifError(err); - var code = Object.keys(data)[0]; + var code = Object.keys(data).find(code => parseInt(data[code], 10) === parseInt(testUid, 10)); socketUser.reset.commit({ uid: 0 }, { code: code, password: 'pwdchange' }, function (err) { assert.ifError(err); done(); From 877d85549d93eff54fce5cfcd789fafe5e675db4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Nov 2020 23:28:21 -0500 Subject: [PATCH 069/116] fix(deps): update dependency nodebb-theme-persona to v10.2.94 (#9000) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 1996689922..e550f1eacc 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.93", + "nodebb-theme-persona": "10.2.94", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.6", "nodebb-widget-essentials": "4.1.2", From 4ddab38095f35a0b585928b244ade6c6b9dcb73c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Nov 2020 23:36:01 -0500 Subject: [PATCH 070/116] fix(deps): update dependency nodebb-theme-persona to v10.2.95 (#9001) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e550f1eacc..5aa0909c9a 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.94", + "nodebb-theme-persona": "10.2.95", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.6", "nodebb-widget-essentials": "4.1.2", From 92d1b8a65f23efe921a87a82bc39530b17be9487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 01:12:34 -0500 Subject: [PATCH 071/116] fix: privs headers --- src/privileges/categories.js | 4 ++-- src/privileges/global.js | 2 +- src/views/admin/partials/privileges/category.tpl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/privileges/categories.js b/src/privileges/categories.js index 1276bf6d3b..10d5c7c785 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -35,9 +35,9 @@ module.exports = function (privileges) { payload.keys = keys; // This is a hack because I can't do {labels.users.length} to echo the count in templates.js - payload.columnCountUser = payload.labels.users.length + 2; + payload.columnCountUser = payload.labels.users.length + 3; payload.columnCountUserOther = payload.labels.users.length - privileges.privilegeLabels.length; - payload.columnCountGroup = payload.labels.groups.length + 2; + payload.columnCountGroup = payload.labels.groups.length + 3; payload.columnCountGroupOther = payload.labels.groups.length - privileges.privilegeLabels.length; return payload; }; diff --git a/src/privileges/global.js b/src/privileges/global.js index 44ad5ecd16..ed665e3168 100644 --- a/src/privileges/global.js +++ b/src/privileges/global.js @@ -71,7 +71,7 @@ module.exports = function (privileges) { payload.keys = keys; // This is a hack because I can't do {labels.users.length} to echo the count in templates.js - payload.columnCount = payload.labels.users.length + 2; + payload.columnCount = payload.labels.users.length + 3; return payload; }; diff --git a/src/views/admin/partials/privileges/category.tpl b/src/views/admin/partials/privileges/category.tpl index 392feddfab..8cc7af2de0 100644 --- a/src/views/admin/partials/privileges/category.tpl +++ b/src/views/admin/partials/privileges/category.tpl @@ -2,7 +2,7 @@ - + @@ -83,7 +83,7 @@
    [[admin/manage/categories:privileges.section-viewing]]
    - + From cfef2092de243d2faa602c1225d4774498ed5fea Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Mon, 30 Nov 2020 09:08:58 +0000 Subject: [PATCH 072/116] Latest translations and fallbacks --- public/language/ar/error.json | 1 + public/language/bg/admin/manage/tags.json | 2 +- public/language/bg/admin/manage/users.json | 4 ++-- public/language/bg/error.json | 3 ++- public/language/bg/notifications.json | 2 +- public/language/bg/topic.json | 2 +- public/language/bn/error.json | 1 + public/language/cs/error.json | 1 + public/language/da/error.json | 1 + public/language/de/error.json | 1 + public/language/el/error.json | 1 + public/language/en-US/error.json | 1 + public/language/en-x-pirate/error.json | 1 + public/language/es/error.json | 1 + public/language/et/error.json | 1 + public/language/fa-IR/error.json | 1 + public/language/fi/error.json | 1 + public/language/fr/error.json | 1 + public/language/gl/error.json | 1 + public/language/he/admin/menu.json | 2 +- public/language/he/error.json | 3 ++- public/language/he/topic.json | 2 +- public/language/hr/error.json | 1 + public/language/hu/error.json | 1 + public/language/id/error.json | 1 + public/language/it/error.json | 1 + public/language/ja/error.json | 1 + public/language/ko/error.json | 1 + public/language/lt/error.json | 1 + public/language/lv/error.json | 1 + public/language/ms/error.json | 1 + public/language/nb/error.json | 1 + public/language/nl/error.json | 1 + public/language/pl/error.json | 1 + public/language/pt-BR/error.json | 1 + public/language/pt-PT/error.json | 1 + public/language/ro/error.json | 1 + public/language/ru/error.json | 1 + public/language/rw/error.json | 1 + public/language/sc/error.json | 1 + public/language/sk/error.json | 1 + public/language/sl/error.json | 1 + public/language/sr/error.json | 1 + public/language/sv/error.json | 1 + public/language/th/error.json | 1 + public/language/tr/error.json | 1 + public/language/uk/error.json | 1 + public/language/vi/error.json | 1 + public/language/zh-CN/error.json | 1 + public/language/zh-TW/error.json | 1 + 50 files changed, 53 insertions(+), 9 deletions(-) diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 4da828ca70..2d5a420544 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -40,6 +40,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)", diff --git a/public/language/bg/admin/manage/tags.json b/public/language/bg/admin/manage/tags.json index 7ec5df8967..44e817932d 100644 --- a/public/language/bg/admin/manage/tags.json +++ b/public/language/bg/admin/manage/tags.json @@ -15,5 +15,5 @@ "alerts.editing": "Редактиране на етикет(и)", "alerts.confirm-delete": "Наистина ли искате да изтриете избраните етикети?", "alerts.update-success": "Етикетът е променен!", - "reset-colors": "Reset colors" + "reset-colors": "Възстановяване на стандартните цветовете" } \ No newline at end of file diff --git a/public/language/bg/admin/manage/users.json b/public/language/bg/admin/manage/users.json index 7db8519052..9d2469826b 100644 --- a/public/language/bg/admin/manage/users.json +++ b/public/language/bg/admin/manage/users.json @@ -103,6 +103,6 @@ "alerts.prompt-email": "Е-пощи: ", "alerts.email-sent-to": "Беше изпратено е-писмо за потвърждение до %1", "alerts.x-users-found": "Намерени потребители: %1 (%2 секунди)", - "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." + "export-users-started": "Изнасяне на потребителите във формат „csv“… Това може да отнеме известно време. Ще получите известие, когато е готово.", + "export-users-completed": "Потребителите са изнесени във формат „csv“, щракнете за сваляне." } \ No newline at end of file diff --git a/public/language/bg/error.json b/public/language/bg/error.json index 7af90b3802..633dab2599 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -40,6 +40,7 @@ "username-too-long": "Потребителското име е твърде дълго", "password-too-long": "Паролата е твърде дълга", "reset-rate-limited": "Твърде много подновявания на паролата (има ограничение на честотата)", + "reset-same-password": "Моля, използвайте парола, която е различна от текущата", "user-banned": "Потребителят е блокиран", "user-banned-reason": "За съжаление, този акаунт е блокиран (Причина: %1)", "user-banned-reason-until": "За съжаление, този акаунт е блокиран до %1 (Причина: %2)", @@ -144,7 +145,7 @@ "user-already-flagged": "Вече сте докладвали този потребител", "post-flagged-too-many-times": "Тази публикация вече е докладвана от други хора", "user-flagged-too-many-times": "Този потребител вече е докладван от други хора", - "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", + "cant-flag-privileged": "Не можете да докладвате профилите или съдържанието от потребители с по-високи правомощия (модератори, глобални модератори, администратори)", "self-vote": "Не можете да гласувате за собствената си публикация", "too-many-downvotes-today": "Можете да гласувате отрицателно не повече от %1 пъти на ден", "too-many-downvotes-today-user": "Можете да гласувате отрицателно за потребител не повече от %1 пъти на ден", diff --git a/public/language/bg/notifications.json b/public/language/bg/notifications.json index 38d6d9768f..1c9a48e64e 100644 --- a/public/language/bg/notifications.json +++ b/public/language/bg/notifications.json @@ -46,7 +46,7 @@ "profile-exported": "Профилът на %1 е изнесен, щракнете за сваляне", "posts-exported": "Публикациите на %1 са изнесени, щракнете за сваляне", "uploads-exported": "Качванията на %1 са изнесени, щракнете за сваляне", - "users-csv-exported": "Users csv exported, click to download", + "users-csv-exported": "Потребителите са изнесени във формат „csv“, щракнете за сваляне", "email-confirmed": "Е-пощата беше потвърдена", "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.", "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index ca391a1e80..8cf7bafbc7 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -29,7 +29,7 @@ "tools": "Инструменти", "locked": "Заключена", "pinned": "Закачена", - "pinned-with-expiry": "Pinned until %1", + "pinned-with-expiry": "Закачена до %1", "moved": "Преместена", "moved-from": "Преместена от %1", "copy-ip": "Копиране на IP адреса", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 9e22c50bab..6eebcd07d8 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -40,6 +40,7 @@ "username-too-long": "ইউজারনেম বড় হয়ে গিয়েছে", "password-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)", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index f3a8b77a3f..f21b067508 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -40,6 +40,7 @@ "username-too-long": "Uživatelské jméno je moc dlouhé", "password-too-long": "Heslo je moc dlouhé", "reset-rate-limited": "Moc požadavků na reset hesla (omezený počet)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Uživatel byl zablokován", "user-banned-reason": "Omlouváme se, ale tento účet byl zablokován (důvod: %1)", "user-banned-reason-until": "Omlouváme se, ale tento účet je zablokován do %1 (důvod: %2)", diff --git a/public/language/da/error.json b/public/language/da/error.json index 42217160cc..bd45fcaded 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -40,6 +40,7 @@ "username-too-long": "Brugernavn er for langt", "password-too-long": "Kodeord er for langt", "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": "Bruger er bortvist", "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)", diff --git a/public/language/de/error.json b/public/language/de/error.json index 22fe0affb4..ee3c8c3778 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -40,6 +40,7 @@ "username-too-long": "Benutzername ist zu lang", "password-too-long": "Passwort ist zu lang", "reset-rate-limited": "Zu viele Anfragen zum Zurücksetzen des Passworts (Rate begrenzt)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Benutzer ist gesperrt", "user-banned-reason": "Entschuldige, dieses Konto wurde gesperrt (Grund: %1)", "user-banned-reason-until": "Entschuldigung, dieses Konto wurde bis %1 (Reason: %2) gesperrt.", diff --git a/public/language/el/error.json b/public/language/el/error.json index bbdfc500da..3a57bc8eaf 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -40,6 +40,7 @@ "username-too-long": "Το όνομα χρήστη είναι πολύ μεγάλο", "password-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)", diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index bc38125be6..b0f6217392 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -40,6 +40,7 @@ "username-too-long": "Username too long", "password-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", "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)", diff --git a/public/language/en-x-pirate/error.json b/public/language/en-x-pirate/error.json index bc38125be6..b0f6217392 100644 --- a/public/language/en-x-pirate/error.json +++ b/public/language/en-x-pirate/error.json @@ -40,6 +40,7 @@ "username-too-long": "Username too long", "password-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", "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)", diff --git a/public/language/es/error.json b/public/language/es/error.json index d75ccad60c..2e6e11802c 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -40,6 +40,7 @@ "username-too-long": "Nombre de usuario demasiado largo", "password-too-long": "Contraseña muy corta", "reset-rate-limited": "Demasiadas solicitudes de restablecimiento de contraseña (tasa limitada)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Usuario baneado", "user-banned-reason": "Lo siento, esta cuenta ha sido baneada ( Razon: %1 )", "user-banned-reason-until": "Lo siento, esta cuenta ha sido baneada hasta %1 ( Razon: %2 )", diff --git a/public/language/et/error.json b/public/language/et/error.json index 3523645fe1..6d5a862699 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -40,6 +40,7 @@ "username-too-long": "Kasutajanimi on liiga pikk", "password-too-long": "Parool liiga pikk", "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": "Kasutaja bannitud", "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)", diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json index 4c48464af9..d10e0a5643 100644 --- a/public/language/fa-IR/error.json +++ b/public/language/fa-IR/error.json @@ -40,6 +40,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": "با عرض پوزش، این حساب کاربری از انجمن اخراج شده است (دلیل: %1)", "user-banned-reason-until": "با عرض پوزش، این حساب کاربری تا %1 اخراج شده است (دلیل: %2)", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 7bb5b3fb35..31bad88d90 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -40,6 +40,7 @@ "username-too-long": "Käyttäjänimi on liian pitkä", "password-too-long": "Salasana on liian pitkä", "reset-rate-limited": "Liian monta salasanan nollaus pyyntöä (määrärajoitus)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Käyttäjä on estetty", "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)", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 7b3d6ebfde..14c179a4bc 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -40,6 +40,7 @@ "username-too-long": "Nom d'utilisateur trop long", "password-too-long": "Mot de passe trop long", "reset-rate-limited": "Trop de demandes de réinitialisation de mot de passe (demandes limitées)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Utilisateur banni", "user-banned-reason": "Désolé, ce compte a été banni (Raison : %1)", "user-banned-reason-until": "Désolé, ce compte a été banni jusqu'au %1 (Raison : %2).", diff --git a/public/language/gl/error.json b/public/language/gl/error.json index fe9e6b72f9..54c3fe0e21 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -40,6 +40,7 @@ "username-too-long": "Nome de usuario demasiado longo.", "password-too-long": "Contrasinal moi longa", "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": "Usuario expulsado", "user-banned-reason": "Desculpa, esta conta foi baneada (Razón: %1)", "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)", diff --git a/public/language/he/admin/menu.json b/public/language/he/admin/menu.json index 30b433b86d..0b5b16a080 100644 --- a/public/language/he/admin/menu.json +++ b/public/language/he/admin/menu.json @@ -19,7 +19,7 @@ "settings/general": "כללי", "settings/homepage": "דף הבית", "settings/navigation": "ניווט", - "settings/reputation": "מוניטין ודגלים", + "settings/reputation": "מוניטין ודיווחים", "settings/email": "דוא\"ל", "settings/user": "משתמשים", "settings/group": "קבוצות", diff --git a/public/language/he/error.json b/public/language/he/error.json index ba156680e9..b26f9f63c0 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -40,6 +40,7 @@ "username-too-long": "שם משתמש ארוך מדי", "password-too-long": "הסיסמה ארוכה מדי", "reset-rate-limited": "יותר מידי בקשות לאימות סיסמא (הקצב מוגבל)", + "reset-same-password": "אנא השתמש בסיסמא שונה מהסיסמא הנוכחית שלך.", "user-banned": "המשתמש מושעה", "user-banned-reason": "מצטערים, חשבון זה הורחק (סיבה: %1)", "user-banned-reason-until": "מצטערים, חשבון זה הורחק עד %1 (סיבה: %2)", @@ -144,7 +145,7 @@ "user-already-flagged": "כבר דיווחת על המשתמש הזה", "post-flagged-too-many-times": "התקבל כבר דיווח על פוסט זה.", "user-flagged-too-many-times": "התקבל דיווח על משתמש זה.", - "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", + "cant-flag-privileged": "לא ניתן לדווח על מנהלים או על תוכן שנכתב על ידי מנהלים.", "self-vote": "אי אפשר להצביע בפרסום שיצרת", "too-many-downvotes-today": "אתה יכול להצביע נגד %1 פעמים ביום", "too-many-downvotes-today-user": "אתה יכול להצביע נגד משתמש %1 פעמים ביום", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 851d3f65a5..300b6ad245 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -29,7 +29,7 @@ "tools": "כלים", "locked": "נעול", "pinned": "נעוץ", - "pinned-with-expiry": "Pinned until %1", + "pinned-with-expiry": "נעוץ עד %1", "moved": "הועבר", "moved-from": "הועבר מ-%1", "copy-ip": "העתק IP", diff --git a/public/language/hr/error.json b/public/language/hr/error.json index d0ad8e654e..9df4081a87 100644 --- a/public/language/hr/error.json +++ b/public/language/hr/error.json @@ -40,6 +40,7 @@ "username-too-long": "Korisničko ime predugo", "password-too-long": "Lozinka je preduga", "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": "Korisnik blokiran", "user-banned-reason": "Ovaj račun je blokiran (Razlog: %1)", "user-banned-reason-until": "Ovaj račun je blokiran do %1 (Razlog: %2)", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index b76bf3d750..629a74eaa4 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -40,6 +40,7 @@ "username-too-long": "Túl hosszú felhasználónév", "password-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": "Kitiltott felhasználó", "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)", diff --git a/public/language/id/error.json b/public/language/id/error.json index 4d2f48fddf..b0901f8234 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -40,6 +40,7 @@ "username-too-long": "Username terlalu panjang", "password-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": "Pengguna dibanned", "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)", diff --git a/public/language/it/error.json b/public/language/it/error.json index b039e428a1..c52427b8dd 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -40,6 +40,7 @@ "username-too-long": "Nome utente troppo lungo", "password-too-long": "Password troppo lunga", "reset-rate-limited": "Troppe richieste di reimpostazione password (richieste limitate)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Utente bannato", "user-banned-reason": "Spiacente, questo account è stato bannato (Motivazione: %1)", "user-banned-reason-until": "Spiacente, questo account è stato bannato fino a %1 (Motivazione: %2)", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index bf39fa6c01..c5e84daae4 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -40,6 +40,7 @@ "username-too-long": "ユーザー名が長すぎます", "password-too-long": "パスワードが長すぎます", "reset-rate-limited": "パスワードのリセット要求が多すぎます。(料金制限あり)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "ユーザーは停止されています", "user-banned-reason": "申し訳ありませんが、このアカウントは停止されています。 (理由: %1)", "user-banned-reason-until": "申し訳ありませんが、このアカウントは％1(理由：％2)まで禁止されています。", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 54c7ea2ed5..104c99bd67 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -40,6 +40,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": "죄송합니다. 해당 계정은 차단되었습니다. (사유: %1)", "user-banned-reason-until": "죄송합니다. 해당 계정은 %1 까지 차단되었습니다. (사유: %2)", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 18ecdae867..235bb3b5b0 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -40,6 +40,7 @@ "username-too-long": "Vartotojo vardas per ilgas", "password-too-long": "Slaptažodis per ilgas", "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": "Vartotojas užblokuotas", "user-banned-reason": "Atsiprašome, ši paskyra buvo užblokuota (Priežastis: %1)", "user-banned-reason-until": "Atsiprašome, ši paskyra užblokuota iki %1 (Priežastis: %2)", diff --git a/public/language/lv/error.json b/public/language/lv/error.json index 40ba1b62c1..3bcd2648b6 100644 --- a/public/language/lv/error.json +++ b/public/language/lv/error.json @@ -40,6 +40,7 @@ "username-too-long": "Pārāk garš lietotājvārds", "password-too-long": "Pārāk gara parole", "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": "Lietotājs ir bloķēts", "user-banned-reason": "Diemžēl šis konts ir bloķēts (Iemesls: %1)", "user-banned-reason-until": "Diemžēl šis konts ir bloķēts līdz %1 (Iemesls: %2)", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 5bc1e320a3..5ef46406e8 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -40,6 +40,7 @@ "username-too-long": "Nama pengunna terlalu panjang", "password-too-long": "Kata laluan terlalu panjang", "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": "Pengguna diharamkan", "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)", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 1e56997cd2..2b83c8ff8e 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -40,6 +40,7 @@ "username-too-long": "Brukernavnet er for langt", "password-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": "Bruker utestengt", "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)", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 17f7860afe..155f328f0e 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -40,6 +40,7 @@ "username-too-long": "Gebruikersnaam is te lang", "password-too-long": "Wachtwoord is te lang", "reset-rate-limited": "Te veel verzoeken voor wachtwoordherstel (snelheid beperkt)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Gebruiker verbannen", "user-banned-reason": "Sorry, dit account is verbannen (Reden: %1)", "user-banned-reason-until": "Sorry, dit account is verbannen tot %1 (Reden: %2)", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 00cb18650d..7aee20d97d 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -40,6 +40,7 @@ "username-too-long": "Zbyt długa nazwa użytkownika", "password-too-long": "Hasło jest za długie", "reset-rate-limited": "Zbyt wiele żądań resetowania hasła (ograniczona ilość)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Użytkownik zbanowany", "user-banned-reason": "Twoje konto zostało zablokowane (Powód: %1)", "user-banned-reason-until": "Przepraszamy, to konto zostało zbanowane do %1 (Powód: %2)", diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json index ccc6730a55..b8a4f9b645 100644 --- a/public/language/pt-BR/error.json +++ b/public/language/pt-BR/error.json @@ -40,6 +40,7 @@ "username-too-long": "Nome de usuário muito longo", "password-too-long": "A senha é muito grande", "reset-rate-limited": "Muitas solicitações de redefinição de senha (taxa de ação limitada)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Usuário banido", "user-banned-reason": "Desculpa, esta conta foi banida (Motivo: %1)", "user-banned-reason-until": "Desculpa, esta conta foi banida até %1 (Motivo: %2)", diff --git a/public/language/pt-PT/error.json b/public/language/pt-PT/error.json index 5c679c6621..5e1bde5d18 100644 --- a/public/language/pt-PT/error.json +++ b/public/language/pt-PT/error.json @@ -40,6 +40,7 @@ "username-too-long": "Nome de utilizador muito longo", "password-too-long": "Palavra-passe muito longa", "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": "Utilizador banido", "user-banned-reason": "Desculpa, esta conta foi banida (Motivo: %1)", "user-banned-reason-until": "Desculpa, esta conta foi banida até %1 (Motivo: %2)", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 3ae027e399..23323d5895 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -40,6 +40,7 @@ "username-too-long": "Numele de utilizator este prea lung", "password-too-long": "Parola prea lunga.", "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": "Utilizator banat", "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)", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 703554e400..8358d69f11 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -40,6 +40,7 @@ "username-too-long": "Имя пользователя слишком длинное", "password-too-long": "Пароль слишком длинный", "reset-rate-limited": "Слишком много запросов на восстановление пароля (установлена блокировка)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Пользователь заблокирован", "user-banned-reason": "Учетная запись заблокирована (Причина: %1)", "user-banned-reason-until": "Извините, эта учётная запись заблокирована до %1 (Причина: %2)", diff --git a/public/language/rw/error.json b/public/language/rw/error.json index 41de06bec4..486834e189 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -40,6 +40,7 @@ "username-too-long": "Izina ni rirerire cyane", "password-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": "Umuntu wirukanwe", "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)", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index bc38125be6..b0f6217392 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -40,6 +40,7 @@ "username-too-long": "Username too long", "password-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", "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)", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 9095048ff2..32b8e9e6e3 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -40,6 +40,7 @@ "username-too-long": "Užívateľské meno je príliš dlhé", "password-too-long": "Heslo je príliš dlhé", "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": "Užívateľ je zablokovaný", "user-banned-reason": "Prepáčte, tento účet bol zablokovaný (Dôvod: %1)", "user-banned-reason-until": "Ospravedlňujeme sa, tento účet bol zablokovaný do %1 (Dôvod: %2)", diff --git a/public/language/sl/error.json b/public/language/sl/error.json index 4b5b3c9f06..0b496ca455 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -40,6 +40,7 @@ "username-too-long": "Uporabniško ime je predolgo.", "password-too-long": "Geslo je predolgo.", "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": "Uporabnik je izločen.", "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)", diff --git a/public/language/sr/error.json b/public/language/sr/error.json index bdf711e82c..711c77d3a7 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -40,6 +40,7 @@ "username-too-long": "Корисничко име је предуго", "password-too-long": "Шифра је предугачка.", "reset-rate-limited": "Превише захтева за поништавање лозинке (ограничена стопа)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Корисник је забрањен", "user-banned-reason": "Овај налог је забрањен (Разлог: %1)", "user-banned-reason-until": "Овај налог је забрањен до %1 (Разлог: %2)", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 78ced4cccf..b248543af8 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -40,6 +40,7 @@ "username-too-long": "Användarnamnet är för långt", "password-too-long": "Lösenordet är för långt", "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": "Användare bannlyst", "user-banned-reason": "Vi beklagar, men detta konto har blivit bannlyst (Anledning: %1)", "user-banned-reason-until": "Vi beklagar, men detta konto har blivit bannlyst till %1 (Anledning: %2)", diff --git a/public/language/th/error.json b/public/language/th/error.json index f614f6c299..e949e725be 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -40,6 +40,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": "ขออภัย บัญชีผู้ใช้นี้ได้รับการแบน (เหตุผล : %1)", "user-banned-reason-until": "ขออภัย บัญชีผู้ใช้นี้ได้รับการแบนจนถึง %1 (เหตุผล : %2)", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index ddef7c83dd..185a847e5d 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -40,6 +40,7 @@ "username-too-long": "Kullanıcı ismi çok uzun", "password-too-long": "Şifre çok uzun", "reset-rate-limited": "Aşırı fazla sayıda şifre sıfırlama isteği (kısıtlayıcı)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Kullanıcı Yasaklı", "user-banned-reason": "Maalesef, bu hesap yasaklandı (Sebep: %1)", "user-banned-reason-until": "Maalesef, bu hesap %1 tarihine kadar yasaklandı (Sebep: %2)", diff --git a/public/language/uk/error.json b/public/language/uk/error.json index 88733c3b30..bc967acc28 100644 --- a/public/language/uk/error.json +++ b/public/language/uk/error.json @@ -40,6 +40,7 @@ "username-too-long": "Ім'я користувача задовге", "password-too-long": "Пароль задовгий", "reset-rate-limited": "Занадто багато запитів на скидання паролю (кількість за період часу обмежена)", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "Користувача забанено", "user-banned-reason": "Вибачте, але цей акаунт було забанено (Причина: %1)", "user-banned-reason-until": "Вибачте, цей акаунт забанений до %1 (Причина: %2)", diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 68b71c19ce..d5531d5dad 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -40,6 +40,7 @@ "username-too-long": "Tên đăng nhập quá dài", "password-too-long": "Mật khẩu quá dài", "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": "Tài khoản bị ban", "user-banned-reason": "Xin lỗi, tài khoản này đã bị khóa (Lí do: %1)", "user-banned-reason-until": "Rất tiếc, tài khoản này đã bị cấm cho đến %1 (Lý do: %2)", diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index 295f877add..1159b5b355 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -40,6 +40,7 @@ "username-too-long": "用户名太长", "password-too-long": "密码太长", "reset-rate-limited": "太多密码重置请求（总数有限）", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "用户已禁止", "user-banned-reason": "抱歉，此帐号已经被封禁 (原因：%1)", "user-banned-reason-until": "抱歉，此帐户已被封禁，直到%1（原因：%2）", diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json index c68df18241..83fec47ca8 100644 --- a/public/language/zh-TW/error.json +++ b/public/language/zh-TW/error.json @@ -40,6 +40,7 @@ "username-too-long": "使用者名太長", "password-too-long": "密碼太長", "reset-rate-limited": "太多密碼重設請求（有頻率限制）", + "reset-same-password": "Please use a password that is different from your current one", "user-banned": "使用者已停權", "user-banned-reason": "抱歉，此帳戶已經被停權 (原因：%1)", "user-banned-reason-until": "抱歉，此帳戶已被停權，直到%1（原因：%2）", From 7b39cf4bb7b10c54b5b3d3b1a28495781c8191c7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 30 Nov 2020 14:32:49 +0000 Subject: [PATCH 073/116] fix(deps): update dependency validator to v13.5.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5aa0909c9a..65f91fd546 100644 --- a/install/package.json +++ b/install/package.json @@ -145,7 +145,7 @@ "tinycon": "0.6.8", "toobusy-js": "^0.5.1", "uglify-es": "^3.3.9", - "validator": "13.1.17", + "validator": "13.5.1", "visibilityjs": "2.0.2", "winston": "3.3.3", "xml": "^1.0.1", From a4fe4d3cf55a8b94705523c494e8684d002903d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 11:08:00 -0500 Subject: [PATCH 074/116] fix: allow guests to see their replies immediately --- src/api/topics.js | 8 +++++++- src/socket.io/index.js | 5 +++-- src/user/online.js | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/api/topics.js b/src/api/topics.js index 10ef0a8809..98b87c95b6 100644 --- a/src/api/topics.js +++ b/src/api/topics.js @@ -8,6 +8,7 @@ const meta = require('../meta'); const apiHelpers = require('./helpers'); const doTopicAction = apiHelpers.doTopicAction; +const websockets = require('../socket.io'); const socketHelpers = require('../socket.io/helpers'); const topicsAPI = module.exports; @@ -72,7 +73,12 @@ topicsAPI.reply = async function (caller, data) { }; user.updateOnlineUsers(caller.uid); - socketHelpers.emitToUids('event:new_post', result, [caller.uid]); + if (caller.uid) { + socketHelpers.emitToUids('event:new_post', result, [caller.uid]); + } else if (caller.uid === 0 && caller.sessionID) { + websockets.in('sess_' + caller.sessionID).emit('event:new_post', result); + } + socketHelpers.notifyNew(caller.uid, 'newPost', result); return postObj[0]; diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 9d57d08c68..952595f57a 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -198,14 +198,15 @@ async function authorize(socket, callback) { } await cookieParserAsync(request); - - const sessionData = await getSessionAsync(request.signedCookies[nconf.get('sessionKey')]); + const sid = request.signedCookies[nconf.get('sessionKey')]; + const sessionData = await getSessionAsync(sid); if (sessionData && sessionData.passport && sessionData.passport.user) { request.session = sessionData; socket.uid = parseInt(sessionData.passport.user, 10); } else { socket.uid = 0; } + socket.sessionID = sid; request.uid = socket.uid; callback(); } diff --git a/src/user/online.js b/src/user/online.js index a4c2be313c..fd144cad05 100644 --- a/src/user/online.js +++ b/src/user/online.js @@ -7,6 +7,9 @@ var meta = require('../meta'); module.exports = function (User) { User.updateLastOnlineTime = async function (uid) { + if (!(parseInt(uid, 10) > 0)) { + return; + } const userData = await db.getObjectFields('user:' + uid, ['status', 'lastonline']); const now = Date.now(); if (userData.status === 'offline' || now - parseInt(userData.lastonline, 10) < 300000) { @@ -16,6 +19,9 @@ module.exports = function (User) { }; User.updateOnlineUsers = async function (uid) { + if (!(parseInt(uid, 10) > 0)) { + return; + } const now = Date.now(); const userOnlineTime = await db.sortedSetScore('users:online', uid); if (now - parseInt(userOnlineTime, 10) < 300000) { From 700736535c87dc530a947d100c0ba8d4f4d550f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 11:51:52 -0500 Subject: [PATCH 075/116] fix: guests dont always have sid --- src/api/topics.js | 4 ++-- src/socket.io/index.js | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/api/topics.js b/src/api/topics.js index 98b87c95b6..cca32a6818 100644 --- a/src/api/topics.js +++ b/src/api/topics.js @@ -75,8 +75,8 @@ topicsAPI.reply = async function (caller, data) { user.updateOnlineUsers(caller.uid); if (caller.uid) { socketHelpers.emitToUids('event:new_post', result, [caller.uid]); - } else if (caller.uid === 0 && caller.sessionID) { - websockets.in('sess_' + caller.sessionID).emit('event:new_post', result); + } else if (caller.uid === 0) { + websockets.in('online_guests').emit('event:new_post', result); } socketHelpers.notifyNew(caller.uid, 'newPost', result); diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 952595f57a..6e6be257ae 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -198,15 +198,13 @@ async function authorize(socket, callback) { } await cookieParserAsync(request); - const sid = request.signedCookies[nconf.get('sessionKey')]; - const sessionData = await getSessionAsync(sid); + const sessionData = await getSessionAsync(request.signedCookies[nconf.get('sessionKey')]); if (sessionData && sessionData.passport && sessionData.passport.user) { request.session = sessionData; socket.uid = parseInt(sessionData.passport.user, 10); } else { socket.uid = 0; } - socket.sessionID = sid; request.uid = socket.uid; callback(); } From 9004319e0d7b9b103cb520e9f9cebf6f71930b75 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 30 Nov 2020 16:10:14 +0000 Subject: [PATCH 076/116] fix(deps): update dependency nodebb-plugin-markdown to v8.12.3 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 65f91fd546..5c810c4acc 100644 --- a/install/package.json +++ b/install/package.json @@ -97,7 +97,7 @@ "nodebb-plugin-dbsearch": "4.1.2", "nodebb-plugin-emoji": "^3.3.0", "nodebb-plugin-emoji-android": "2.0.0", - "nodebb-plugin-markdown": "8.12.2", + "nodebb-plugin-markdown": "8.12.3", "nodebb-plugin-mentions": "2.13.5", "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.7.6", From 286243cd370f8211fae0c1717413d2cb47b39109 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 30 Nov 2020 14:02:07 -0500 Subject: [PATCH 077/116] fix(acp): #9009 no-users-browsing untranslated on dashboard --- public/src/admin/dashboard.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js index e3bd17f9c0..a42efeda2d 100644 --- a/public/src/admin/dashboard.js +++ b/public/src/admin/dashboard.js @@ -500,10 +500,14 @@ define('admin/dashboard', ['Chart', 'translator', 'benchpress'], function (Chart function updateTopicsGraph(topics) { if (!topics.length) { - topics = [{ - title: '[[admin/dashboard:no-users-browsing]]', - count: 1, - }]; + translator.translate('[[admin/dashboard:no-users-browsing]]', function (translated) { + topics = [{ + title: translated, + count: 1, + }]; + updateTopicsGraph(topics); + }); + return; } graphs.topics.data.labels = []; From 54dc449fb971e95967df283d8bf88ab52c748731 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 30 Nov 2020 14:07:28 -0500 Subject: [PATCH 078/116] fix(acp): #9008 undefined link for "no users browsing" state on dashboard --- public/src/admin/dashboard.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js index a42efeda2d..7ed5d572fe 100644 --- a/public/src/admin/dashboard.js +++ b/public/src/admin/dashboard.js @@ -526,9 +526,8 @@ define('admin/dashboard', ['Chart', 'translator', 'benchpress'], function (Chart var legend = $('#topics-legend').html(''); var html = ''; topics.forEach(function (t, i) { - var label = t.count === '0' ? - t.title : - ' ' + t.title + ''; + var link = t.tid ? ' ' + t.title + '' : t.title; + var label = t.count === '0' ? t.title : link; html += '
  • ' + '
    ' + From d46740f86057317641101086b57d8da773b83c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 15:05:26 -0500 Subject: [PATCH 079/116] fix: #9007 revoke old sessions after adding --- src/user/auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/auth.js b/src/user/auth.js index 0a38609215..fdf318d156 100644 --- a/src/user/auth.js +++ b/src/user/auth.js @@ -107,8 +107,8 @@ module.exports = function (User) { return; } await cleanExpiredSessions(uid); - await revokeSessionsAboveThreshold(uid, meta.config.maxUserSessions); await db.sortedSetAdd('uid:' + uid + ':sessions', Date.now(), sessionId); + await revokeSessionsAboveThreshold(uid, meta.config.maxUserSessions); }; async function revokeSessionsAboveThreshold(uid, maxUserSessions) { From 202dcef42eb436758e374063868a8818acbf9c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 15:23:37 -0500 Subject: [PATCH 080/116] fix: #9010, show rest of info even if clusterMonitor priv is not granted --- src/controllers/admin/database.js | 32 ++++++++++----------------- src/database/mongo.js | 21 +++++++++++++++--- src/views/admin/advanced/database.tpl | 13 +++++------ 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/controllers/admin/database.js b/src/controllers/admin/database.js index 060ba1501a..759002ad6e 100644 --- a/src/controllers/admin/database.js +++ b/src/controllers/admin/database.js @@ -6,26 +6,18 @@ const databaseController = module.exports; databaseController.get = async function (req, res) { const results = {}; - try { - if (nconf.get('redis')) { - const rdb = require('../../database/redis'); - results.redis = await rdb.info(rdb.client); - } - if (nconf.get('mongo')) { - const mdb = require('../../database/mongo'); - results.mongo = await mdb.info(mdb.client); - } - if (nconf.get('postgres')) { - const pdb = require('../../database/postgres'); - results.postgres = await pdb.info(pdb.pool); - } - } catch (err) { - Object.assign(results, { error: err }); - // Override mongo error with more human-readable error - if (err.name === 'MongoError' && err.codeName === 'Unauthorized') { - err.friendlyMessage = '[[admin/advanced/database:mongo.unauthorized]]'; - delete results.mongo; - } + if (nconf.get('redis')) { + const rdb = require('../../database/redis'); + results.redis = await rdb.info(rdb.client); } + if (nconf.get('mongo')) { + const mdb = require('../../database/mongo'); + results.mongo = await mdb.info(mdb.client); + } + if (nconf.get('postgres')) { + const pdb = require('../../database/postgres'); + results.postgres = await pdb.info(pdb.pool); + } + res.render('admin/advanced/database', results); }; diff --git a/src/database/mongo.js b/src/database/mongo.js index e6e5e040a9..7fe13baaaf 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -110,14 +110,29 @@ mongoModule.info = async function (db) { db = client.db(); } mongoModule.client = mongoModule.client || db; + let serverStatusError = ''; + + async function getServerStatus() { + try { + return await db.command({ serverStatus: 1 }); + } catch (err) { + serverStatusError = err.message; + // Override mongo error with more human-readable error + if (err.name === 'MongoError' && err.codeName === 'Unauthorized') { + serverStatusError = '[[admin/advanced/database:mongo.unauthorized]]'; + } + winston.error(err.stack); + } + } let [serverStatus, stats, listCollections] = await Promise.all([ - db.command({ serverStatus: 1 }), + getServerStatus(), db.command({ dbStats: 1 }), getCollectionStats(db), ]); stats = stats || {}; serverStatus = serverStatus || {}; + stats.serverStatusError = serverStatusError; const scale = 1024 * 1024 * 1024; listCollections = listCollections.map(function (collectionInfo) { @@ -132,12 +147,12 @@ mongoModule.info = async function (db) { }; }); - stats.mem = serverStatus.mem || {}; + stats.mem = serverStatus.mem || { resident: 0, virtual: 0, mapped: 0 }; stats.mem.resident = (stats.mem.resident / 1024).toFixed(3); stats.mem.virtual = (stats.mem.virtual / 1024).toFixed(3); stats.mem.mapped = (stats.mem.mapped / 1024).toFixed(3); stats.collectionData = listCollections; - stats.network = serverStatus.network || {}; + stats.network = serverStatus.network || { bytesIn: 0, bytesOut: 0, numRequests: 0 }; stats.network.bytesIn = (stats.network.bytesIn / scale).toFixed(3); stats.network.bytesOut = (stats.network.bytesOut / scale).toFixed(3); stats.network.numRequests = utils.addCommas(stats.network.numRequests); diff --git a/src/views/admin/advanced/database.tpl b/src/views/admin/advanced/database.tpl index 3d90e6813c..f63b77cb86 100644 --- a/src/views/admin/advanced/database.tpl +++ b/src/views/admin/advanced/database.tpl @@ -1,13 +1,12 @@ - -
    - {error.friendlyMessage} -
    - {error.errmsg} -
    - +
    {{{ if mongo }}}
    + {{{ if mongo.serverStatusError }}} +
    + {mongo.serverStatusError} +
    + {{{ end }}}
    [[admin/advanced/database:mongo]]
    From 4317cdea34f4abff1aa828a6069a329be5c9945b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 30 Nov 2020 16:07:08 -0500 Subject: [PATCH 081/116] fix: #9002 ban templates not user friendly --- src/user/bans.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/user/bans.js b/src/user/bans.js index 464b8300bc..d35370cb57 100644 --- a/src/user/bans.js +++ b/src/user/bans.js @@ -3,7 +3,6 @@ const winston = require('winston'); const meta = require('../meta'); -const utils = require('../utils'); const emailer = require('../emailer'); const db = require('../database'); @@ -47,10 +46,11 @@ module.exports = function (User) { // Email notification of ban const username = await User.getUserField(uid, 'username'); const siteTitle = meta.config.title || 'NodeBB'; + const data = { subject: '[[email:banned.subject, ' + siteTitle + ']]', username: username, - until: until ? utils.toISOString(until) : false, + until: until ? (new Date(until)).toUTCString().replace(/,/g, '\\,') : false, reason: reason, }; try { From 14bb0a446917e2f45bdb4c42f8d22e5e3a0df3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 18:09:30 -0500 Subject: [PATCH 082/116] feat: #8960, update view count after merge --- src/topics/merge.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/topics/merge.js b/src/topics/merge.js index b3f5718422..2688ef69fc 100644 --- a/src/topics/merge.js +++ b/src/topics/merge.js @@ -32,7 +32,14 @@ module.exports = function (Topics) { }); }); - plugins.hooks.fire('action:topic.merge', { uid: uid, tids: tids, mergeIntoTid: mergeIntoTid, otherTids: otherTids }); + await updateViewCount(mergeIntoTid, tids); + + plugins.hooks.fire('action:topic.merge', { + uid: uid, + tids: tids, + mergeIntoTid: mergeIntoTid, + otherTids: otherTids, + }); return mergeIntoTid; }; @@ -46,6 +53,14 @@ module.exports = function (Topics) { return tid; } + async function updateViewCount(mergeIntoTid, tids) { + const topicData = await Topics.getTopicsFields(tids, ['viewcount']); + const totalViewCount = topicData.reduce( + (count, topic) => count + parseInt(topic.viewcount, 10), 0 + ); + await Topics.setTopicField(mergeIntoTid, 'viewcount', totalViewCount); + } + function findOldestTopic(tids) { return Math.min.apply(null, tids); } From 1eb5fabdb11d0f9119081ab2e95d569717f5b3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 22:36:30 -0500 Subject: [PATCH 083/116] feat: #8900, postQueue setting for category --- install/data/defaults.json | 1 + .../en-GB/admin/manage/categories.json | 1 + src/api/topics.js | 1 - src/categories/data.js | 13 +++--- src/controllers/admin/categories.js | 2 + src/posts/queue.js | 32 +++++++++++++-- src/views/admin/manage/category.tpl | 40 +++++++++++++------ 7 files changed, 68 insertions(+), 22 deletions(-) diff --git a/install/data/defaults.json b/install/data/defaults.json index aee61b65df..c33e951044 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -20,6 +20,7 @@ "chatDeleteDuration": 0, "chatMessageDelay": 200, "newbiePostDelayThreshold": 3, + "postQueue": 0, "postQueueReputationThreshold": 0, "groupsExemptFromPostQueue": ["administrators", "Global Moderators"], "minimumPostLength": 8, diff --git a/public/language/en-GB/admin/manage/categories.json b/public/language/en-GB/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/en-GB/admin/manage/categories.json +++ b/public/language/en-GB/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/src/api/topics.js b/src/api/topics.js index cca32a6818..98d92022a8 100644 --- a/src/api/topics.js +++ b/src/api/topics.js @@ -21,7 +21,6 @@ topicsAPI.create = async function (caller, data) { const payload = { ...data }; payload.tags = payload.tags || []; payload.uid = caller.uid; - payload.uid = caller.uid; payload.req = apiHelpers.buildReqObject(caller); payload.timestamp = Date.now(); payload.fromQueue = false; diff --git a/src/categories/data.js b/src/categories/data.js index 4e3dbb1365..e75b825cb9 100644 --- a/src/categories/data.js +++ b/src/categories/data.js @@ -5,11 +5,12 @@ const validator = require('validator'); const db = require('../database'); const meta = require('../meta'); const plugins = require('../plugins'); +const utils = require('../utils'); const intFields = [ 'cid', 'parentCid', 'disabled', 'isSection', 'order', 'topic_count', 'post_count', 'numRecentReplies', - 'minTags', 'maxTags', + 'minTags', 'maxTags', 'postQueue', ]; module.exports = function (Categories) { @@ -63,12 +64,13 @@ module.exports = function (Categories) { }; }; -function defaultMinMaxTags(category, fields, fieldName, defaultField) { +function defaultIntField(category, fields, fieldName, defaultField) { if (!fields.length || fields.includes(fieldName)) { const useDefault = !category.hasOwnProperty(fieldName) || category[fieldName] === null || category[fieldName] === '' || - !parseInt(category[fieldName], 10); + !utils.isNumber(category[fieldName]); + category[fieldName] = useDefault ? meta.config[defaultField] : category[fieldName]; } } @@ -78,8 +80,9 @@ function modifyCategory(category, fields) { return; } - defaultMinMaxTags(category, fields, 'minTags', 'minimumTagsPerTopic'); - defaultMinMaxTags(category, fields, 'maxTags', 'maximumTagsPerTopic'); + defaultIntField(category, fields, 'minTags', 'minimumTagsPerTopic'); + defaultIntField(category, fields, 'maxTags', 'maximumTagsPerTopic'); + defaultIntField(category, fields, 'postQueue', 'postQueue'); db.parseIntFields(category, intFields, fields); diff --git a/src/controllers/admin/categories.js b/src/controllers/admin/categories.js index 796b36de25..b32b281659 100644 --- a/src/controllers/admin/categories.js +++ b/src/controllers/admin/categories.js @@ -4,6 +4,7 @@ const categories = require('../../categories'); const analytics = require('../../analytics'); const plugins = require('../../plugins'); const translator = require('../../translator'); +const meta = require('../../meta'); const categoriesController = module.exports; @@ -42,6 +43,7 @@ categoriesController.get = async function (req, res, next) { categories: data.allCategories, selectedCategory: selectedCategory, customClasses: data.customClasses, + postQueueEnabled: !!meta.config.postQueue, }); }; diff --git a/src/posts/queue.js b/src/posts/queue.js index bd8121399e..73c6fbc261 100644 --- a/src/posts/queue.js +++ b/src/posts/queue.js @@ -15,9 +15,15 @@ const socketHelpers = require('../socket.io/helpers'); module.exports = function (Posts) { Posts.shouldQueue = async function (uid, data) { - const userData = await user.getUserFields(uid, ['uid', 'reputation', 'postcount']); - const isMemberOfExempt = await groups.isMemberOfAny(userData.uid, meta.config.groupsExemptFromPostQueue); - const shouldQueue = meta.config.postQueue && !isMemberOfExempt && (!userData.uid || userData.reputation < meta.config.postQueueReputationThreshold || userData.postcount <= 0); + const [userData, isMemberOfExempt, categoryQueueEnabled] = await Promise.all([ + user.getUserFields(uid, ['uid', 'reputation', 'postcount']), + groups.isMemberOfAny(uid, meta.config.groupsExemptFromPostQueue), + isCategoryQueueEnabled(data), + ]); + + const shouldQueue = meta.config.postQueue && categoryQueueEnabled && + !isMemberOfExempt && + (!userData.uid || userData.reputation < meta.config.postQueueReputationThreshold || userData.postcount <= 0); const result = await plugins.hooks.fire('filter:post.shouldQueue', { shouldQueue: !!shouldQueue, uid: uid, @@ -26,6 +32,24 @@ module.exports = function (Posts) { return result.shouldQueue; }; + async function isCategoryQueueEnabled(data) { + const type = getType(data); + const cid = await getCid(type, data); + if (!cid) { + throw new Error('[[error:invalid-cid]]'); + } + return await categories.getCategoryField(cid, 'postQueue'); + } + + function getType(data) { + if (data.tid && data.content) { + return 'reply'; + } else if (data.cid && data.title && data.content) { + return 'topic'; + } + throw new Error('[[error:invalid-type]]'); + } + async function removeQueueNotification(id) { await notifications.rescind('post-queue-' + id); const data = await getParsedObject(id); @@ -46,7 +70,7 @@ module.exports = function (Posts) { } Posts.addToQueue = async function (data) { - const type = data.title ? 'topic' : 'reply'; + const type = getType(data); const now = Date.now(); const id = type + '-' + now; await canPost(type, data); diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl index 48fb985066..332b82adf9 100644 --- a/src/views/admin/manage/category.tpl +++ b/src/views/admin/manage/category.tpl @@ -80,16 +80,6 @@
    -
    -
    -
    - -
    -
    -
    @@ -111,10 +101,36 @@
    -
    - +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    + {{{ if postQueueEnabled }}} +
    +
    +
    + +
    +
    +
    + {{{ end }}} +
    From f7c738dedaf5a12ff37cd5109fd647c24f500401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 22:51:33 -0500 Subject: [PATCH 084/116] fix: #8997, don't send notifications if uids already in group --- src/groups/invite.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/groups/invite.js b/src/groups/invite.js index 10d56a076b..ad17a36ecf 100644 --- a/src/groups/invite.js +++ b/src/groups/invite.js @@ -51,7 +51,7 @@ module.exports = function (Groups) { Groups.invite = async function (groupName, uids) { uids = Array.isArray(uids) ? uids : [uids]; - await inviteOrRequestMembership(groupName, uids, 'invite'); + uids = await inviteOrRequestMembership(groupName, uids, 'invite'); const notificationData = await Promise.all(uids.map(uid => notifications.create({ type: 'group-invite', @@ -87,6 +87,7 @@ module.exports = function (Groups) { groupName: groupName, uids: uids, }); + return uids; } Groups.isInvited = async function (uids, groupName) { From cfb7b113e95dccfca93d7274e08b0a71041de397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 30 Nov 2020 22:54:27 -0500 Subject: [PATCH 085/116] fix: spec --- public/openapi/components/schemas/CategoryObject.yaml | 2 ++ public/openapi/read/admin/manage/categories/category_id.yaml | 2 ++ public/openapi/read/category/cid/id.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/public/openapi/components/schemas/CategoryObject.yaml b/public/openapi/components/schemas/CategoryObject.yaml index 1599975b3c..c19a5f192c 100644 --- a/public/openapi/components/schemas/CategoryObject.yaml +++ b/public/openapi/components/schemas/CategoryObject.yaml @@ -57,6 +57,8 @@ CategoryObject: description: The `background-position` of the category background image, if one is set isSection: type: number + postQueue: + type: number totalPostCount: type: number description: The number of posts in the category diff --git a/public/openapi/read/admin/manage/categories/category_id.yaml b/public/openapi/read/admin/manage/categories/category_id.yaml index bf7946222f..0dba90a8a6 100644 --- a/public/openapi/read/admin/manage/categories/category_id.yaml +++ b/public/openapi/read/admin/manage/categories/category_id.yaml @@ -89,4 +89,6 @@ get: type: array items: type: string + postQueueEnabled: + type: boolean - $ref: ../../../../components/schemas/CommonProps.yaml#/CommonProps \ No newline at end of file diff --git a/public/openapi/read/category/cid/id.yaml b/public/openapi/read/category/cid/id.yaml index 98fd0d4e34..e70f774b07 100644 --- a/public/openapi/read/category/cid/id.yaml +++ b/public/openapi/read/category/cid/id.yaml @@ -53,6 +53,8 @@ get: type: string isSection: type: number + postQueue: + type: number totalPostCount: type: number totalTopicCount: From 4093ccf813554c5dde7c812de34a6d782eff973e Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Tue, 1 Dec 2020 09:09:48 +0000 Subject: [PATCH 086/116] Latest translations and fallbacks --- public/language/ar/admin/manage/categories.json | 1 + public/language/bg/admin/manage/categories.json | 1 + public/language/bn/admin/manage/categories.json | 1 + public/language/cs/admin/manage/categories.json | 1 + public/language/da/admin/manage/categories.json | 1 + public/language/de/admin/manage/categories.json | 1 + public/language/el/admin/manage/categories.json | 1 + public/language/en-US/admin/manage/categories.json | 1 + public/language/en-x-pirate/admin/manage/categories.json | 1 + public/language/es/admin/manage/categories.json | 1 + public/language/et/admin/manage/categories.json | 1 + public/language/fa-IR/admin/manage/categories.json | 1 + public/language/fi/admin/manage/categories.json | 1 + public/language/fr/admin/manage/categories.json | 1 + public/language/fr/admin/manage/privileges.json | 2 +- public/language/fr/admin/manage/tags.json | 2 +- public/language/fr/admin/manage/users.json | 4 ++-- public/language/fr/error.json | 4 ++-- public/language/fr/notifications.json | 2 +- public/language/fr/topic.json | 2 +- public/language/gl/admin/manage/categories.json | 1 + public/language/he/admin/manage/categories.json | 1 + public/language/hr/admin/manage/categories.json | 1 + public/language/hu/admin/manage/categories.json | 1 + public/language/id/admin/manage/categories.json | 1 + public/language/it/admin/manage/categories.json | 1 + public/language/it/error.json | 2 +- public/language/ja/admin/manage/categories.json | 1 + public/language/ko/admin/manage/categories.json | 1 + public/language/lt/admin/manage/categories.json | 1 + public/language/lv/admin/manage/categories.json | 1 + public/language/ms/admin/manage/categories.json | 1 + public/language/nb/admin/manage/categories.json | 1 + public/language/nl/admin/manage/categories.json | 1 + public/language/pl/admin/manage/categories.json | 1 + public/language/pt-BR/admin/manage/categories.json | 1 + public/language/pt-PT/admin/manage/categories.json | 1 + public/language/ro/admin/manage/categories.json | 1 + public/language/ru/admin/manage/categories.json | 1 + public/language/rw/admin/manage/categories.json | 1 + public/language/sc/admin/manage/categories.json | 1 + public/language/sk/admin/manage/categories.json | 1 + public/language/sl/admin/manage/categories.json | 1 + public/language/sr/admin/manage/categories.json | 1 + public/language/sv/admin/manage/categories.json | 1 + public/language/th/admin/manage/categories.json | 1 + public/language/tr/admin/manage/categories.json | 1 + public/language/uk/admin/manage/categories.json | 1 + public/language/vi/admin/manage/categories.json | 1 + public/language/zh-CN/admin/manage/categories.json | 1 + public/language/zh-TW/admin/manage/categories.json | 1 + 51 files changed, 53 insertions(+), 9 deletions(-) diff --git a/public/language/ar/admin/manage/categories.json b/public/language/ar/admin/manage/categories.json index 4239b8d776..ef0edfd82c 100644 --- a/public/language/ar/admin/manage/categories.json +++ b/public/language/ar/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/bg/admin/manage/categories.json b/public/language/bg/admin/manage/categories.json index 8cd3a0bf60..92a8a83fcd 100644 --- a/public/language/bg/admin/manage/categories.json +++ b/public/language/bg/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "Брой на скорошните отговори", "ext-link": "Външна връзка", "is-section": "Използване на тази категория като раздел", + "post-queue": "Опашка за публикации", "tag-whitelist": "Списък от разрешени етикети", "upload-image": "Качване на изображение", "delete-image": "Премахване", diff --git a/public/language/bn/admin/manage/categories.json b/public/language/bn/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/bn/admin/manage/categories.json +++ b/public/language/bn/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/cs/admin/manage/categories.json b/public/language/cs/admin/manage/categories.json index 298c74df8a..d0425cd087 100644 --- a/public/language/cs/admin/manage/categories.json +++ b/public/language/cs/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# posledních odpovědí", "ext-link": "Externí odkaz", "is-section": "Zacházet s kategorii jako se sekcí", + "post-queue": "Post queue", "tag-whitelist": "Seznam povolených značek", "upload-image": "Nahrát obrázek", "delete-image": "Vyjmout", diff --git a/public/language/da/admin/manage/categories.json b/public/language/da/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/da/admin/manage/categories.json +++ b/public/language/da/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/de/admin/manage/categories.json b/public/language/de/admin/manage/categories.json index 6c63acb776..e450fdbd10 100644 --- a/public/language/de/admin/manage/categories.json +++ b/public/language/de/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "Anzahl neuer Antworten", "ext-link": "Externer Link", "is-section": "Behandle diese Kategorie als Abschnitt", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Bild hochladen", "delete-image": "Entfernen", diff --git a/public/language/el/admin/manage/categories.json b/public/language/el/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/el/admin/manage/categories.json +++ b/public/language/el/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/en-US/admin/manage/categories.json b/public/language/en-US/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/en-US/admin/manage/categories.json +++ b/public/language/en-US/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/en-x-pirate/admin/manage/categories.json b/public/language/en-x-pirate/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/en-x-pirate/admin/manage/categories.json +++ b/public/language/en-x-pirate/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/es/admin/manage/categories.json b/public/language/es/admin/manage/categories.json index f8e435230a..add7026d1f 100644 --- a/public/language/es/admin/manage/categories.json +++ b/public/language/es/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# de Respuestas Recientes", "ext-link": "Enlace Externo", "is-section": "Tratar esta categoría como una sección", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Subir Imagen", "delete-image": "Eliminar", diff --git a/public/language/et/admin/manage/categories.json b/public/language/et/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/et/admin/manage/categories.json +++ b/public/language/et/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/fa-IR/admin/manage/categories.json b/public/language/fa-IR/admin/manage/categories.json index 2e476817d7..65912bf16d 100644 --- a/public/language/fa-IR/admin/manage/categories.json +++ b/public/language/fa-IR/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/fi/admin/manage/categories.json b/public/language/fi/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/fi/admin/manage/categories.json +++ b/public/language/fi/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/fr/admin/manage/categories.json b/public/language/fr/admin/manage/categories.json index cd07e21b9e..470ca2fdc4 100644 --- a/public/language/fr/admin/manage/categories.json +++ b/public/language/fr/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# de réponses récentes", "ext-link": "Lien externe", "is-section": "Traiter cette catégorie comme une section", + "post-queue": "Post queue", "tag-whitelist": "Liste blanche de mots clés", "upload-image": "Envoyer une image", "delete-image": "Enlever", diff --git a/public/language/fr/admin/manage/privileges.json b/public/language/fr/admin/manage/privileges.json index 4f274df88f..487bb04fdb 100644 --- a/public/language/fr/admin/manage/privileges.json +++ b/public/language/fr/admin/manage/privileges.json @@ -4,7 +4,7 @@ "group-privileges": "Privilèges de groupe", "user-privileges": "Privilèges d'utilisateur", "edit-privileges": "Éditer les privilèges", - "select-clear-all": "Select/Clear All", + "select-clear-all": "Tout Sélectionner / Tout effacer", "chat": "Chat", "upload-images": "Images envoyées", "upload-files": "Fichiers envoyés", diff --git a/public/language/fr/admin/manage/tags.json b/public/language/fr/admin/manage/tags.json index 8816a107d3..7b178ce0b0 100644 --- a/public/language/fr/admin/manage/tags.json +++ b/public/language/fr/admin/manage/tags.json @@ -15,5 +15,5 @@ "alerts.editing": "Modification des tag(s)", "alerts.confirm-delete": "Vous-voulez réellement supprimer les mots-clés sélectionnés ?", "alerts.update-success": "Mot-clés mis à jour !", - "reset-colors": "Reset colors" + "reset-colors": "Réinitialiser les couleurs" } \ No newline at end of file diff --git a/public/language/fr/admin/manage/users.json b/public/language/fr/admin/manage/users.json index 6b646e2253..b4a8b4e8dd 100644 --- a/public/language/fr/admin/manage/users.json +++ b/public/language/fr/admin/manage/users.json @@ -103,6 +103,6 @@ "alerts.prompt-email": "Emails: ", "alerts.email-sent-to": "Un e-mail d'invitation a été envoyé à %1", "alerts.x-users-found": "%1 utilisateur(s) trouvé(s), (%2 secondes)", - "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." + "export-users-started": "L'exportation d'utilisateurs au format CSV peut prendre un certain temps. Vous recevrez une notification lorsqu'elle sera terminée.", + "export-users-completed": "Utilisateurs exportés au format CSV, cliquez ici pour télécharger." } \ No newline at end of file diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 14c179a4bc..f33fe352d0 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -40,7 +40,7 @@ "username-too-long": "Nom d'utilisateur trop long", "password-too-long": "Mot de passe trop long", "reset-rate-limited": "Trop de demandes de réinitialisation de mot de passe (demandes limitées)", - "reset-same-password": "Please use a password that is different from your current one", + "reset-same-password": "Veuillez utiliser un mot de passe différent de votre mot de passe actuel", "user-banned": "Utilisateur banni", "user-banned-reason": "Désolé, ce compte a été banni (Raison : %1)", "user-banned-reason-until": "Désolé, ce compte a été banni jusqu'au %1 (Raison : %2).", @@ -145,7 +145,7 @@ "user-already-flagged": "Vous avez déjà signalé cet utilisateur", "post-flagged-too-many-times": "Ce message a déjà été signalé par d'autres", "user-flagged-too-many-times": "Cet utilisateur a déjà été signalé par d'autres", - "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", + "cant-flag-privileged": "Vous n'êtes pas autorisé à signaler les profils ou le contenu des utilisateurs privilégiés (modérateurs / modérateurs globaux / administrateurs)", "self-vote": "Vous ne pouvez pas voter sur votre propre message", "too-many-downvotes-today": "Vous ne pouvez noter négativement que %1 fois par jour", "too-many-downvotes-today-user": "Vous ne pouvez noter négativement un utilisateur que %1 fois par jour", diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index 6ea3aac1fc..3584b65361 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -46,7 +46,7 @@ "profile-exported": "%1 profil exporté, cliquez pour le télécharger", "posts-exported": "%1 messages exportés, cliquez pour les télécharger", "uploads-exported": "%1 envois exportés, cliquez pour les télécharger", - "users-csv-exported": "Users csv exported, click to download", + "users-csv-exported": "Utilisateurs exportés en CSV, cliquez pour télécharger", "email-confirmed": "Email vérifié", "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.", "email-confirm-error-message": "Il y a un un problème dans la vérification de votre adresse email. Le code est peut être invalide ou a expiré.", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index a76f9693c1..e9207afec4 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -29,7 +29,7 @@ "tools": "Outils", "locked": "Verrouillé", "pinned": "Épinglé", - "pinned-with-expiry": "Pinned until %1", + "pinned-with-expiry": "Épinglé jusqu'au %1", "moved": "Déplacé", "moved-from": "Déplacé de %1", "copy-ip": "Copier l'IP", diff --git a/public/language/gl/admin/manage/categories.json b/public/language/gl/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/gl/admin/manage/categories.json +++ b/public/language/gl/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/he/admin/manage/categories.json b/public/language/he/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/he/admin/manage/categories.json +++ b/public/language/he/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/hr/admin/manage/categories.json b/public/language/hr/admin/manage/categories.json index 04b179e061..d2f9918b88 100644 --- a/public/language/hr/admin/manage/categories.json +++ b/public/language/hr/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# nedavnih objava", "ext-link": "Vanjska poveznica", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Učitaj sliku", "delete-image": "Ukloni", diff --git a/public/language/hu/admin/manage/categories.json b/public/language/hu/admin/manage/categories.json index 05c332f72c..1cc2bde549 100644 --- a/public/language/hu/admin/manage/categories.json +++ b/public/language/hu/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "Utóbbi válaszok száma", "ext-link": "Külső link", "is-section": "Ez a kategória legyen szakaszként kezelve", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Kép feltöltése", "delete-image": "Törlés", diff --git a/public/language/id/admin/manage/categories.json b/public/language/id/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/id/admin/manage/categories.json +++ b/public/language/id/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/it/admin/manage/categories.json b/public/language/it/admin/manage/categories.json index 2acc31d700..83ee747fef 100644 --- a/public/language/it/admin/manage/categories.json +++ b/public/language/it/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# di Repliche Recenti", "ext-link": "Link esterni", "is-section": "Tratta questa categoria come una sezione", + "post-queue": "Post queue", "tag-whitelist": "Whitelist tag", "upload-image": "Caricamento Immagine", "delete-image": "Rimuove", diff --git a/public/language/it/error.json b/public/language/it/error.json index c52427b8dd..280248f26b 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -40,7 +40,7 @@ "username-too-long": "Nome utente troppo lungo", "password-too-long": "Password troppo lunga", "reset-rate-limited": "Troppe richieste di reimpostazione password (richieste limitate)", - "reset-same-password": "Please use a password that is different from your current one", + "reset-same-password": "Si prega di utilizzare una password diversa da quella attuale", "user-banned": "Utente bannato", "user-banned-reason": "Spiacente, questo account è stato bannato (Motivazione: %1)", "user-banned-reason-until": "Spiacente, questo account è stato bannato fino a %1 (Motivazione: %2)", diff --git a/public/language/ja/admin/manage/categories.json b/public/language/ja/admin/manage/categories.json index 8772c567e7..c1cf6cefcb 100644 --- a/public/language/ja/admin/manage/categories.json +++ b/public/language/ja/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# 最近の返信数", "ext-link": "外部リンク", "is-section": "このカテゴリをセクションとして扱う", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "画像をアップロード", "delete-image": "削除", diff --git a/public/language/ko/admin/manage/categories.json b/public/language/ko/admin/manage/categories.json index 8d71761706..1a7ceadfa3 100644 --- a/public/language/ko/admin/manage/categories.json +++ b/public/language/ko/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "최근 답장 갯수", "ext-link": "외부 링크", "is-section": "이 게시판을 섹션으로 취급", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "이미지 업로드", "delete-image": "삭제", diff --git a/public/language/lt/admin/manage/categories.json b/public/language/lt/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/lt/admin/manage/categories.json +++ b/public/language/lt/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/lv/admin/manage/categories.json b/public/language/lv/admin/manage/categories.json index 8e7668ecb5..cc26e49fbc 100644 --- a/public/language/lv/admin/manage/categories.json +++ b/public/language/lv/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "Neseno atbilžu skaits", "ext-link": "Ārējā saite", "is-section": "Izmantot kategoriju kā sadaļu", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Augšupielādēt bildi", "delete-image": "Noņemt", diff --git a/public/language/ms/admin/manage/categories.json b/public/language/ms/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/ms/admin/manage/categories.json +++ b/public/language/ms/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/nb/admin/manage/categories.json b/public/language/nb/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/nb/admin/manage/categories.json +++ b/public/language/nb/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/nl/admin/manage/categories.json b/public/language/nl/admin/manage/categories.json index dcce564d01..2101f8586a 100644 --- a/public/language/nl/admin/manage/categories.json +++ b/public/language/nl/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/pl/admin/manage/categories.json b/public/language/pl/admin/manage/categories.json index 452528338a..20a942fc2b 100644 --- a/public/language/pl/admin/manage/categories.json +++ b/public/language/pl/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# z ostatnich odpowiedzi", "ext-link": "Zewnętrzny odnośnik", "is-section": "Traktuj tę kategorię jako sekcję", + "post-queue": "Post queue", "tag-whitelist": "Otaguj białą listę", "upload-image": "Prześlij obrazek", "delete-image": "Usuń", diff --git a/public/language/pt-BR/admin/manage/categories.json b/public/language/pt-BR/admin/manage/categories.json index da6f5e1713..567aec5264 100644 --- a/public/language/pt-BR/admin/manage/categories.json +++ b/public/language/pt-BR/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# de Respostas Recentes", "ext-link": "Link Externo", "is-section": "Trate esta categoria como uma seção", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Enviar Imagem", "delete-image": "Remover", diff --git a/public/language/pt-PT/admin/manage/categories.json b/public/language/pt-PT/admin/manage/categories.json index 8ad390debd..17d0cd887f 100644 --- a/public/language/pt-PT/admin/manage/categories.json +++ b/public/language/pt-PT/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# de Respostas Recentes", "ext-link": "Link Externo", "is-section": "Tratar esta categoria como uma secção", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Enviar Imagem", "delete-image": "Remover", diff --git a/public/language/ro/admin/manage/categories.json b/public/language/ro/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/ro/admin/manage/categories.json +++ b/public/language/ro/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/ru/admin/manage/categories.json b/public/language/ru/admin/manage/categories.json index ef4a1d48cb..6b545eb25f 100644 --- a/public/language/ru/admin/manage/categories.json +++ b/public/language/ru/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# последних ответов", "ext-link": "Внешняя ссылка", "is-section": "Рассматривать эту категорию как секцию", + "post-queue": "Post queue", "tag-whitelist": "Разрешенный список меток", "upload-image": "Загрузить изображение", "delete-image": "Удалить", diff --git a/public/language/rw/admin/manage/categories.json b/public/language/rw/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/rw/admin/manage/categories.json +++ b/public/language/rw/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/sc/admin/manage/categories.json b/public/language/sc/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/sc/admin/manage/categories.json +++ b/public/language/sc/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/sk/admin/manage/categories.json b/public/language/sk/admin/manage/categories.json index dab86a30b2..24016900c1 100644 --- a/public/language/sk/admin/manage/categories.json +++ b/public/language/sk/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# posledných odpovedí", "ext-link": "Externý odkaz", "is-section": "Zaobchádzať s kategóriou ako so sekciou", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Nahrať obrázok", "delete-image": "Odobrať", diff --git a/public/language/sl/admin/manage/categories.json b/public/language/sl/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/sl/admin/manage/categories.json +++ b/public/language/sl/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/sr/admin/manage/categories.json b/public/language/sr/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/sr/admin/manage/categories.json +++ b/public/language/sr/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/sv/admin/manage/categories.json b/public/language/sv/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/sv/admin/manage/categories.json +++ b/public/language/sv/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/th/admin/manage/categories.json b/public/language/th/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/th/admin/manage/categories.json +++ b/public/language/th/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/tr/admin/manage/categories.json b/public/language/tr/admin/manage/categories.json index 3628dcb432..2db53ca3c0 100644 --- a/public/language/tr/admin/manage/categories.json +++ b/public/language/tr/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "Son Yanıtların # Tanesi", "ext-link": "Harici Bağlantı", "is-section": "Bu kategoriyi bir bölüm olarak değerlendir", + "post-queue": "Post queue", "tag-whitelist": "İzin Verilen Etiketler", "upload-image": "Görsel Yükle", "delete-image": "Sil", diff --git a/public/language/uk/admin/manage/categories.json b/public/language/uk/admin/manage/categories.json index fda74791f2..20f1f19a2c 100644 --- a/public/language/uk/admin/manage/categories.json +++ b/public/language/uk/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "Кількість свіжих відповідей", "ext-link": "Зовнішнє посилання", "is-section": "Вважати цю категорію розділом", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Завантажити зображення", "delete-image": "Видалити", diff --git a/public/language/vi/admin/manage/categories.json b/public/language/vi/admin/manage/categories.json index 0c0992fca5..1144e16433 100644 --- a/public/language/vi/admin/manage/categories.json +++ b/public/language/vi/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "# of Recent Replies", "ext-link": "External Link", "is-section": "Treat this category as a section", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "Upload Image", "delete-image": "Remove", diff --git a/public/language/zh-CN/admin/manage/categories.json b/public/language/zh-CN/admin/manage/categories.json index cc698c13a8..7feeeb3f33 100644 --- a/public/language/zh-CN/admin/manage/categories.json +++ b/public/language/zh-CN/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "最近回复数", "ext-link": "外部链接", "is-section": "将此版块作为段落", + "post-queue": "Post queue", "tag-whitelist": "话题白名单", "upload-image": "上传图片", "delete-image": "移除", diff --git a/public/language/zh-TW/admin/manage/categories.json b/public/language/zh-TW/admin/manage/categories.json index 4a93fd4779..917847b625 100644 --- a/public/language/zh-TW/admin/manage/categories.json +++ b/public/language/zh-TW/admin/manage/categories.json @@ -11,6 +11,7 @@ "num-recent-replies": "最近回覆數", "ext-link": "外部連結", "is-section": "將該版面作為分段", + "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", "upload-image": "上傳圖片", "delete-image": "移除", From 0f1fc10f6c371e18e478c730690c6f1265c19029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 1 Dec 2020 10:00:05 -0500 Subject: [PATCH 087/116] fix: #9015, add default value for dailyDigestFreq --- install/data/defaults.json | 1 + 1 file changed, 1 insertion(+) diff --git a/install/data/defaults.json b/install/data/defaults.json index c33e951044..7b80b5c090 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -128,6 +128,7 @@ "emailConfirmInterval": 10, "removeEmailNotificationImages": 0, "inviteExpiration": 7, + "dailyDigestFreq": "off", "digestHour": 17, "passwordExpiryDays": 0, "hsts-maxage": 31536000, From 0cba269165910ba6c98b2bcce6e4ccbd431f90cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 1 Dec 2020 10:25:36 -0500 Subject: [PATCH 088/116] feat: add defaults for composer help --- install/data/defaults.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install/data/defaults.json b/install/data/defaults.json index 7b80b5c090..73f46f5252 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -147,5 +147,7 @@ "autoApproveTime": 0, "maxUserSessions": 10, "useCompression": 0, - "updateUrlWithPostIndex": 1 + "updateUrlWithPostIndex": 1, + "composer:showHelpTab": 1, + "composer:allowPluginHelp": 1 } \ No newline at end of file From 1f5f2e1d96e1ec6f572586c9b7db0ce26bdd8ba0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:32:06 -0500 Subject: [PATCH 089/116] fix(deps): update dependency nodebb-plugin-composer-default to v6.4.8 (#9017) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5c810c4acc..e5ff92f0b2 100644 --- a/install/package.json +++ b/install/package.json @@ -93,7 +93,7 @@ "@nodebb/mubsub": "1.7.1", "@nodebb/socket.io-adapter-mongo": "3.1.1", "nconf": "^0.11.0", - "nodebb-plugin-composer-default": "6.4.7", + "nodebb-plugin-composer-default": "6.4.8", "nodebb-plugin-dbsearch": "4.1.2", "nodebb-plugin-emoji": "^3.3.0", "nodebb-plugin-emoji-android": "2.0.0", From e45b5cba81e30b1edcd5d60817f923a26cd4a213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 1 Dec 2020 12:31:28 -0500 Subject: [PATCH 090/116] fix: #9018 --- src/views/outgoing.tpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/views/outgoing.tpl diff --git a/src/views/outgoing.tpl b/src/views/outgoing.tpl new file mode 100644 index 0000000000..ee68df046c --- /dev/null +++ b/src/views/outgoing.tpl @@ -0,0 +1,12 @@ +
    + +
    +

    + [[notifications:outgoing_link_message, {title}]] +

    +

    + [[notifications:continue_to, {outgoing}]] + [[notifications:return_to, {title}]] +

    +
    +
    \ No newline at end of file From b46d2f93e64e6546fb295d396b830dcab9f0cbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 1 Dec 2020 12:38:23 -0500 Subject: [PATCH 091/116] fix: #9019, add missing lang strings --- public/language/en-GB/error.json | 2 ++ src/api/users.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index 9cbed30fdd..8782c9d665 100644 --- a/public/language/en-GB/error.json +++ b/public/language/en-GB/error.json @@ -109,6 +109,8 @@ "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", + "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/src/api/users.js b/src/api/users.js index 08d4bc6af1..1e1f5ae40c 100644 --- a/src/api/users.js +++ b/src/api/users.js @@ -247,7 +247,7 @@ async function processDeletion({ uid, method, password, caller }) { } else if (!isSelf && !isAdmin) { throw new Error('[[error:no-privileges]]'); } else if (isTargetAdmin) { - throw new Error('[[error:cant-delete-other-admins]]'); + throw new Error('[[error:cant-delete-admin]'); } // Privilege checks -- only deleteAccount is available for non-admins From 2c9cd2864cdcf1662c46d7495e19e67fe0fc5d55 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 13:52:54 -0500 Subject: [PATCH 092/116] fix(deps): update dependency nodebb-theme-persona to v10.2.96 (#9021) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e5ff92f0b2..b622dceeb0 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.95", + "nodebb-theme-persona": "10.2.96", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.6", "nodebb-widget-essentials": "4.1.2", From f7558c60526248a60b34bee984e08737e229c741 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 13:57:51 -0500 Subject: [PATCH 093/116] fix: notification on group.leave incorrectly showing "Guest has left X group" --- src/api/groups.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/groups.js b/src/api/groups.js index 88d42df183..426ec1dcde 100644 --- a/src/api/groups.js +++ b/src/api/groups.js @@ -156,6 +156,7 @@ groupsAPI.leave = async function (caller, data) { bodyShort: '[[groups:membership.leave.notification_title, ' + username + ', ' + groupName + ']]', nid: 'group:' + validator.escape(groupName) + ':uid:' + data.uid + ':group-leave', path: '/groups/' + slugify(groupName), + from: data.uid, }); const uids = await groups.getOwners(groupName); await notifications.push(notification, uids); From 8dc1437edbd31c39cca9b8b6583f3f9341025b28 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 14:05:36 -0500 Subject: [PATCH 094/116] fix(deps): update dependency nodebb-theme-slick to v1.3.4 (#9022) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b622dceeb0..44b2dd13f9 100644 --- a/install/package.json +++ b/install/package.json @@ -104,7 +104,7 @@ "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", "nodebb-theme-persona": "10.2.96", - "nodebb-theme-slick": "1.3.3", + "nodebb-theme-slick": "1.3.4", "nodebb-theme-vanilla": "11.3.6", "nodebb-widget-essentials": "4.1.2", "nodemailer": "^6.4.6", From 110186b92cb67b4f3a083f0efb2db708c58122fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 14:06:42 -0500 Subject: [PATCH 095/116] fix(deps): update dependency nodebb-plugin-composer-default to v6.4.9 (#9023) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 44b2dd13f9..49f07e5427 100644 --- a/install/package.json +++ b/install/package.json @@ -93,7 +93,7 @@ "@nodebb/mubsub": "1.7.1", "@nodebb/socket.io-adapter-mongo": "3.1.1", "nconf": "^0.11.0", - "nodebb-plugin-composer-default": "6.4.8", + "nodebb-plugin-composer-default": "6.4.9", "nodebb-plugin-dbsearch": "4.1.2", "nodebb-plugin-emoji": "^3.3.0", "nodebb-plugin-emoji-android": "2.0.0", From 3f597a55390a7e4b982692f0cab9456de33a777f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 14:10:40 -0500 Subject: [PATCH 096/116] fix(deps): update dependency nodebb-theme-vanilla to v11.3.7 (#9024) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 49f07e5427..dd45b78657 100644 --- a/install/package.json +++ b/install/package.json @@ -105,7 +105,7 @@ "nodebb-theme-lavender": "5.0.14", "nodebb-theme-persona": "10.2.96", "nodebb-theme-slick": "1.3.4", - "nodebb-theme-vanilla": "11.3.6", + "nodebb-theme-vanilla": "11.3.7", "nodebb-widget-essentials": "4.1.2", "nodemailer": "^6.4.6", "nprogress": "0.2.0", From c1a7968d23f0809e7012edfccf49b193749998ec Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 14:11:38 -0500 Subject: [PATCH 097/116] feat: user notification settings for group.leave event --- install/data/defaults.json | 1 + public/language/en-GB/notifications.json | 1 + src/notifications.js | 1 + 3 files changed, 3 insertions(+) diff --git a/install/data/defaults.json b/install/data/defaults.json index 73f46f5252..a0c97237ce 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -89,6 +89,7 @@ "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", diff --git a/public/language/en-GB/notifications.json b/public/language/en-GB/notifications.json index 92811490ff..0ec141d742 100644 --- a/public/language/en-GB/notifications.json +++ b/public/language/en-GB/notifications.json @@ -69,6 +69,7 @@ "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", diff --git a/src/notifications.js b/src/notifications.js index 11d3ac05c8..df0429c654 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -27,6 +27,7 @@ Notifications.baseTypes = [ 'notificationType_new-chat', 'notificationType_new-group-chat', 'notificationType_group-invite', + 'notificationType_group-leave', 'notificationType_group-request-membership', ]; From 43bbfb67807699866ee44a74fc497acd1211cf82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 14:32:22 -0500 Subject: [PATCH 098/116] fix(deps): update dependency nodebb-plugin-composer-default to v6.4.10 (#9025) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index dd45b78657..56f18da93e 100644 --- a/install/package.json +++ b/install/package.json @@ -93,7 +93,7 @@ "@nodebb/mubsub": "1.7.1", "@nodebb/socket.io-adapter-mongo": "3.1.1", "nconf": "^0.11.0", - "nodebb-plugin-composer-default": "6.4.9", + "nodebb-plugin-composer-default": "6.4.10", "nodebb-plugin-dbsearch": "4.1.2", "nodebb-plugin-emoji": "^3.3.0", "nodebb-plugin-emoji-android": "2.0.0", From 685f3c6aa6173383d6c31b87ed51cf8ed0ca44ce Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 14:40:49 -0500 Subject: [PATCH 099/116] feat: option to allow auto-joining of groups (optionally skip the "request membership" step) --- public/language/en-GB/admin/manage/groups.json | 2 ++ public/language/en-GB/groups.json | 2 ++ public/src/admin/manage/group.js | 1 + src/groups/create.js | 2 ++ src/groups/data.js | 2 +- src/groups/invite.js | 8 +++++++- src/groups/update.js | 4 ++++ src/views/admin/manage/group.tpl | 12 ++++++++++++ 8 files changed, 31 insertions(+), 2 deletions(-) diff --git a/public/language/en-GB/admin/manage/groups.json b/public/language/en-GB/admin/manage/groups.json index 911fcce010..a26e51aafa 100644 --- a/public/language/en-GB/admin/manage/groups.json +++ b/public/language/en-GB/admin/manage/groups.json @@ -34,6 +34,8 @@ "edit.hidden-details": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "edit.add-user": "Add User to Group", "edit.add-user-search": "Search Users", + "edit.autojoin": "Enable Auto-Join", + "edit.autojoin-details": "Allow any user with access to the group to join without confirmation", "edit.members": "Member List", "control-panel": "Groups Control Panel", "revert": "Revert", diff --git a/public/language/en-GB/groups.json b/public/language/en-GB/groups.json index 0256067933..009b813288 100644 --- a/public/language/en-GB/groups.json +++ b/public/language/en-GB/groups.json @@ -53,6 +53,8 @@ "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "details.delete_group": "Delete Group", "details.private_system_help": "Private groups is disabled at system level, this option does not do anything", + "details.autojoin": "Enable Auto-Join", + "details.autojoin_help": "Allow any user with access to the group to join without confirmation", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted", diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js index 792560bf2b..660bf8f203 100644 --- a/public/src/admin/manage/group.js +++ b/public/src/admin/manage/group.js @@ -83,6 +83,7 @@ define('admin/manage/group', [ memberPostCids: $('#memberPostCids').val(), disableJoinRequests: $('#group-disableJoinRequests').is(':checked'), disableLeave: $('#group-disableLeave').is(':checked'), + autojoin: $('#group-autojoin').is(':checked'), }, }, function (err) { if (err) { diff --git a/src/groups/create.js b/src/groups/create.js index 9bd56ebc1b..cdaaf670e0 100644 --- a/src/groups/create.js +++ b/src/groups/create.js @@ -14,6 +14,7 @@ module.exports = function (Groups) { disableJoinRequests = 1; } const disableLeave = parseInt(data.disableLeave, 10) === 1 ? 1 : 0; + const autojoin = parseInt(data.autojoin, 10) === 1 ? 1 : 0; const isHidden = parseInt(data.hidden, 10) === 1; Groups.validateGroupName(data.name); @@ -38,6 +39,7 @@ module.exports = function (Groups) { private: isPrivate ? 1 : 0, disableJoinRequests: disableJoinRequests, disableLeave: disableLeave, + autojoin: autojoin, }; await plugins.hooks.fire('filter:group.create', { group: groupData, data: data }); diff --git a/src/groups/data.js b/src/groups/data.js index ae518c27ca..870a424c8e 100644 --- a/src/groups/data.js +++ b/src/groups/data.js @@ -10,7 +10,7 @@ const translator = require('../translator'); const intFields = [ 'createtime', 'memberCount', 'hidden', 'system', 'private', - 'userTitleEnabled', 'disableJoinRequests', 'disableLeave', + 'userTitleEnabled', 'disableJoinRequests', 'disableLeave', 'autojoin', ]; module.exports = function (Groups) { diff --git a/src/groups/invite.js b/src/groups/invite.js index ad17a36ecf..ce364435d0 100644 --- a/src/groups/invite.js +++ b/src/groups/invite.js @@ -67,11 +67,12 @@ module.exports = function (Groups) { async function inviteOrRequestMembership(groupName, uids, type) { uids = Array.isArray(uids) ? uids : [uids]; uids = uids.filter(uid => parseInt(uid, 10) > 0); - const [exists, isMember, isPending, isInvited] = await Promise.all([ + const [exists, isMember, isPending, isInvited, canAutojoin] = await Promise.all([ Groups.exists(groupName), Groups.isMembers(uids, groupName), Groups.isPending(uids, groupName), Groups.isInvited(uids, groupName), + Groups.getGroupField(groupName, 'autojoin'), ]); if (!exists) { @@ -80,6 +81,11 @@ module.exports = function (Groups) { uids = uids.filter((uid, i) => !isMember[i] && ((type === 'invite' && !isInvited[i]) || (type === 'request' && !isPending[i]))); + if (canAutojoin) { + await Promise.all(uids.map(uid => Groups.join([groupName], uid))); + return uids; + } + const set = type === 'invite' ? 'group:' + groupName + ':invited' : 'group:' + groupName + ':pending'; await db.setAdd(set, uids); const hookName = type === 'invite' ? 'action:group.inviteMember' : 'action:group.requestMembership'; diff --git a/src/groups/update.js b/src/groups/update.js index 26d0cdad5c..17a843a78b 100644 --- a/src/groups/update.js +++ b/src/groups/update.js @@ -55,6 +55,10 @@ module.exports = function (Groups) { payload.disableLeave = values.disableLeave ? '1' : '0'; } + if (values.hasOwnProperty('autojoin')) { + payload.autojoin = values.autojoin ? '1' : '0'; + } + if (values.hasOwnProperty('name')) { await checkNameChange(groupName, values.name); } diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl index ed37a7a8cc..2ff2dc6b3a 100644 --- a/src/views/admin/manage/group.tpl +++ b/src/views/admin/manage/group.tpl @@ -95,6 +95,18 @@ +
    +
    + +
    +
    +
    From dde3171c22abfe6d2a3ff4f6cb298646e51375fc Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 14:42:15 -0500 Subject: [PATCH 100/116] chore: up persona --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 56f18da93e..cfe48cd3ce 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.96", + "nodebb-theme-persona": "10.2.97", "nodebb-theme-slick": "1.3.4", "nodebb-theme-vanilla": "11.3.7", "nodebb-widget-essentials": "4.1.2", From 1bb75e762e0b449af890231ed408d47d10365b87 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 14:53:16 -0500 Subject: [PATCH 101/116] fix(openapi): spec for 685f3c6aa6173383d6c31b87ed51cf8ed0ca44ce --- public/openapi/components/schemas/GroupObject.yaml | 4 ++++ public/openapi/read/admin/manage/groups.yaml | 3 +++ public/openapi/read/groups.yaml | 2 ++ public/openapi/read/user/userslug.yaml | 2 ++ public/openapi/write/groups.yaml | 3 +++ 5 files changed, 14 insertions(+) diff --git a/public/openapi/components/schemas/GroupObject.yaml b/public/openapi/components/schemas/GroupObject.yaml index c2a34509f6..f28c3a8cd7 100644 --- a/public/openapi/components/schemas/GroupObject.yaml +++ b/public/openapi/components/schemas/GroupObject.yaml @@ -32,6 +32,8 @@ GroupFullObject: type: number disableJoinRequests: type: number + autojoin: + type: number disableLeave: type: number nameEncoded: @@ -143,6 +145,8 @@ GroupDataObject: type: number disableJoinRequests: type: number + autojoin: + type: number disableLeave: type: number cover:url: diff --git a/public/openapi/read/admin/manage/groups.yaml b/public/openapi/read/admin/manage/groups.yaml index cc93b19469..c83983c27e 100644 --- a/public/openapi/read/admin/manage/groups.yaml +++ b/public/openapi/read/admin/manage/groups.yaml @@ -52,6 +52,8 @@ get: type: number disableJoinRequests: type: number + autojoin: + type: number disableLeave: type: number nameEncoded: @@ -87,6 +89,7 @@ get: - cover:position - userTitleEnabled - disableJoinRequests + - autojoin - disableLeave - nameEncoded - displayName diff --git a/public/openapi/read/groups.yaml b/public/openapi/read/groups.yaml index bc5847fbb7..72d8d88474 100644 --- a/public/openapi/read/groups.yaml +++ b/public/openapi/read/groups.yaml @@ -44,6 +44,8 @@ get: type: number disableJoinRequests: type: number + autojoin: + type: number disableLeave: type: number nameEncoded: diff --git a/public/openapi/read/user/userslug.yaml b/public/openapi/read/user/userslug.yaml index 4858383cd3..6b2f796989 100644 --- a/public/openapi/read/user/userslug.yaml +++ b/public/openapi/read/user/userslug.yaml @@ -70,6 +70,8 @@ get: type: number disableJoinRequests: type: number + autojoin: + type: number disableLeave: type: number nameEncoded: diff --git a/public/openapi/write/groups.yaml b/public/openapi/write/groups.yaml index 8d325c758e..72adc4180b 100644 --- a/public/openapi/write/groups.yaml +++ b/public/openapi/write/groups.yaml @@ -18,6 +18,9 @@ post: disableJoinRequests: type: number enum: [0, 1] + autojoin: + type: number + enum: [0, 1] disableLeave: type: number enum: [0, 1] From af9e6762911b48d314636494d0e3484ef35ff8e6 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 16:06:03 -0500 Subject: [PATCH 102/116] Revert "fix(openapi): spec for 685f3c6aa6173383d6c31b87ed51cf8ed0ca44ce" This reverts commit 1bb75e762e0b449af890231ed408d47d10365b87. --- public/openapi/components/schemas/GroupObject.yaml | 4 ---- public/openapi/read/admin/manage/groups.yaml | 3 --- public/openapi/read/groups.yaml | 2 -- public/openapi/read/user/userslug.yaml | 2 -- public/openapi/write/groups.yaml | 3 --- 5 files changed, 14 deletions(-) diff --git a/public/openapi/components/schemas/GroupObject.yaml b/public/openapi/components/schemas/GroupObject.yaml index f28c3a8cd7..c2a34509f6 100644 --- a/public/openapi/components/schemas/GroupObject.yaml +++ b/public/openapi/components/schemas/GroupObject.yaml @@ -32,8 +32,6 @@ GroupFullObject: type: number disableJoinRequests: type: number - autojoin: - type: number disableLeave: type: number nameEncoded: @@ -145,8 +143,6 @@ GroupDataObject: type: number disableJoinRequests: type: number - autojoin: - type: number disableLeave: type: number cover:url: diff --git a/public/openapi/read/admin/manage/groups.yaml b/public/openapi/read/admin/manage/groups.yaml index c83983c27e..cc93b19469 100644 --- a/public/openapi/read/admin/manage/groups.yaml +++ b/public/openapi/read/admin/manage/groups.yaml @@ -52,8 +52,6 @@ get: type: number disableJoinRequests: type: number - autojoin: - type: number disableLeave: type: number nameEncoded: @@ -89,7 +87,6 @@ get: - cover:position - userTitleEnabled - disableJoinRequests - - autojoin - disableLeave - nameEncoded - displayName diff --git a/public/openapi/read/groups.yaml b/public/openapi/read/groups.yaml index 72d8d88474..bc5847fbb7 100644 --- a/public/openapi/read/groups.yaml +++ b/public/openapi/read/groups.yaml @@ -44,8 +44,6 @@ get: type: number disableJoinRequests: type: number - autojoin: - type: number disableLeave: type: number nameEncoded: diff --git a/public/openapi/read/user/userslug.yaml b/public/openapi/read/user/userslug.yaml index 6b2f796989..4858383cd3 100644 --- a/public/openapi/read/user/userslug.yaml +++ b/public/openapi/read/user/userslug.yaml @@ -70,8 +70,6 @@ get: type: number disableJoinRequests: type: number - autojoin: - type: number disableLeave: type: number nameEncoded: diff --git a/public/openapi/write/groups.yaml b/public/openapi/write/groups.yaml index 72adc4180b..8d325c758e 100644 --- a/public/openapi/write/groups.yaml +++ b/public/openapi/write/groups.yaml @@ -18,9 +18,6 @@ post: disableJoinRequests: type: number enum: [0, 1] - autojoin: - type: number - enum: [0, 1] disableLeave: type: number enum: [0, 1] From 1c1a0e0e0d67a9ea0a8ed4a28c3a890308235b6d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 16:06:10 -0500 Subject: [PATCH 103/116] Revert "chore: up persona" This reverts commit dde3171c22abfe6d2a3ff4f6cb298646e51375fc. --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index cfe48cd3ce..56f18da93e 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.97", + "nodebb-theme-persona": "10.2.96", "nodebb-theme-slick": "1.3.4", "nodebb-theme-vanilla": "11.3.7", "nodebb-widget-essentials": "4.1.2", From 53abada5f0a465ad42b904ba0a923c493ea9b99a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 16:06:14 -0500 Subject: [PATCH 104/116] Revert "feat: option to allow auto-joining of groups (optionally skip the "request membership" step)" This reverts commit 685f3c6aa6173383d6c31b87ed51cf8ed0ca44ce. --- public/language/en-GB/admin/manage/groups.json | 2 -- public/language/en-GB/groups.json | 2 -- public/src/admin/manage/group.js | 1 - src/groups/create.js | 2 -- src/groups/data.js | 2 +- src/groups/invite.js | 8 +------- src/groups/update.js | 4 ---- src/views/admin/manage/group.tpl | 12 ------------ 8 files changed, 2 insertions(+), 31 deletions(-) diff --git a/public/language/en-GB/admin/manage/groups.json b/public/language/en-GB/admin/manage/groups.json index a26e51aafa..911fcce010 100644 --- a/public/language/en-GB/admin/manage/groups.json +++ b/public/language/en-GB/admin/manage/groups.json @@ -34,8 +34,6 @@ "edit.hidden-details": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "edit.add-user": "Add User to Group", "edit.add-user-search": "Search Users", - "edit.autojoin": "Enable Auto-Join", - "edit.autojoin-details": "Allow any user with access to the group to join without confirmation", "edit.members": "Member List", "control-panel": "Groups Control Panel", "revert": "Revert", diff --git a/public/language/en-GB/groups.json b/public/language/en-GB/groups.json index 009b813288..0256067933 100644 --- a/public/language/en-GB/groups.json +++ b/public/language/en-GB/groups.json @@ -53,8 +53,6 @@ "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "details.delete_group": "Delete Group", "details.private_system_help": "Private groups is disabled at system level, this option does not do anything", - "details.autojoin": "Enable Auto-Join", - "details.autojoin_help": "Allow any user with access to the group to join without confirmation", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted", diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js index 660bf8f203..792560bf2b 100644 --- a/public/src/admin/manage/group.js +++ b/public/src/admin/manage/group.js @@ -83,7 +83,6 @@ define('admin/manage/group', [ memberPostCids: $('#memberPostCids').val(), disableJoinRequests: $('#group-disableJoinRequests').is(':checked'), disableLeave: $('#group-disableLeave').is(':checked'), - autojoin: $('#group-autojoin').is(':checked'), }, }, function (err) { if (err) { diff --git a/src/groups/create.js b/src/groups/create.js index cdaaf670e0..9bd56ebc1b 100644 --- a/src/groups/create.js +++ b/src/groups/create.js @@ -14,7 +14,6 @@ module.exports = function (Groups) { disableJoinRequests = 1; } const disableLeave = parseInt(data.disableLeave, 10) === 1 ? 1 : 0; - const autojoin = parseInt(data.autojoin, 10) === 1 ? 1 : 0; const isHidden = parseInt(data.hidden, 10) === 1; Groups.validateGroupName(data.name); @@ -39,7 +38,6 @@ module.exports = function (Groups) { private: isPrivate ? 1 : 0, disableJoinRequests: disableJoinRequests, disableLeave: disableLeave, - autojoin: autojoin, }; await plugins.hooks.fire('filter:group.create', { group: groupData, data: data }); diff --git a/src/groups/data.js b/src/groups/data.js index 870a424c8e..ae518c27ca 100644 --- a/src/groups/data.js +++ b/src/groups/data.js @@ -10,7 +10,7 @@ const translator = require('../translator'); const intFields = [ 'createtime', 'memberCount', 'hidden', 'system', 'private', - 'userTitleEnabled', 'disableJoinRequests', 'disableLeave', 'autojoin', + 'userTitleEnabled', 'disableJoinRequests', 'disableLeave', ]; module.exports = function (Groups) { diff --git a/src/groups/invite.js b/src/groups/invite.js index ce364435d0..ad17a36ecf 100644 --- a/src/groups/invite.js +++ b/src/groups/invite.js @@ -67,12 +67,11 @@ module.exports = function (Groups) { async function inviteOrRequestMembership(groupName, uids, type) { uids = Array.isArray(uids) ? uids : [uids]; uids = uids.filter(uid => parseInt(uid, 10) > 0); - const [exists, isMember, isPending, isInvited, canAutojoin] = await Promise.all([ + const [exists, isMember, isPending, isInvited] = await Promise.all([ Groups.exists(groupName), Groups.isMembers(uids, groupName), Groups.isPending(uids, groupName), Groups.isInvited(uids, groupName), - Groups.getGroupField(groupName, 'autojoin'), ]); if (!exists) { @@ -81,11 +80,6 @@ module.exports = function (Groups) { uids = uids.filter((uid, i) => !isMember[i] && ((type === 'invite' && !isInvited[i]) || (type === 'request' && !isPending[i]))); - if (canAutojoin) { - await Promise.all(uids.map(uid => Groups.join([groupName], uid))); - return uids; - } - const set = type === 'invite' ? 'group:' + groupName + ':invited' : 'group:' + groupName + ':pending'; await db.setAdd(set, uids); const hookName = type === 'invite' ? 'action:group.inviteMember' : 'action:group.requestMembership'; diff --git a/src/groups/update.js b/src/groups/update.js index 17a843a78b..26d0cdad5c 100644 --- a/src/groups/update.js +++ b/src/groups/update.js @@ -55,10 +55,6 @@ module.exports = function (Groups) { payload.disableLeave = values.disableLeave ? '1' : '0'; } - if (values.hasOwnProperty('autojoin')) { - payload.autojoin = values.autojoin ? '1' : '0'; - } - if (values.hasOwnProperty('name')) { await checkNameChange(groupName, values.name); } diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl index 2ff2dc6b3a..ed37a7a8cc 100644 --- a/src/views/admin/manage/group.tpl +++ b/src/views/admin/manage/group.tpl @@ -95,18 +95,6 @@
    -
    -
    - -
    -
    -
    From 69864b87465f1c9104ff8c5a639827f5dac50b4b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 1 Dec 2020 16:07:42 -0500 Subject: [PATCH 105/116] fix(openapi): spec for c1a7968d23f0809e7012edfccf49b193749998ec --- public/openapi/components/schemas/SettingsObj.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/openapi/components/schemas/SettingsObj.yaml b/public/openapi/components/schemas/SettingsObj.yaml index a0d53b5bcb..eb2362bd63 100644 --- a/public/openapi/components/schemas/SettingsObj.yaml +++ b/public/openapi/components/schemas/SettingsObj.yaml @@ -83,6 +83,9 @@ Settings: notificationType_group-invite: type: string description: Notification type for group invitations + notificationType_group-leave: + type: string + description: Notification type for when users leave your group upvoteNotifFreq: type: string description: How often to notify you when your posts are upvoted @@ -137,6 +140,7 @@ Settings: - notificationType_new-topic - notificationType_follow - notificationType_group-invite + - notificationType_group-leave - upvoteNotifFreq - acpLang - notificationType_new-register From 954dc5b7be97ecfd8b27595acd2fbcbbdb31f5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 1 Dec 2020 16:25:13 -0500 Subject: [PATCH 106/116] feat: #8983, update pin tooltip in topic --- public/src/client/topic/threadTools.js | 15 +++++++++++---- src/controllers/write/topics.js | 5 ++--- src/topics/tools.js | 2 ++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 6a6b03d372..44ab7a170c 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -311,10 +311,17 @@ define('forum/topic/threadTools', [ return; } - components.get('topic/pin').toggleClass('hidden', data.isPinned).parent().attr('hidden', data.isPinned ? '' : null); - components.get('topic/unpin').toggleClass('hidden', !data.isPinned).parent().attr('hidden', !data.isPinned ? '' : null); - $('.topic-header [component="topic/pinned"]').toggleClass('hidden', !data.isPinned); - ajaxify.data.pinned = data.isPinned; + components.get('topic/pin').toggleClass('hidden', data.pinned).parent().attr('hidden', data.pinned ? '' : null); + components.get('topic/unpin').toggleClass('hidden', !data.pinned).parent().attr('hidden', !data.pinned ? '' : null); + var icon = $('.topic-header [component="topic/pinned"]'); + icon.toggleClass('hidden', !data.pinned); + if (data.pinned) { + icon.translateAttr('title', data.pinExpiry && data.pinExpiryISO ? + '[[topic:pinned-with-expiry, ' + data.pinExpiryISO + ']]' : + '[[topic:pinned]]' + ); + } + ajaxify.data.pinned = data.pinned; }; function setFollowState(state) { diff --git a/src/controllers/write/topics.js b/src/controllers/write/topics.js index 81b06d01a0..0e16f0ebc5 100644 --- a/src/controllers/write/topics.js +++ b/src/controllers/write/topics.js @@ -37,12 +37,11 @@ Topics.purge = async (req, res) => { }; Topics.pin = async (req, res) => { - await api.topics.pin(req, { tids: [req.params.tid] }); - // Pin expiry was not available w/ sockets hence not included in api lib method if (req.body.expiry) { - topics.tools.setPinExpiry(req.params.tid, req.body.expiry, req.uid); + await topics.tools.setPinExpiry(req.params.tid, req.body.expiry, req.uid); } + await api.topics.pin(req, { tids: [req.params.tid] }); helpers.formatApiResponse(200, res); }; diff --git a/src/topics/tools.js b/src/topics/tools.js index 5ddad97c01..c25e5c6bc0 100644 --- a/src/topics/tools.js +++ b/src/topics/tools.js @@ -168,6 +168,8 @@ module.exports = function (Topics) { ['cid:' + topicData.cid + ':tids:posts', topicData.postcount, tid], ['cid:' + topicData.cid + ':tids:votes', parseInt(topicData.votes, 10) || 0, tid], ])); + topicData.pinExpiry = undefined; + topicData.pinExpiryISO = undefined; } await Promise.all(promises); From 42b23a3b3929e2a197940e3e74be980e43fd3e2e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Dec 2020 21:08:44 +0000 Subject: [PATCH 107/116] fix(deps): update dependency nodebb-theme-persona to v10.2.97 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 56f18da93e..cfe48cd3ce 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.96", + "nodebb-theme-persona": "10.2.97", "nodebb-theme-slick": "1.3.4", "nodebb-theme-vanilla": "11.3.7", "nodebb-widget-essentials": "4.1.2", From 5f0f476b57a160e5fed7b0a0b53ca58e22ced03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 1 Dec 2020 20:24:22 -0500 Subject: [PATCH 108/116] feat: #9005, use timestamp in profile/cover images delete current one if keepAllUserImages is turned off fix typo in data --- public/openapi/read/user/userslug/edit.yaml | 2 +- public/src/client/account/edit.js | 2 +- src/controllers/accounts/edit.js | 2 +- src/user/picture.js | 28 ++++++++++++++++++--- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/public/openapi/read/user/userslug/edit.yaml b/public/openapi/read/user/userslug/edit.yaml index 4b1ea8b19c..734ea32abf 100644 --- a/public/openapi/read/user/userslug/edit.yaml +++ b/public/openapi/read/user/userslug/edit.yaml @@ -31,7 +31,7 @@ get: type: boolean allowProfileImageUploads: type: number - allowedProfileImageExtensios: + allowedProfileImageExtensions: type: string allowMultipleBadges: type: boolean diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index 84a0e87a38..7fd37194ce 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -235,7 +235,7 @@ define('forum/account/edit', [ allowSkippingCrop: false, title: '[[user:upload_picture]]', description: '[[user:upload_a_picture]]', - accept: ajaxify.data.allowedProfileImageExtensios, + accept: ajaxify.data.allowedProfileImageExtensions, }, function (url) { onUploadComplete(url); }); diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js index d2370ac9d2..d885df5f50 100644 --- a/src/controllers/accounts/edit.js +++ b/src/controllers/accounts/edit.js @@ -24,7 +24,7 @@ editController.get = async function (req, res, next) { userData.allowProfilePicture = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:profile-picture']; userData.allowCoverPicture = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:cover-picture']; userData.allowProfileImageUploads = meta.config.allowProfileImageUploads; - userData.allowedProfileImageExtensios = user.getAllowedProfileImageExtensions().map(ext => '.' + ext).join(', '); + userData.allowedProfileImageExtensions = user.getAllowedProfileImageExtensions().map(ext => '.' + ext).join(', '); userData.allowMultipleBadges = meta.config.allowMultipleBadges === 1; userData.allowAccountDelete = meta.config.allowAccountDelete === 1; userData.allowWebsite = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:website']; diff --git a/src/user/picture.js b/src/user/picture.js index 74642fe68b..23a1afe820 100644 --- a/src/user/picture.js +++ b/src/user/picture.js @@ -2,6 +2,8 @@ const winston = require('winston'); const mime = require('mime'); +const path = require('path'); +const nconf = require('nconf'); const db = require('../database'); const file = require('../file'); @@ -11,7 +13,11 @@ const plugins = require('../plugins'); module.exports = function (User) { User.getAllowedProfileImageExtensions = function () { - return User.getAllowedImageTypes().map(type => mime.getExtension(type)); + const exts = User.getAllowedImageTypes().map(type => mime.getExtension(type)); + if (exts.includes('jpeg')) { + exts.push('jpg'); + } + return exts; }; User.getAllowedImageTypes = function () { @@ -48,9 +54,10 @@ module.exports = function (User) { picture.path = await image.writeImageDataToTempFile(data.imageData); const extension = file.typeToExtension(image.mimeFromBase64(data.imageData)); - const filename = data.uid + '-profilecover' + extension; + const filename = data.uid + '-profilecover-' + Date.now() + extension; const uploadData = await image.uploadImage(filename, 'profile', picture); + await deleteCurrentPicture(data.uid, 'cover:url'); await User.setUserField(data.uid, 'cover:url', uploadData.url); if (data.position) { @@ -100,6 +107,7 @@ module.exports = function (User) { name: 'profileAvatar', }); + await deleteCurrentPicture(data.uid, 'uploadedpicture'); await User.setUserFields(data.uid, { uploadedpicture: uploadedImage.url, picture: uploadedImage.url, @@ -138,6 +146,7 @@ module.exports = function (User) { const filename = generateProfileImageFilename(data.uid, extension); const uploadedImage = await image.uploadImage(filename, 'profile', picture); + await deleteCurrentPicture(data.uid, 'uploadedpicture'); await User.setUserFields(data.uid, { uploadedpicture: uploadedImage.url, picture: uploadedImage.url, @@ -148,6 +157,18 @@ module.exports = function (User) { } }; + async function deleteCurrentPicture(uid, field) { + if (meta.config['profile:keepAllUserImages']) { + return; + } + const value = await User.getUserField(uid, field); + if (value && value.startsWith('/assets/uploads/profile/')) { + const filename = value.split('/').pop(); + const uploadPath = path.join(nconf.get('upload_path'), 'profile', filename); + await file.delete(uploadPath); + } + } + function validateUpload(data, maxSize, allowedTypes) { if (!data.imageData) { throw new Error('[[error:invalid-data]]'); @@ -174,9 +195,8 @@ module.exports = function (User) { } function generateProfileImageFilename(uid, extension) { - const keepAllVersions = meta.config['profile:keepAllUserImages'] === 1; const convertToPNG = meta.config['profile:convertProfileImageToPNG'] === 1; - return uid + '-profileavatar' + (keepAllVersions ? '-' + Date.now() : '') + (convertToPNG ? '.png' : extension); + return uid + '-profileavatar-' + Date.now() + (convertToPNG ? '.png' : extension); } User.removeCoverPicture = async function (data) { From 3488daa1e886612735c063140b6537cd13af3245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 1 Dec 2020 21:01:46 -0500 Subject: [PATCH 109/116] fix: selector on hooks page --- public/less/admin/advanced/hooks.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/less/admin/advanced/hooks.less b/public/less/admin/advanced/hooks.less index 790a539c5a..ef8ca579f4 100644 --- a/public/less/admin/advanced/hooks.less +++ b/public/less/admin/advanced/hooks.less @@ -1,3 +1,3 @@ -.admin .hooks-list .panel.panel-default .panel-heading { +.admin .hooks-list .panel.panel-default .panel-heading .panel-title a { text-transform: none; } From 86b7f8a5d454e643cb14ba76ca3b4f2a78383710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 1 Dec 2020 23:53:29 -0500 Subject: [PATCH 110/116] fix: #8962, dont show null for purged targets --- public/language/en-GB/flags.json | 3 ++- src/user/info.js | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/language/en-GB/flags.json b/public/language/en-GB/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/en-GB/flags.json +++ b/public/language/en-GB/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/src/user/info.js b/src/user/info.js index 4c8f20ebe6..61de33f512 100644 --- a/src/user/info.js +++ b/src/user/info.js @@ -87,7 +87,9 @@ module.exports = function (User) { delete flagObj.value; delete flagObj.score; - + if (!tids[idx]) { + flagObj.targetPurged = true; + } return _.extend(flagObj, topicData[idx]); }); return flags; From f7d60c43d0f5b34b2641bc8833850d8628d31d1d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 00:02:13 -0500 Subject: [PATCH 111/116] fix(deps): update dependency nodebb-theme-persona to v10.2.98 (#9029) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index cfe48cd3ce..ece01dd741 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.97", + "nodebb-theme-persona": "10.2.98", "nodebb-theme-slick": "1.3.4", "nodebb-theme-vanilla": "11.3.7", "nodebb-widget-essentials": "4.1.2", From 4085f3e6bbdcaeddb04ebb8cdfa12a13f2a18898 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 00:03:23 -0500 Subject: [PATCH 112/116] fix(deps): update dependency nodebb-theme-slick to v1.3.5 (#9030) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ece01dd741..9c323c7203 100644 --- a/install/package.json +++ b/install/package.json @@ -104,7 +104,7 @@ "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", "nodebb-theme-persona": "10.2.98", - "nodebb-theme-slick": "1.3.4", + "nodebb-theme-slick": "1.3.5", "nodebb-theme-vanilla": "11.3.7", "nodebb-widget-essentials": "4.1.2", "nodemailer": "^6.4.6", From 1870794068a886da98e766c547bec514e1957c6c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 00:06:24 -0500 Subject: [PATCH 113/116] fix(deps): update dependency nodebb-theme-vanilla to v11.3.8 (#9031) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 9c323c7203..ff53828ea1 100644 --- a/install/package.json +++ b/install/package.json @@ -105,7 +105,7 @@ "nodebb-theme-lavender": "5.0.14", "nodebb-theme-persona": "10.2.98", "nodebb-theme-slick": "1.3.5", - "nodebb-theme-vanilla": "11.3.7", + "nodebb-theme-vanilla": "11.3.8", "nodebb-widget-essentials": "4.1.2", "nodemailer": "^6.4.6", "nprogress": "0.2.0", From b771a5733b9ffbf58832b24f244e60d266888f9c Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 2 Dec 2020 09:09:11 +0000 Subject: [PATCH 114/116] Latest translations and fallbacks --- public/language/ar/error.json | 1 + public/language/ar/flags.json | 3 ++- public/language/ar/notifications.json | 1 + public/language/bg/error.json | 1 + public/language/bg/flags.json | 3 ++- public/language/bg/notifications.json | 1 + public/language/bn/error.json | 1 + public/language/bn/flags.json | 3 ++- public/language/bn/notifications.json | 1 + public/language/cs/error.json | 1 + public/language/cs/flags.json | 3 ++- public/language/cs/notifications.json | 1 + public/language/da/error.json | 1 + public/language/da/flags.json | 3 ++- public/language/da/notifications.json | 1 + public/language/de/error.json | 1 + public/language/de/flags.json | 3 ++- public/language/de/notifications.json | 1 + public/language/el/error.json | 1 + public/language/el/flags.json | 3 ++- public/language/el/notifications.json | 1 + public/language/en-US/error.json | 1 + public/language/en-US/flags.json | 3 ++- public/language/en-US/notifications.json | 1 + public/language/en-x-pirate/error.json | 1 + public/language/en-x-pirate/flags.json | 3 ++- public/language/en-x-pirate/notifications.json | 1 + public/language/es/error.json | 1 + public/language/es/flags.json | 3 ++- public/language/es/notifications.json | 1 + public/language/et/error.json | 1 + public/language/et/flags.json | 3 ++- public/language/et/notifications.json | 1 + public/language/fa-IR/error.json | 1 + public/language/fa-IR/flags.json | 3 ++- public/language/fa-IR/notifications.json | 1 + public/language/fi/error.json | 1 + public/language/fi/flags.json | 3 ++- public/language/fi/notifications.json | 1 + public/language/fr/error.json | 1 + public/language/fr/flags.json | 3 ++- public/language/fr/notifications.json | 1 + public/language/gl/error.json | 1 + public/language/gl/flags.json | 3 ++- public/language/gl/notifications.json | 1 + public/language/he/error.json | 1 + public/language/he/flags.json | 3 ++- public/language/he/notifications.json | 1 + public/language/hr/error.json | 1 + public/language/hr/flags.json | 3 ++- public/language/hr/notifications.json | 1 + public/language/hu/error.json | 1 + public/language/hu/flags.json | 3 ++- public/language/hu/notifications.json | 1 + public/language/id/error.json | 1 + public/language/id/flags.json | 3 ++- public/language/id/notifications.json | 1 + public/language/it/error.json | 1 + public/language/it/flags.json | 3 ++- public/language/it/notifications.json | 1 + public/language/ja/error.json | 1 + public/language/ja/flags.json | 3 ++- public/language/ja/notifications.json | 1 + public/language/ko/error.json | 1 + public/language/ko/flags.json | 3 ++- public/language/ko/notifications.json | 1 + public/language/lt/error.json | 1 + public/language/lt/flags.json | 3 ++- public/language/lt/notifications.json | 1 + public/language/lv/error.json | 1 + public/language/lv/flags.json | 3 ++- public/language/lv/notifications.json | 1 + public/language/ms/error.json | 1 + public/language/ms/flags.json | 3 ++- public/language/ms/notifications.json | 1 + public/language/nb/error.json | 1 + public/language/nb/flags.json | 3 ++- public/language/nb/notifications.json | 1 + public/language/nl/error.json | 1 + public/language/nl/flags.json | 3 ++- public/language/nl/notifications.json | 1 + public/language/pl/error.json | 1 + public/language/pl/flags.json | 3 ++- public/language/pl/notifications.json | 1 + public/language/pt-BR/error.json | 1 + public/language/pt-BR/flags.json | 3 ++- public/language/pt-BR/notifications.json | 1 + public/language/pt-PT/error.json | 1 + public/language/pt-PT/flags.json | 3 ++- public/language/pt-PT/notifications.json | 1 + public/language/ro/error.json | 1 + public/language/ro/flags.json | 3 ++- public/language/ro/notifications.json | 1 + public/language/ru/error.json | 1 + public/language/ru/flags.json | 3 ++- public/language/ru/notifications.json | 1 + public/language/rw/error.json | 1 + public/language/rw/flags.json | 3 ++- public/language/rw/notifications.json | 1 + public/language/sc/error.json | 1 + public/language/sc/flags.json | 3 ++- public/language/sc/notifications.json | 1 + public/language/sk/error.json | 1 + public/language/sk/flags.json | 3 ++- public/language/sk/notifications.json | 1 + public/language/sl/error.json | 1 + public/language/sl/flags.json | 3 ++- public/language/sl/notifications.json | 1 + public/language/sr/error.json | 1 + public/language/sr/flags.json | 3 ++- public/language/sr/notifications.json | 1 + public/language/sv/error.json | 1 + public/language/sv/flags.json | 3 ++- public/language/sv/notifications.json | 1 + public/language/th/error.json | 1 + public/language/th/flags.json | 3 ++- public/language/th/notifications.json | 1 + public/language/tr/error.json | 1 + public/language/tr/flags.json | 3 ++- public/language/tr/notifications.json | 1 + public/language/uk/error.json | 1 + public/language/uk/notifications.json | 1 + public/language/vi/error.json | 1 + public/language/vi/flags.json | 3 ++- public/language/vi/notifications.json | 1 + public/language/zh-CN/error.json | 1 + public/language/zh-CN/flags.json | 3 ++- public/language/zh-CN/notifications.json | 1 + public/language/zh-TW/error.json | 1 + public/language/zh-TW/flags.json | 3 ++- public/language/zh-TW/notifications.json | 1 + 131 files changed, 174 insertions(+), 43 deletions(-) diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 2d5a420544..f546f570a1 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.", "cant-remove-last-admin": "رجاءًا ، أضف مدير أخر قبل حذف صلاحيات الإدارة من حسابك.", "cant-delete-admin": "رجاءًا أزل صلاحيات الإدارة قبل حذف الحساب. ", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "نوع الصورة غير مدعوم. الأنواع المدعومة هي : %1", "invalid-image-extension": "امتداد الصورة غير مدعوم.", diff --git a/public/language/ar/flags.json b/public/language/ar/flags.json index 1e5dff7c54..33481e3160 100644 --- a/public/language/ar/flags.json +++ b/public/language/ar/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 819a2cca70..80677aeb4f 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/bg/error.json b/public/language/bg/error.json index 633dab2599..28e0fb2cbb 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Не можете да блокирате другите администратори!", "cant-remove-last-admin": "Вие сте единственият администратор. Добавете друг потребител като администратор, преди да премахнете себе си като администратор", "cant-delete-admin": "Премахнете администраторските права от този акаунт, преди да го изтриете.", + "already-deleting": "Вече е в процес на изтриване", "invalid-image": "Грешно изображение", "invalid-image-type": "Грешен тип на изображение. Позволените типове са: %1", "invalid-image-extension": "Грешно разширение на изображението", diff --git a/public/language/bg/flags.json b/public/language/bg/flags.json index d8d404f2a2..c1ea9d7a52 100644 --- a/public/language/bg/flags.json +++ b/public/language/bg/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Групови действия", "bulk-resolve": "Разрешаване на доклад(и)", - "bulk-success": "%1 доклада са обновени" + "bulk-success": "%1 доклада са обновени", + "flagged-timeago-readable": "Докладвано (%2)" } \ No newline at end of file diff --git a/public/language/bg/notifications.json b/public/language/bg/notifications.json index 1c9a48e64e..86d2b8c7e8 100644 --- a/public/language/bg/notifications.json +++ b/public/language/bg/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Когато получите съобщение в разговор", "notificationType_new-group-chat": "Когато получите съобщение в групов разговор", "notificationType_group-invite": "Когато получите покана за група", + "notificationType_group-leave": "Когато потребител напусне групата Ви", "notificationType_group-request-membership": "Когато някой поиска да се включи в група, на която Вие сте собственик", "notificationType_new-register": "Когато някой бъде добавен в опашката за регистрация", "notificationType_post-queue": "Когато бъде добавена нова публикация в опашката", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 6eebcd07d8..83845a0b94 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/bn/flags.json b/public/language/bn/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/bn/flags.json +++ b/public/language/bn/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index 248e76ba9f..661d4909d2 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index f21b067508..b5b2070bd7 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Nemůžete zablokovat jiné správce.", "cant-remove-last-admin": "Jste jediným správcem. Před vlastním odebráním oprávnění správce nejdříve přidejte jiného uživatele jako správce", "cant-delete-admin": "Před odstraněním účtu mu nejprve odeberte oprávnění správce.", + "already-deleting": "Already deleting", "invalid-image": "Neplatný obrázek", "invalid-image-type": "Neplatný typ obrázku. Povolené typy jsou: %1", "invalid-image-extension": "Neplatná přípona obrázku", diff --git a/public/language/cs/flags.json b/public/language/cs/flags.json index 4228803ec0..625038d070 100644 --- a/public/language/cs/flags.json +++ b/public/language/cs/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index 92df4c807f..35c65485c5 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Obdržíte-li novou konverzační zprávu", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Obdržíte-li pozvání ke skupině", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Pokud někdo požaduje připojení se do vaší skupiny", "notificationType_new-register": "Bude-li někdo přidán do registrační fronty", "notificationType_post-queue": "Bude-li přidán nový příspěvek do fronty", diff --git a/public/language/da/error.json b/public/language/da/error.json index bd45fcaded..feeb595ce8 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Du kan ikke udlukke andre administatrorer!", "cant-remove-last-admin": "Du er den eneste administrator. Tilføj en anden bruger som administrator før du fjerner dig selv som administrator", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid billed type. De tilladte typer er: %1", "invalid-image-extension": "Forkert billede filnavnsendelse", diff --git a/public/language/da/flags.json b/public/language/da/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/da/flags.json +++ b/public/language/da/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json index cdd6eb9e2a..4c6ad68139 100644 --- a/public/language/da/notifications.json +++ b/public/language/da/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/de/error.json b/public/language/de/error.json index ee3c8c3778..8ec4fb70a3 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!", "cant-remove-last-admin": "Du bist der einzige Administrator. Füge zuerst einen anderen Administrator hinzu, bevor du dich selbst als Administrator entfernst", "cant-delete-admin": "Bevor du versuchst dieses Konto zu löschen, entferne die zugehörigen Administratorrechte.", + "already-deleting": "Already deleting", "invalid-image": "Ungültiges Bild", "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1", "invalid-image-extension": "Ungültige Dateinamenerweiterung", diff --git a/public/language/de/flags.json b/public/language/de/flags.json index 914b2dcecc..c5d65c1132 100644 --- a/public/language/de/flags.json +++ b/public/language/de/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Massenaktionen", "bulk-resolve": "Meldungen bereiningen", - "bulk-success": "%1 Meldungen aktualisiert" + "bulk-success": "%1 Meldungen aktualisiert", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 7a1a44e201..030c0ed80b 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Wenn du eine Chat Nachricht erhältst", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Wenn du eine Gruppeneinladung erhältst", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Wenn jemand einer Gruppe beitreten möchte, die dir gehört", "notificationType_new-register": "Wenn jemand der Registrierungswarteschlange hinzugefügt wird", "notificationType_post-queue": "Wenn ein neuer Beitrag eingereiht wird", diff --git a/public/language/el/error.json b/public/language/el/error.json index 3a57bc8eaf..cbf2792c27 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/el/flags.json b/public/language/el/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/el/flags.json +++ b/public/language/el/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json index b327e75ce9..5779866aed 100644 --- a/public/language/el/notifications.json +++ b/public/language/el/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index b0f6217392..1bcfa4ffe0 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/en-US/flags.json b/public/language/en-US/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/en-US/flags.json +++ b/public/language/en-US/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/en-US/notifications.json b/public/language/en-US/notifications.json index a6ede1b96b..14bc2e046e 100644 --- a/public/language/en-US/notifications.json +++ b/public/language/en-US/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/en-x-pirate/error.json b/public/language/en-x-pirate/error.json index b0f6217392..1bcfa4ffe0 100644 --- a/public/language/en-x-pirate/error.json +++ b/public/language/en-x-pirate/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/en-x-pirate/flags.json b/public/language/en-x-pirate/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/en-x-pirate/flags.json +++ b/public/language/en-x-pirate/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/en-x-pirate/notifications.json b/public/language/en-x-pirate/notifications.json index 16d11fe565..fe394df25a 100644 --- a/public/language/en-x-pirate/notifications.json +++ b/public/language/en-x-pirate/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/es/error.json b/public/language/es/error.json index 2e6e11802c..bc8ccd7ffb 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!", "cant-remove-last-admin": "Tu eres el unico administrador. Añade otro usuario como administrador antes de eliminarte a ti mismo.", "cant-delete-admin": "Quitar privilegios de administrador de ésta cuenta antes de intentar borrarla", + "already-deleting": "Already deleting", "invalid-image": "Imagen inválida", "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1", "invalid-image-extension": "Extensión de imagen inválida", diff --git a/public/language/es/flags.json b/public/language/es/flags.json index 8ac3583388..033eb2941b 100644 --- a/public/language/es/flags.json +++ b/public/language/es/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 9986f6568b..5fc224c511 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Cuando recibes un mensaje de chat", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Cuando recibes una invitación a un grupo", + "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": "Cuando alguien es añadido a una cola de registro", "notificationType_post-queue": "Cuando un mensaje nuevo entra en la cola", diff --git a/public/language/et/error.json b/public/language/et/error.json index 6d5a862699..06b4ec3ba3 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!", "cant-remove-last-admin": "Te olete ainus administraator. Lisage keegi teine administraatoriks, enne kui eemaldate endalt administraatori.", "cant-delete-admin": "Eemalda sellelt kasutajalt administraatori õigused enne selle kustutamist", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Vigane pildi formaat. Lubatud formaadid on: %1", "invalid-image-extension": "Vigane pildi formaat", diff --git a/public/language/et/flags.json b/public/language/et/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/et/flags.json +++ b/public/language/et/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index 36df3e9e19..51d15b1a6a 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json index d10e0a5643..9a0db8eaef 100644 --- a/public/language/fa-IR/error.json +++ b/public/language/fa-IR/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!", "cant-remove-last-admin": "شما تنها مدیر می باشید . شما باید قبل از عزل خود از مدیریت یک کاربر دیگر را مدیر کنید", "cant-delete-admin": "قبل از حذف این کاربر دسترسی های مدیریت را از وی بگیرید.", + "already-deleting": "Already deleting", "invalid-image": "عکس نامعتبر", "invalid-image-type": "نوع تصویر نامعتبر است. نوعهای قابل قبول اینها هستند: %1", "invalid-image-extension": "پسوند عکس نامعتبر است", diff --git a/public/language/fa-IR/flags.json b/public/language/fa-IR/flags.json index b9b0e9ece7..70843db704 100644 --- a/public/language/fa-IR/flags.json +++ b/public/language/fa-IR/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/fa-IR/notifications.json b/public/language/fa-IR/notifications.json index bb8b735575..a0baf73d0e 100644 --- a/public/language/fa-IR/notifications.json +++ b/public/language/fa-IR/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "هنگامی که شما پیام چتی دریافت می کنید", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_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": "وقتی کسی به صف ثبت نام اضافه می شود", "notificationType_post-queue": "هنگامی که یک پست جدید در صف قرار می گیرد", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 31bad88d90..3f50c9da55 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/fi/flags.json b/public/language/fi/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/fi/flags.json +++ b/public/language/fi/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index b822b8be43..4083fcd37c 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Kun saat viestin keskusteluun", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Kun saat kutsun ryhmään", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Kun joku pyytää lupaa liittyä ryhmään, jonka omistaja olet", "notificationType_new-register": "Kun joku lisätään rekisteröintijonoon", "notificationType_post-queue": "Kun uusi viesti tulee jonoon", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index f33fe352d0..b7e73239b6 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !", "cant-remove-last-admin": "Vous êtes le seul administrateur. Ajoutez un autre utilisateur en tant qu'administrateur avant de vous retirer.", "cant-delete-admin": "Veuillez retirer les droits d'administration de ce compte avant de tenter de le supprimer.", + "already-deleting": "Already deleting", "invalid-image": "Image invalide", "invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1", "invalid-image-extension": "Extension d'image invalide", diff --git a/public/language/fr/flags.json b/public/language/fr/flags.json index dba9270841..78512be3a3 100644 --- a/public/language/fr/flags.json +++ b/public/language/fr/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Actions", "bulk-resolve": "Signalement(s) résolu(s)", - "bulk-success": "%1 signalement mis à jour" + "bulk-success": "%1 signalement mis à jour", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index 3584b65361..07bf47fe81 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Lorsque vous recevez un message du chat ", "notificationType_new-group-chat": "Lorsque vous recevez un message de discussion de groupe", "notificationType_group-invite": "Lorsque vous recevez une invitation d'un groupe", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Quand quelqu'un demande à rejoindre un groupe que vous administrez", "notificationType_new-register": "Lorsque quelqu'un est ajouté à la file d'attente d'inscription", "notificationType_post-queue": "Lorsque un nouveau message est mis en file d'attente", diff --git a/public/language/gl/error.json b/public/language/gl/error.json index 54c3fe0e21..08f30cf26e 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Non podes botar outros administradores!", "cant-remove-last-admin": "Eres o único administrador. Engade outros administradores antes de quitarte a ti mesmo como administrador.", "cant-delete-admin": "Retirar privilexios de administrador desta conta antes de intentar borrala", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Tipo de imaxe inválida. Tipos admitidos: %1", "invalid-image-extension": "Extensión de imaxe inválida", diff --git a/public/language/gl/flags.json b/public/language/gl/flags.json index 29189beab3..4f06f7b700 100644 --- a/public/language/gl/flags.json +++ b/public/language/gl/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json index fe57395043..5f3ceb4af1 100644 --- a/public/language/gl/notifications.json +++ b/public/language/gl/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/he/error.json b/public/language/he/error.json index b26f9f63c0..0b4e467a8e 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!", "cant-remove-last-admin": "אתה המנהל היחיד. הוסף משתמש אחר לניהול לפני שאתה מוריד את עצמך מניהול", "cant-delete-admin": "משתמש זה מוגדר כמנהל. על מנת למחוק את המשתמש, עליך להסיר קודם את גישותיו.", + "already-deleting": "Already deleting", "invalid-image": "תמונה לא תקינה", "invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1", "invalid-image-extension": "פורמט תמונה לא תקין", diff --git a/public/language/he/flags.json b/public/language/he/flags.json index bd60a02dbf..fb08ee51c4 100644 --- a/public/language/he/flags.json +++ b/public/language/he/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "פעולות כלליות", "bulk-resolve": "השלם דיווחים", - "bulk-success": "%1 דיווחים עודכנו" + "bulk-success": "%1 דיווחים עודכנו", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 4af174edf8..e66baf911a 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "כשאתה מקבל הודעת צאט", "notificationType_new-group-chat": "כשאתה מקבל הודעת צ'אט קבוצתית", "notificationType_group-invite": "כשאתה מקבל הזמנה מקבוצה", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "כשמישהו מבקש להירשם לקבוצה שאתה מנהל", "notificationType_new-register": "כאשר מישהו מתווסף לתור הרישום", "notificationType_post-queue": "כשהודעה חדשה נכנסת לתור", diff --git a/public/language/hr/error.json b/public/language/hr/error.json index 9df4081a87..4597569952 100644 --- a/public/language/hr/error.json +++ b/public/language/hr/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Nemožete blokirati ostale administratore!", "cant-remove-last-admin": "Vi ste jedini administrator. Dodajte korisnika kao administratora prije nego sebe odjavite kao administratora.", "cant-delete-admin": "Ukloni administratorske privilegije sa ovog računa prije brisanja.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Pogrešan format slike. Dozvoljeni formati: %1", "invalid-image-extension": "Kriva ekstezija slike", diff --git a/public/language/hr/flags.json b/public/language/hr/flags.json index 6c1761dfe4..65f5cc3d72 100644 --- a/public/language/hr/flags.json +++ b/public/language/hr/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/hr/notifications.json b/public/language/hr/notifications.json index f5dda50f81..0db4e82c4f 100644 --- a/public/language/hr/notifications.json +++ b/public/language/hr/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 629a74eaa4..3600815d47 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Nem tilthatsz ki másik adminisztrátort!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Érvénytelen a kép típusa. Engedett kiterjesztések: %1", "invalid-image-extension": "Érvénytelen a kép kiterjesztése", diff --git a/public/language/hu/flags.json b/public/language/hu/flags.json index 9bf2b38188..622cb941f8 100644 --- a/public/language/hu/flags.json +++ b/public/language/hu/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index a22aadf9fb..85b82c04bc 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Mikor chat üzenetet kapsz", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Mikor csoportmeghívást kapsz", + "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": "Mikor valaki a regisztrációs várólistára kerül", "notificationType_post-queue": "Mikor egy új hozzászólás várólistára kerül", diff --git a/public/language/id/error.json b/public/language/id/error.json index b0901f8234..126ab1aa84 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/id/flags.json b/public/language/id/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/id/flags.json +++ b/public/language/id/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json index 3aa54ade76..a4b823d82b 100644 --- a/public/language/id/notifications.json +++ b/public/language/id/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/it/error.json b/public/language/it/error.json index 280248f26b..43fa850d46 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Non puoi bannare altri amministratori!", "cant-remove-last-admin": "Sei l'unico Amministratore. Aggiungi un altro amministratore prima di rimuovere il tuo ruolo", "cant-delete-admin": "Togli i privilegi amministrativi da questo account prima di provare ad eliminarlo.", + "already-deleting": "Already deleting", "invalid-image": "Immagine non Valida", "invalid-image-type": "Tipo dell'immagine non valido. I tipi permessi sono: %1", "invalid-image-extension": "Estensione immagine non valida", diff --git a/public/language/it/flags.json b/public/language/it/flags.json index 040fcbbac6..0f6d17c1e4 100644 --- a/public/language/it/flags.json +++ b/public/language/it/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Azioni in blocco", "bulk-resolve": "Risoluzione segnalazione(i)", - "bulk-success": "%1 segnalazioni aggiornate" + "bulk-success": "%1 segnalazioni aggiornate", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 272549b215..8e51460e8c 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Quando ricevi un messaggio in chat", "notificationType_new-group-chat": "Quando ricevi un messaggio di chat di gruppo", "notificationType_group-invite": "Quando ricevi un invito ad un gruppo", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Quando qualcuno richiede di iscriversi a un gruppo di tua proprietà", "notificationType_new-register": "Quando qualcuno è in attesa della registrazione", "notificationType_post-queue": "Quando un nuovo post è in attesa", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index c5e84daae4..1b6a278b6a 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "ほかの管理者を停止することはできません！", "cant-remove-last-admin": "あなたが唯一の管理者です。管理者としてあなた自身を削除する前に、管理者として別のユーザーを追加します。", "cant-delete-admin": "削除する前に、このアカウントから管理者権限を削除してください。", + "already-deleting": "Already deleting", "invalid-image": "無効な画像", "invalid-image-type": "無効なイメージタイプです。許可された種類は: %1", "invalid-image-extension": "無効なイメージのエクステンション", diff --git a/public/language/ja/flags.json b/public/language/ja/flags.json index df5a7713d4..4c22aff146 100644 --- a/public/language/ja/flags.json +++ b/public/language/ja/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index 6f12785401..07b5857a37 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "チャットメッセージを受信したとき", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "グループ招待を受けたとき", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "誰かがあなたのグループへの参加を要求したとき", "notificationType_new-register": "誰かが登録キューに追加されたとき", "notificationType_post-queue": "新しい投稿がキューに入ったとき", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 104c99bd67..e613a0268d 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다.", "cant-remove-last-admin": "귀하는 유일한 관리자입니다. 관리자를 그만두시기 전에 다른 사용자를 관리자로 임명하세요.", "cant-delete-admin": "해당 계정을 삭제하기 전에 관리자 권한을 해제 해주십시오.", + "already-deleting": "Already deleting", "invalid-image": "올바르지 않은 이미지입니다.", "invalid-image-type": "올바르지 않은 이미지입니다. 사용가능한 유형: %1", "invalid-image-extension": "올바르지 않은 이미지 확장자입니다.", diff --git a/public/language/ko/flags.json b/public/language/ko/flags.json index 4e0218d708..41c294b949 100644 --- a/public/language/ko/flags.json +++ b/public/language/ko/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index e70e3cc139..1a688f0880 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "채팅 메시지를 받으면", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "그룹 초대를 받으면", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "누군가가 당신이 소유한 그룹에 참여를 요청했을 때", "notificationType_new-register": "When someone gets added to registration queue", "notificationType_post-queue": "새로운 게시글이 등록되었을 때", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 235bb3b5b0..931d7555d1 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!", "cant-remove-last-admin": "Jūs esate vienintelis administratorius. Pridėkite kitą vartotoja kaip administratorių prieš pašalindamas save", "cant-delete-admin": "Pašalinkite administratoriaus teises šiai paskyrai prieš bandydami ją ištrinti.", + "already-deleting": "Already deleting", "invalid-image": "Blogas paveikslėlis", "invalid-image-type": "Neteisingas vaizdo tipas. Leidžiami tipai :%1", "invalid-image-extension": "Neteisingas vaizdo plėtinys", diff --git a/public/language/lt/flags.json b/public/language/lt/flags.json index 1977059a92..7c026fd99e 100644 --- a/public/language/lt/flags.json +++ b/public/language/lt/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index f40d0ce4e1..3177907282 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/lv/error.json b/public/language/lv/error.json index 3bcd2648b6..48b057d504 100644 --- a/public/language/lv/error.json +++ b/public/language/lv/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Nevar bloķēt citus administratorus!", "cant-remove-last-admin": "Tu esi vienīgais administrators. Pievieno vēl vienu lietotāju kā administratoru, pirms noņemi sevi kā administratoru", "cant-delete-admin": "Noņemi administratora tiesības no šī konta, pirms mēģināt to izdzēst.", + "already-deleting": "Already deleting", "invalid-image": "Nederīgs attēls", "invalid-image-type": "Nederīgs attēla veids. Atļautie veidi ir: %1", "invalid-image-extension": "Nederīgs attēla paplašinājums", diff --git a/public/language/lv/flags.json b/public/language/lv/flags.json index 9132179172..744bd2d23c 100644 --- a/public/language/lv/flags.json +++ b/public/language/lv/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/lv/notifications.json b/public/language/lv/notifications.json index 8ae6e46820..40601196ef 100644 --- a/public/language/lv/notifications.json +++ b/public/language/lv/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Kad saņemi sarunu", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Kad saņemi ielūgumu pievienoties grupai", + "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": "Kad kāds tiek ievietots reģistrācijas rindā", "notificationType_post-queue": "Kad raksts tiek ievietots apstiprināšanas rindā", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 5ef46406e8..51975e38e1 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Anda tidak boleh haramkan admin / pentadbir!", "cant-remove-last-admin": "Anda satu-satunya pentadbir. Tambah pentadbir lain sebelum membuang diri anda sebagai pentadbir", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Jenis imej tak sah. Jenis yang dibenarkan ialah: %1", "invalid-image-extension": "Sambungan imej tak sah", diff --git a/public/language/ms/flags.json b/public/language/ms/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/ms/flags.json +++ b/public/language/ms/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index a81c5b85eb..89031d7e50 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 2b83c8ff8e..d5db1ff297 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!", "cant-remove-last-admin": "Du er den eneste administratoren. Legg til en annen bruker som administrator før du fjerner deg selv.", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Ugyldig bildetype. Tilatte typer er: %1", "invalid-image-extension": "Ugyldig bildefiltype", diff --git a/public/language/nb/flags.json b/public/language/nb/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/nb/flags.json +++ b/public/language/nb/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 9df75acb22..bdcca81501 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 155f328f0e..b67b0b13bd 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Het is niet toegestaan andere beheerders te verbannen!", "cant-remove-last-admin": "Je bent de enige beheerder. Stel eerst een andere gebruiker als beheerder in voordat je jezelf geen beheerder meer maakt.", "cant-delete-admin": "Verwijder administratieve rechten van dit account voordat je probeert deze te verwijderen", + "already-deleting": "Already deleting", "invalid-image": "Ongeldige afbeelding", "invalid-image-type": "Ongeldig bestandstype afbeelding. Deze afbeelding is van een bestandstype dat niet ondersteund wordt. Toegestane bestandstypes voor afbeeldingsbestanden zijn: %1", "invalid-image-extension": "Ongeldig bestandstype afbeelding", diff --git a/public/language/nl/flags.json b/public/language/nl/flags.json index 5d36245b74..e4a644eb76 100644 --- a/public/language/nl/flags.json +++ b/public/language/nl/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk acties", "bulk-resolve": "Los markering(en) op", - "bulk-success": "%1 markeringen aangepast" + "bulk-success": "%1 markeringen aangepast", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index 8c42a8b9bd..28b813258a 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Als je een chat-bericht ontvangt", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Als je een uitnodiging voor een groep ontvangt", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Als iemand vraagt om lid te worden van een groep waarvan je eigenaar bent", "notificationType_new-register": "Als iemand wordt toegevoegd aan een registratiewachtrij", "notificationType_post-queue": "Als een bericht aan de wachtrij wordt toegevoegd", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 7aee20d97d..bb3dda2baf 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", "cant-remove-last-admin": "Jesteś jedynym administratorem. Dodaj innego użytkownika jako administratora przed usunięciem siebie z tej grupy", "cant-delete-admin": "Usuń uprawnienia administratora z tego konta przed próbą jego usunięcia.", + "already-deleting": "Already deleting", "invalid-image": "Błędny obraz.", "invalid-image-type": "Błędny typ obrazka. Dozwolone typy to: %1", "invalid-image-extension": "Błędne rozszerzenie pliku", diff --git a/public/language/pl/flags.json b/public/language/pl/flags.json index 241896eb4d..7d3a2a8950 100644 --- a/public/language/pl/flags.json +++ b/public/language/pl/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Oznacz flagi jako rozwiązane", - "bulk-success": "Zaktualizowano %1 flag" + "bulk-success": "Zaktualizowano %1 flag", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index 2469c671ee..05aafb1182 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Kiedy otrzymasz wiadomość na czacie", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Kiedy otrzymasz grupowe zaproszenie", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Kiedy ktoś prosi o dołączenie do grupy, którą posiadasz", "notificationType_new-register": "Kiedy ktoś zostaje dodany do kolejki rejestracyjnej", "notificationType_post-queue": "Kiedy nowy post jest kolejkowany", diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json index b8a4f9b645..a61be7981d 100644 --- a/public/language/pt-BR/error.json +++ b/public/language/pt-BR/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Você não pode banir outros administradores!", "cant-remove-last-admin": "Você é o único administrador. Adicione outro usuário como administrador antes de remover a si mesmo como admin", "cant-delete-admin": "Remova os privilégios de administrador dessa conta antes de tentar excluí-la.", + "already-deleting": "Already deleting", "invalid-image": "Imagem Inválida", "invalid-image-type": "Tipo inválido de imagem. Os tipos permitidos são: %1", "invalid-image-extension": "Extensão de imagem inválida", diff --git a/public/language/pt-BR/flags.json b/public/language/pt-BR/flags.json index 1bb5fc5a31..44ce420fbe 100644 --- a/public/language/pt-BR/flags.json +++ b/public/language/pt-BR/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/pt-BR/notifications.json b/public/language/pt-BR/notifications.json index ac8c90376b..22508e43fd 100644 --- a/public/language/pt-BR/notifications.json +++ b/public/language/pt-BR/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Quando você receber uma mensagem de chat", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Quando você receber um convite para um grupo", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Quando alguém pede para participar de um grupo que você é dono", "notificationType_new-register": "Quando alguém for adicionado à fila de registro", "notificationType_post-queue": "Quando um novo post entrar na fila", diff --git a/public/language/pt-PT/error.json b/public/language/pt-PT/error.json index 5e1bde5d18..d2e29e4a97 100644 --- a/public/language/pt-PT/error.json +++ b/public/language/pt-PT/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Não podes banir outros administradores!", "cant-remove-last-admin": "És o único administrador. Adicionar outro utilizador como administrador antes de te removeres como administrador.", "cant-delete-admin": "Remove os privilégios de administrador desta conta antes de tentares apagá-la.", + "already-deleting": "Already deleting", "invalid-image": "Imagem inválida", "invalid-image-type": "Tipo de imagem inválida. Os tipos válidos são: %1", "invalid-image-extension": "Extensão de imagem inválida", diff --git a/public/language/pt-PT/flags.json b/public/language/pt-PT/flags.json index 3f22c5b2c2..f5ece5a2d6 100644 --- a/public/language/pt-PT/flags.json +++ b/public/language/pt-PT/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/pt-PT/notifications.json b/public/language/pt-PT/notifications.json index a51fdf329d..c86d77695a 100644 --- a/public/language/pt-PT/notifications.json +++ b/public/language/pt-PT/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Quando recebes uma mensagem numa conversa", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Quando recebes um convite para um grupo", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Quando alguém pede para entrar num grupo que é teu", "notificationType_new-register": "Quando alguém é adicionado à fila de espera de registo", "notificationType_post-queue": "Quando uma nova publicação está à espera de aprovação", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 23323d5895..768928dcb7 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Nu poți bana alți administratori!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/ro/flags.json b/public/language/ro/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/ro/flags.json +++ b/public/language/ro/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index 48e51096a7..ceb0531488 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 8358d69f11..22488a47d4 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Вы не можете заблокировать других администраторов!", "cant-remove-last-admin": "Вы единственный администратор. Чтобы отказаться от своих полномочий, пожалуйста, назначьте администратором другого участника.", "cant-delete-admin": "Чтобы удалить эту учётную запись, сначала надо снять с неё полномочия администратора.", + "already-deleting": "Already deleting", "invalid-image": "Некорректное изображение", "invalid-image-type": "Этот формат изображения не поддерживается. Загрузите изображение в одном из следующих форматов: %1", "invalid-image-extension": "Недопустимое расширение файла", diff --git a/public/language/ru/flags.json b/public/language/ru/flags.json index 25aa9ffb02..9fbea1a9bc 100644 --- a/public/language/ru/flags.json +++ b/public/language/ru/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index c9c9c59b45..a352214337 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Когда вы получаете сообщение в чат", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Когда вы получаете приглашение в группу", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Когда кто-то хочет присоединиться к группе, которой вы управляете", "notificationType_new-register": "Когда в очереди на регистрацию появляется новый пользователь", "notificationType_post-queue": "Когда в очереди на проверку появляется новое сообщение", diff --git a/public/language/rw/error.json b/public/language/rw/error.json index 486834e189..ef0842f30c 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Ntabwo wakwirukana abandi bayobozi!", "cant-remove-last-admin": "Ni wowe muyobozi wenyine. Ongeramo undi muntu nk'umuyobozi mbere y'uko wikura ku buyobozi", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Ubwoko bw'ifoto wahisemo ntibwemewe. Hemewe gusa: %1", "invalid-image-extension": "Impera itemewe igaragaza foruma y'ifoto", diff --git a/public/language/rw/flags.json b/public/language/rw/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/rw/flags.json +++ b/public/language/rw/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json index 4fb985e978..3faf1cf4a8 100644 --- a/public/language/rw/notifications.json +++ b/public/language/rw/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index b0f6217392..1bcfa4ffe0 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/sc/flags.json b/public/language/sc/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/sc/flags.json +++ b/public/language/sc/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index 5d3155833c..b896eedec0 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 32b8e9e6e3..aea9e60bc5 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Nemôžte zablokovať iných správcov.", "cant-remove-last-admin": "Momentálne ste jediný správca. Najskôr pridajte ďalšieho užívateľa za správcu predtým, ako zrušíte svoje výsady správcu", "cant-delete-admin": "Odobrať oprávnenie správcu z tohto účtu pred pokusom ho odstrániť.", + "already-deleting": "Already deleting", "invalid-image": "Neplatný obrázok", "invalid-image-type": "Neplatný typ obrázku. Povolené typy sú: %1", "invalid-image-extension": "Neplatná prípona obrázku", diff --git a/public/language/sk/flags.json b/public/language/sk/flags.json index f328f60e18..3665730f60 100644 --- a/public/language/sk/flags.json +++ b/public/language/sk/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index 372e67f587..8c630a00e0 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Ak obdržíte novú správu konverzácie", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Ak obdržíte pozvanie do skupiny", + "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": "Ak bude niekto pridaný do registračnej fronty", "notificationType_post-queue": "Ak bude pridaný nový príspevok do fronty", diff --git a/public/language/sl/error.json b/public/language/sl/error.json index 0b496ca455..96b631492b 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Ne morete izločati drugih skrbnikov!", "cant-remove-last-admin": "Ste edini skrbnik. Preden se odstranite, dodajte novega skrbnika.", "cant-delete-admin": "Pred brisanjem tega računa morate odstraniti skrbniške pravice.", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "Nedovoljen format slike. Dovoljeni formati: %1.", "invalid-image-extension": "Nedovoljena pripona slike.", diff --git a/public/language/sl/flags.json b/public/language/sl/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/sl/flags.json +++ b/public/language/sl/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/sl/notifications.json b/public/language/sl/notifications.json index 1975b3117e..76bcbf6a38 100644 --- a/public/language/sl/notifications.json +++ b/public/language/sl/notifications.json @@ -63,6 +63,7 @@ "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", diff --git a/public/language/sr/error.json b/public/language/sr/error.json index 711c77d3a7..13b1e81213 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Не можете забранити друге администраторе!", "cant-remove-last-admin": "Ви сте једини администратор. Додајте другог корисника као администратора пре него што уклоните себе као администратора.", "cant-delete-admin": "Уклоните администраторске привилегије овом налогу пре него што покушате да га избришете.", + "already-deleting": "Already deleting", "invalid-image": "Неважећа слика", "invalid-image-type": "Неважећи тип слике. Дозвољени типови су: %1", "invalid-image-extension": "Неважећи тип слике", diff --git a/public/language/sr/flags.json b/public/language/sr/flags.json index 3d9c10a421..7d70a1dc8a 100644 --- a/public/language/sr/flags.json +++ b/public/language/sr/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json index 0075dcbbf2..a220f6f294 100644 --- a/public/language/sr/notifications.json +++ b/public/language/sr/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Када примите поруку за ћаскање", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Када примите позивницу за групу", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Када неко затражи да се придружи групи коју поседујете", "notificationType_new-register": "Када је неко додат на чекање за регистрацију", "notificationType_post-queue": "Када је нова порука на чекању", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index b248543af8..91c3853183 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Du kan inte bannlysa andra administratörer!", "cant-remove-last-admin": "Du är den enda administratören. Lägg till en annan användare som administratör innan du tar bort dig själv.", "cant-delete-admin": "Ta bort administratörsbehörighet från detta konto innan du försöker ta bort den.", + "already-deleting": "Already deleting", "invalid-image": "Ogiltig bild", "invalid-image-type": "Ogiltig bildtyp. Tillåtna typer är: %1", "invalid-image-extension": "Ogiltigt bildformat", diff --git a/public/language/sv/flags.json b/public/language/sv/flags.json index 4a617433ad..d0f412cc51 100644 --- a/public/language/sv/flags.json +++ b/public/language/sv/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index a05d5fb625..aa1eaa9c34 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "När du får ett chattmeddelande", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "När du får en gruppinbjudan", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "När någon ber om att få gå med i en grupp du äger", "notificationType_new-register": "När någon läggs till i registreringskön", "notificationType_post-queue": "När ett nytt inlägg läggs i kön", diff --git a/public/language/th/error.json b/public/language/th/error.json index e949e725be..ade5a592ca 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "คุณแบนแอดมินไม่ได้!!!", "cant-remove-last-admin": "คุณเป็นแอดมินเพียงคนเดียว กรุณาเพิ่มผู้ใช้คนอื่นเป็นแอดมิน ก่อนการลบตัวเองออกจากแอดมิน", "cant-delete-admin": "ลบสิทธิพิเศษของแอดมินจากบัญชีผู้ใช้นี้ ก่อนทำการลบ", + "already-deleting": "Already deleting", "invalid-image": "Invalid image", "invalid-image-type": "ประเภทรูปภาพไม่ถูกต้อง ประเภทที่ได้รับการอนุญาติคือ : %1", "invalid-image-extension": "นามสกุลรูปภาพไม่ถูกต้อง", diff --git a/public/language/th/flags.json b/public/language/th/flags.json index bddef72f81..0ae9d3b75c 100644 --- a/public/language/th/flags.json +++ b/public/language/th/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index 801431742c..8c8f538a2a 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "เมื่อคุณได้รับข้อความใหม่", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_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": "เมื่อมีคนถูกเพิ่มในคิวลงทะเบียน", "notificationType_post-queue": "เมื่อมีโพสต์ใหม่อยู่ในคิว", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 185a847e5d..9de734069e 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!", "cant-remove-last-admin": "Tek yönetici sizsiniz. Kendinizi adminlikten çıkarmadan önce başka bir kullanıcıyı admin olarak ekleyiniz", "cant-delete-admin": "Öncelikle yönetici izinlerini kaldırman gerekiyor.", + "already-deleting": "Already deleting", "invalid-image": "Geçersiz görsel", "invalid-image-type": "Geçersiz görsel uzantısı. Izin verilen uzantılar: %1", "invalid-image-extension": "Geçersiz görsel uzantısı", diff --git a/public/language/tr/flags.json b/public/language/tr/flags.json index a7c482eaf2..995b2b3fc6 100644 --- a/public/language/tr/flags.json +++ b/public/language/tr/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Toplu Aksiyonlar", "bulk-resolve": "Şikayetleri Çözümle", - "bulk-success": "%1 şikayet güncellendi" + "bulk-success": "%1 şikayet güncellendi", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index d554eb5a8a..dbf4b9b6f7 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Bir sohbet mesajı aldığınızda", "notificationType_new-group-chat": "Grup sohbet mesajı aldığınızda", "notificationType_group-invite": "Bir gruba katılım davetiyesi aldığınızda", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Biri size ait bir gruba üye olmak istediğinde", "notificationType_new-register": "Biri kayıt kuyruğuna eklendiğinde", "notificationType_post-queue": "Yeni bir ileti sıraya alındığında", diff --git a/public/language/uk/error.json b/public/language/uk/error.json index bc967acc28..bab8b9fc53 100644 --- a/public/language/uk/error.json +++ b/public/language/uk/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Ви не можете банити інших адмінів!", "cant-remove-last-admin": "Ви єдиний адміністратор. Додайте іншого користувача в якості адміністратора перш ніж знімати з себе ці обов'язки.", "cant-delete-admin": "Зніміть обов'язки адміністратора з цього акаунту перш ніж видаляти його.", + "already-deleting": "Already deleting", "invalid-image": "Невірне зображення", "invalid-image-type": "Невірний тип зображення. Дозволені типи: %1", "invalid-image-extension": "Невірне розширення зображення", diff --git a/public/language/uk/notifications.json b/public/language/uk/notifications.json index a126df0cf4..81db999a59 100644 --- a/public/language/uk/notifications.json +++ b/public/language/uk/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Коли ви отримуєте повідомлення чату", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Коли ви отримуєте запрошення до групи", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Коли хтось подає запит на приєднання до групи, якою ви володієте", "notificationType_new-register": "Коли когось додано до черги на реєстрацію", "notificationType_post-queue": "Коли новий пост знаходиться в черзі", diff --git a/public/language/vi/error.json b/public/language/vi/error.json index d5531d5dad..3c97fb550f 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "Bạn không thể cấm được các quản trị viên khác", "cant-remove-last-admin": "Bạn là quản trị viên duy nhất. Hãy cho thành viên khác làm quản trị viên trước khi huỷ bỏ quyền quản trị của bạn.", "cant-delete-admin": "Hủy quyền quản trị của tài khoản này trước khi xóa", + "already-deleting": "Already deleting", "invalid-image": "Hình ảnh không hợp lệ", "invalid-image-type": "Định dạng ảnh không hợp lệ. Những định dạng được cho phép là: %1", "invalid-image-extension": "Định dạng ảnh không hợp lệ", diff --git a/public/language/vi/flags.json b/public/language/vi/flags.json index 13b3567bc9..457d80c6d0 100644 --- a/public/language/vi/flags.json +++ b/public/language/vi/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index ae2631d322..41efed9d17 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "Khi bạn nhận được thông điệp chat", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "Khi bạn nhận được lời mời gia nhập nhóm", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "Khi ai đó yêu cầu tham gia một nhóm bạn sở hữu", "notificationType_new-register": "Khi ai đó được thêm vào lượt chờ đăng ký", "notificationType_post-queue": "Khi bài đăng được thêm vào lượt chờ", diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index 1159b5b355..12a6b51247 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "您不能封禁其他管理员！", "cant-remove-last-admin": "您是唯一的管理员。在删除您的管理员权限前，请添加另一个管理员。", "cant-delete-admin": "在删除该账号之前，请先移除其管理权限。", + "already-deleting": "Already deleting", "invalid-image": "无效的图片", "invalid-image-type": "无效的图像类型。允许的类型有：%1", "invalid-image-extension": "无效的图像扩展", diff --git a/public/language/zh-CN/flags.json b/public/language/zh-CN/flags.json index dbcc5dba94..34a2c53dcb 100644 --- a/public/language/zh-CN/flags.json +++ b/public/language/zh-CN/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "批量操作", "bulk-resolve": "处理举报", - "bulk-success": "已更新%1个举报" + "bulk-success": "已更新%1个举报", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json index 3053a85591..ac864191f6 100644 --- a/public/language/zh-CN/notifications.json +++ b/public/language/zh-CN/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "当您收到聊天消息时", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "当您收到群组邀请时", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "当有人请求加入您拥有的用户组时", "notificationType_new-register": "当有人被添加到申请队列时", "notificationType_post-queue": "当有新帖子等待审核时", diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json index 83fec47ca8..cc49966670 100644 --- a/public/language/zh-TW/error.json +++ b/public/language/zh-TW/error.json @@ -92,6 +92,7 @@ "cant-ban-other-admins": "您不能封鎖其他管理員！", "cant-remove-last-admin": "您是唯一的管理員。在刪除您的管理員權限前，請增加另一個管理員。", "cant-delete-admin": "在刪除該帳戶之前，請先移除其管理權限。", + "already-deleting": "Already deleting", "invalid-image": "無效的圖檔", "invalid-image-type": "無效的圖檔類型。允許的類型有：%1", "invalid-image-extension": "無效的圖檔副檔名", diff --git a/public/language/zh-TW/flags.json b/public/language/zh-TW/flags.json index 883891eda6..0232b7b266 100644 --- a/public/language/zh-TW/flags.json +++ b/public/language/zh-TW/flags.json @@ -81,5 +81,6 @@ "bulk-actions": "Bulk Actions", "bulk-resolve": "Resolve Flag(s)", - "bulk-success": "%1 flags updated" + "bulk-success": "%1 flags updated", + "flagged-timeago-readable": "Flagged (%2)" } \ No newline at end of file diff --git a/public/language/zh-TW/notifications.json b/public/language/zh-TW/notifications.json index ac72de5baa..8951ca9a2a 100644 --- a/public/language/zh-TW/notifications.json +++ b/public/language/zh-TW/notifications.json @@ -63,6 +63,7 @@ "notificationType_new-chat": "當您收到聊天訊息時", "notificationType_new-group-chat": "When you receive a group chat message", "notificationType_group-invite": "當您收到群組邀請時", + "notificationType_group-leave": "When a user leaves your group", "notificationType_group-request-membership": "當有人請求加入您擁有的群組時", "notificationType_new-register": "當有註冊申請待審核時", "notificationType_post-queue": "當有新貼文等待審核時", From 6f68f4d20ad2c25e3a6aae7fd805f8d6362e69de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 2 Dec 2020 12:42:21 -0500 Subject: [PATCH 115/116] fix: #9032, fix login redirect for sso plugins --- public/src/ajaxify.js | 16 ++++++---------- src/controllers/index.js | 7 +------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 76b1a545ba..07f44c19b8 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -155,16 +155,12 @@ ajaxify = window.ajaxify || {}; app.alertError('[[global:please_log_in]]'); app.previousUrl = url; window.location.href = config.relative_path + '/login'; - } else if (status === 302 || status === 308) { - if (data.responseJSON && data.responseJSON.external) { - window.location.href = data.responseJSON.external; - } else if (typeof data.responseJSON === 'string') { - ajaxifyTimer = undefined; - if (data.responseJSON.startsWith('http://') || data.responseJSON.startsWith('https://')) { - window.location.href = data.responseJSON; - } else { - ajaxify.go(data.responseJSON.slice(1), callback, quiet); - } + } else if ((status === 302 || status === 308) && typeof data.responseJSON === 'string') { + ajaxifyTimer = undefined; + if (data.responseJSON.startsWith('http://') || data.responseJSON.startsWith('https://')) { + window.location.href = data.responseJSON; + } else { + ajaxify.go(data.responseJSON.slice(1), callback, quiet); } } } else if (textStatus !== 'abort') { diff --git a/src/controllers/index.js b/src/controllers/index.js index 18f9ea3820..caa2f7311a 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -125,12 +125,7 @@ Controllers.login = async function (req, res) { data.allowLocalLogin = hasLoginPrivilege || parseInt(req.query.local, 10) === 1; if (!data.allowLocalLogin && !data.allowRegistration && data.alternate_logins && data.authentication.length === 1) { - if (res.locals.isAPI) { - return helpers.redirect(res, { - external: nconf.get('relative_path') + data.authentication[0].url, - }); - } - return res.redirect(nconf.get('relative_path') + data.authentication[0].url); + return helpers.redirect(res, data.authentication[0].url); } if (req.loggedIn) { From 73746bb4897425f6271070650b8ad4d247d0a262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 2 Dec 2020 14:14:56 -0500 Subject: [PATCH 116/116] refactor: remove old hack --- public/src/ajaxify.js | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 07f44c19b8..0c9e018d9b 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -7,19 +7,9 @@ ajaxify = window.ajaxify || {}; var apiXHR = null; var ajaxifyTimer; - var translator; - var Benchpress; var retry = true; var previousBodyClass = ''; - // Dumb hack to fool ajaxify into thinking translator is still a global - // When ajaxify is migrated to a require.js module, then this can be merged into the "define" call - require(['translator', 'benchpress'], function (_translator, _Benchpress) { - translator = _translator; - translator.translate('[[error:no-connection]]'); - Benchpress = _Benchpress; - }); - ajaxify.count = 0; ajaxify.currentPage = null; @@ -170,26 +160,27 @@ ajaxify = window.ajaxify || {}; function renderTemplate(url, tpl_url, data, callback) { $(window).trigger('action:ajaxify.loadingTemplates', {}); + require(['translator', 'benchpress'], function (translator, Benchpress) { + Benchpress.render(tpl_url, data) + .then(rendered => translator.translate(rendered)) + .then(function (translated) { + translated = translator.unescape(translated); + $('body').removeClass(previousBodyClass).addClass(data.bodyClass); + $('#content').html(translated); - Benchpress.render(tpl_url, data) - .then(rendered => translator.translate(rendered)) - .then(function (translated) { - translated = translator.unescape(translated); - $('body').removeClass(previousBodyClass).addClass(data.bodyClass); - $('#content').html(translated); + ajaxify.end(url, tpl_url); - ajaxify.end(url, tpl_url); + if (typeof callback === 'function') { + callback(); + } - if (typeof callback === 'function') { - callback(); - } + $('#content, #footer').removeClass('ajaxifying'); - $('#content, #footer').removeClass('ajaxifying'); - - // Only executed on ajaxify. Otherwise these'd be in ajaxify.end() - updateTitle(data.title); - updateTags(); - }); + // Only executed on ajaxify. Otherwise these'd be in ajaxify.end() + updateTitle(data.title); + updateTags(); + }); + }); } function updateTitle(title) {
    • [[admin/manage/categories:privileges.section-viewing]]