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

more fine grained handling of conflicts without having to reload whole page most of the time

Browse Source
This commit is contained in:
azivner
2017-11-01 22:36:26 -04:00
parent 962c078bbc
commit 1cf247f164
7 changed files with 172 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routes/api/tree.js
View File

@@ -49,7 +49,7 @@ router.get('/', auth.checkApiAuth, async (req, res, next) => {
'encrypted_data_key': await sql.getOption('encrypted_data_key'),
'encryption_session_timeout': await sql.getOption('encryption_session_timeout'),
'browser_id': utils.randomString(12),
'full_load_time': utils.nowTimestamp()
'tree_load_time': utils.nowTimestamp()
});
});