gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into redesign

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
zadam 2021-06-29 20:55:58 +02:00
commit b9ff481eb7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -2,7 +2,7 @@
"name": "trilium",
"productName": "Trilium Notes",
"description": "Trilium Notes",
"version": "0.47.4",
"version": "0.47.5",
"license": "AGPL-3.0-only",
"main": "electron.js",
"bin": {

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2021-06-02T21:44:19+02:00", buildRevision: "f50bb2278caaea077b2273356808c173e8548ded" };
module.exports = { buildDate:"2021-06-25T21:26:48+02:00", buildRevision: "0a2807c0b3fb7809d1cd1be3a051d127db010b5e" };

2
src/services/search/value_extractor.js
View File

@ -114,7 +114,7 @@ class ValueExtractor {
cursor = cursor.children[0];
}
else if (cur() === 'random') {
return Math.random();
return Math.random().toString(); // string is expected for comparison
}
else if (cur() in PROP_MAPPING) {
return cursor[PROP_MAPPING[cur()]];