sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

pull/255/head
zadam 2023-04-24 20:21:22 +07:00
parent a6eda2479f eff567ee48
commit 0896000fcd
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
Unescape Escape View File

@ -1,12 +1,12 @@
{
"name": "trilium",
"version": "0.59.3",
"version": "0.59.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "trilium",
"version": "0.59.3",
"version": "0.59.4",
"hasInstallScript": true,
"license": "AGPL-3.0-only",
"dependencies": {

6
src/public/app/widgets/note_tree.js
Unescape Escape View File

@ -834,11 +834,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
await this.filterHoistedBranch();
const activeNode = await this.getNodeFromPath(appContext.tabManager.getActiveContextNotePath());
if (activeNode) {
activeNode.setActive({noEvents: true, noFocus: false});
}
// don't activate the active note, see discussion in https://github.com/zadam/trilium/issues/3664
}
async expandTree(node = null) {

2
src/routes/login.js
Unescape Escape View File

@ -76,7 +76,7 @@ function login(req, res) {
// note that logged IP address is usually meaningless since the traffic should come from a reverse proxy
log.info(`WARNING: Wrong password from ${req.ip}, rejecting.`);
res.render('login', {
res.status(401).render('login', {
failedAuth: true,
assetPath: assetPath
});