Compare commits

...

21 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
b46dcd9243 fix: use component instead of class name 2021-12-23 11:07:57 -05:00
Barış Soner Uşaklı
1a375000a7 refactor: only pass qs 2021-12-16 13:47:12 -05:00
Barış Soner Uşaklı
1f8f2e9168 feat: pass in all query params to category search filter 2021-12-16 13:33:37 -05:00
Barış Soner Uşaklı
edae9522b5 feat: add data to filter:categories.search 2021-12-16 09:54:09 -05:00
Barış Soner Uşaklı
7ff2b7fbb1 chore: up mentions to fix crash
https://github.com/julianlam/nodebb-plugin-mentions/issues/156
2021-12-16 09:53:11 -05:00
Misty (Bot)
22e74dc0bb chore: incrementing version number - v1.18.6 2021-11-10 20:45:24 +00:00
Misty (Bot)
27acf19325 Merge commit 'a0f0dd021b6b275d377aec83956a8fc0a0e7aa52' into v1.18.x 2021-11-10 20:45:19 +00:00
Barış Soner Uşaklı
0f29433baf Merge branch 'v1.18.x' of https://github.com/NodeBB/NodeBB into v1.18.x 2021-10-27 14:28:28 -04:00
Barış Soner Uşaklı
ebe7f11d0b merge 2021-10-27 14:25:37 -04:00
Misty (Bot)
c248805165 chore: incrementing version number - v1.18.5 2021-10-27 16:47:58 +00:00
Misty (Bot)
830cddfb40 Merge commit 'bf20965f0bd68a46de4de4e3f274a6fbffa28073' into v1.18.x 2021-10-27 16:47:54 +00:00
Barış Soner Uşaklı
abbbc3d7c2 chore: up persona 2021-10-07 09:24:44 -04:00
Misty (Bot)
8593ea87e9 chore: incrementing version number - v1.18.4 2021-10-06 17:59:38 +00:00
Misty (Bot)
1d401329ee Merge commit 'f4e62fb1cdbeade062ef3172dbdfaaedacb14925' into v1.18.x 2021-10-06 17:59:33 +00:00
Misty (Bot)
9e52236973 chore: incrementing version number - v1.18.3 2021-09-22 17:01:44 +00:00
Misty (Bot)
eff03e4b57 Merge commit '9855429445d1856a28b3f845e4bad788f5860914' into v1.18.x 2021-09-22 17:01:34 +00:00
Misty (Bot)
854c078b73 chore: incrementing version number - v1.18.2 2021-09-08 16:27:00 +00:00
Misty (Bot)
36653525bd Merge commit '507517fce5248ad37f6a239fce16ae92d0e0f5b0' into v1.18.x 2021-09-08 16:26:58 +00:00
Misty (Bot)
0409403f5b chore: incrementing version number - v1.18.1 2021-09-03 15:04:06 +00:00
Misty (Bot)
839673d321 Merge commit 'b73d8849ab768fb665271a1b3cffe8211e6083f0' into v1.18.x 2021-09-03 15:03:59 +00:00
Misty (Bot)
d220d1d461 chore: incrementing version number - v1.18.0 2021-08-25 20:29:55 +00:00
4 changed files with 7 additions and 6 deletions

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
"version": "1.18.5",
"version": "1.18.6",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
@@ -89,7 +89,7 @@
"nodebb-plugin-emoji": "^3.5.0",
"nodebb-plugin-emoji-android": "2.0.5",
"nodebb-plugin-markdown": "8.14.4",
"nodebb-plugin-mentions": "3.0.2",
"nodebb-plugin-mentions": "3.0.3",
"nodebb-plugin-spam-be-gone": "0.7.11",
"nodebb-rewards-essentials": "0.2.0",
"nodebb-theme-lavender": "5.3.1",
@@ -182,4 +182,4 @@
"url": "https://github.com/barisusakli"
}
]
}
}

View File

@@ -285,7 +285,7 @@ define('forum/topic/threadTools', [
threadEl.find('[component="post"][data-uid="' + app.user.uid + '"].deleted [component="post/tools"]').toggleClass('hidden', isLocked);
$('.topic-header [component="topic/locked"]').toggleClass('hidden', !data.isLocked);
$('[component="topic/labels"] [component="topic/locked"]').toggleClass('hidden', !data.isLocked);
$('[component="post/tools"] .dropdown-menu').html('');
ajaxify.data.locked = data.isLocked;
@@ -334,7 +334,7 @@ define('forum/topic/threadTools', [
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);
const icon = $('.topic-header [component="topic/pinned"]');
const icon = $('[component="topic/labels"] [component="topic/pinned"]');
icon.toggleClass('hidden', !data.pinned);
if (data.pinned) {
icon.translateAttr('title', (

View File

@@ -18,6 +18,7 @@ module.exports = function (Categories) {
let cids = await findCids(query, data.hardCap);
const result = await plugins.hooks.fire('filter:categories.search', {
data: data,
cids: cids,
uid: uid,
});

View File

@@ -53,10 +53,10 @@ module.exports = function (SocketCategories) {
const result = await categories.search({
uid: uid,
query: data.search,
qs: data.query,
paginate: false,
});
let matchedCids = result.categories.map(c => c.cid);
// no need to filter if all 3 states are used
const filterByWatchState = !Object.values(categories.watchStates)