Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
zadam
2023-04-24 20:21:22 +02:00
parent a6eda2479f eff567ee48
commit 0896000fcd
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

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

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

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

2
src/routes/login.js
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 // 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.`); log.info(`WARNING: Wrong password from ${req.ip}, rejecting.`);
res.render('login', { res.status(401).render('login', {
failedAuth: true, failedAuth: true,
assetPath: assetPath assetPath: assetPath
}); });