gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 03:29:02 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
zadam 2019-11-19 19:32:49 +01:00
commit 0ae9c8da17
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.36.5", "version": "0.37.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

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

@ -18,7 +18,7 @@ async function getRecentChanges() {
note_revisions note_revisions
JOIN notes USING(noteId) JOIN notes USING(noteId)
ORDER BY ORDER BY
utcDateCreated DESC note_revisions.utcDateCreated DESC
LIMIT 1000 LIMIT 1000
) )
UNION ALL SELECT * FROM ( UNION ALL SELECT * FROM (

2
src/services/content_hash.js
View File

@ -56,6 +56,8 @@ async function checkContentHashes(otherHashes) {
if (hashes[key] !== otherHashes[key]) { if (hashes[key] !== otherHashes[key]) {
allChecksPassed = false; allChecksPassed = false;
log.info(`Content hash check for ${key} FAILED. Local is ${hashes[key]}, remote is ${otherHashes[key]}`);
if (key !== 'recent_notes') { if (key !== 'recent_notes') {
// let's not get alarmed about recent notes which get updated often and can cause failures in race conditions // let's not get alarmed about recent notes which get updated often and can cause failures in race conditions
ws.sendMessageToAllClients({type: 'sync-hash-check-failed'}); ws.sendMessageToAllClients({type: 'sync-hash-check-failed'});