Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 09:45:52 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into next58

Browse Source 
# Conflicts:
#	package-lock.json
This commit is contained in:
zadam
2022-12-03 13:01:03 +01:00
parent 0e68e8069b 46fdd15857
commit 99a5774148
10 changed files with 224 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/api/login.js
View File

@@ -26,7 +26,7 @@ function loginSync(req) {
// login token is valid for 5 minutes
if (Math.abs(timestamp.getTime() - now.getTime()) > 5 * 60 * 1000) {
return [401, { message: 'Auth request time is out of sync, please check that both client and server have correct time.' }];
return [401, { message: 'Auth request time is out of sync, please check that both client and server have correct time. The difference between clocks has to be smaller than 5 minutes.' }];
}
const syncVersion = req.body.syncVersion;