Merge branch 'stable'

package-lock.json

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

src/routes/api/recent_changes.js

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

src/services/content_hash.js

@@ -56,6 +56,8 @@ async function checkContentHashes(otherHashes) {
         if (hashes[key] !== otherHashes[key]) {
             allChecksPassed = false;
 
+            log.info(`Content hash check for ${key} FAILED. Local is ${hashes[key]}, remote is ${otherHashes[key]}`);
+
             if (key !== 'recent_notes') {
                 // 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'});