Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-23 08:50:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2024-12-25 09:03:53 -05:00
parent 40257663a8 25655d5a5f
commit 9190721865
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -99,7 +99,7 @@
"multiparty": "4.2.3", "multiparty": "4.2.3",
"nconf": "0.12.1", "nconf": "0.12.1",
"nodebb-plugin-2factor": "7.5.7", "nodebb-plugin-2factor": "7.5.7",
"nodebb-plugin-composer-default": "10.2.43", "nodebb-plugin-composer-default": "10.2.44",
"nodebb-plugin-dbsearch": "6.2.5", "nodebb-plugin-dbsearch": "6.2.5",
"nodebb-plugin-emoji": "6.0.1", "nodebb-plugin-emoji": "6.0.1",
"nodebb-plugin-emoji-android": "4.1.1", "nodebb-plugin-emoji-android": "4.1.1",

1
public/language/en-GB/aria.json
View File

@@ -2,6 +2,7 @@
"post-sort-option": "Post sort option, %1", "post-sort-option": "Post sort option, %1",
"topic-sort-option": "Topic sort option, %1", "topic-sort-option": "Topic sort option, %1",
"user-avatar-for": "User avatar for %1", "user-avatar-for": "User avatar for %1",
"profile-page-for": "Profile page for user %1",
"user-watched-tags": "User watched tags", "user-watched-tags": "User watched tags",
"delete-upload-button": "Delete upload button", "delete-upload-button": "Delete upload button",
"group-page-link-for": "Group page link for %1" "group-page-link-for": "Group page link for %1"

2
public/src/modules/helpers.common.js
View File

@@ -306,7 +306,7 @@ module.exports = function (utils, Benchpress, relative_path) {
} }
classNames = classNames || ''; classNames = classNames || '';
const attributes = new Map([ const attributes = new Map([
['title', userObj.username], ['title', userObj.displayname],
['data-uid', userObj.uid], ['data-uid', userObj.uid],
['class', `avatar ${classNames}${rounded ? ' avatar-rounded' : ''}`], ['class', `avatar ${classNames}${rounded ? ' avatar-rounded' : ''}`],
]); ]);

4
src/middleware/user.js
View File

@@ -254,8 +254,12 @@ module.exports = function (middleware) {
if (res.locals.isAPI) { if (res.locals.isAPI) {
req.params.userslug = lowercaseSlug; req.params.userslug = lowercaseSlug;
} else { } else {
try {
const newPath = req.path.replace(new RegExp(`/${req.params.userslug}`), () => `/${lowercaseSlug}`); const newPath = req.path.replace(new RegExp(`/${req.params.userslug}`), () => `/${lowercaseSlug}`);
return res.redirect(`${nconf.get('relative_path')}${newPath}`); return res.redirect(`${nconf.get('relative_path')}${newPath}`);
} catch (err) {
next(err);
}
} }
} }

6
src/views/admin/dashboard.tpl
View File

@@ -140,12 +140,12 @@
<div class="card"> <div class="card">
<div class="card-header d-flex justify-content-between">[[admin/dashboard:popular-searches]] <a href="{config.relative_path}/admin/dashboard/searches" class="text-xs">[[admin/dashboard:view-all]]</a></div> <div class="card-header d-flex justify-content-between">[[admin/dashboard:popular-searches]] <a href="{config.relative_path}/admin/dashboard/searches" class="text-xs">[[admin/dashboard:view-all]]</a></div>
<div class="card-body"> <div class="card-body">
<table class="table table-sm text-sm search-list"> <table class="table table-sm text-sm search-list w-100">
<tbody> <tbody>
{{{ each popularSearches }}} {{{ each popularSearches }}}
<tr> <tr>
<td>{popularSearches.value}</td> <td class="w-100 text-truncate" style="max-width:1px;">{popularSearches.value}</td>
<td class="text-end" style="width: 1px;">{formattedNumber(popularSearches.score)}</td> <td class="w-0 text-end text-nowrap">{formattedNumber(popularSearches.score)}</td>
</tr> </tr>
{{{ end }}} {{{ end }}}
</tbody> </tbody>