mirror of
https://github.com/zadam/trilium.git
synced 2025-01-23 15:41:50 +08:00
Merge branch 'stable'
This commit is contained in:
commit
0896000fcd
3 changed files with 4 additions and 8 deletions
4
package-lock.json
generated
4
package-lock.json
generated
|
@ -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": {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue