mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
Merge branch 'stable'
This commit is contained in:
commit
aa5ede5039
@ -2,7 +2,7 @@
|
|||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"productName": "Trilium Notes",
|
"productName": "Trilium Notes",
|
||||||
"description": "Trilium Notes",
|
"description": "Trilium Notes",
|
||||||
"version": "0.37.7",
|
"version": "0.37.8",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"main": "electron.js",
|
"main": "electron.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
@ -79,7 +79,7 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
for (const appCssNoteId of window.appCssNoteIds) {
|
for (const appCssNoteId of window.appCssNoteIds) {
|
||||||
cssLoader.requireCss(`/api/notes/download/${appCssNoteId}`);
|
cssLoader.requireCss(`api/notes/download/${appCssNoteId}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/";
|
const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/";
|
||||||
|
@ -131,7 +131,7 @@ export default class ApperanceOptions {
|
|||||||
if (noteId) {
|
if (noteId) {
|
||||||
// make sure the CSS is loaded
|
// make sure the CSS is loaded
|
||||||
// if the CSS has been loaded and then updated then the changes won't take effect though
|
// if the CSS has been loaded and then updated then the changes won't take effect though
|
||||||
cssLoader.requireCss(`/api/notes/download/${noteId}`);
|
cssLoader.requireCss(`api/notes/download/${noteId}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$body.addClass("theme-" + newTheme);
|
this.$body.addClass("theme-" + newTheme);
|
||||||
|
@ -1 +1 @@
|
|||||||
module.exports = { buildDate:"2019-12-02T23:09:42+01:00", buildRevision: "6ba3e5ab7f866ac93ecbb48883dabf61723cde98" };
|
module.exports = { buildDate:"2019-12-03T22:31:20+01:00", buildRevision: "b0310e34e2c6f023cc8190310ff63d840157f6cc" };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user