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 remote-tracking branch 'origin/master' into m42

Browse Source 
# Conflicts:
#	src/public/app/services/app_context.js
This commit is contained in:
zadam
2020-04-25 23:53:19 +02:00
parent 75c58cbf79 d1eacbb574
commit aff12950f0
10 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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