Merge branch 'stable'

2025-12-21 23:59:59 +01:00 · 2017-11-13 23:42:23 -05:00
parent 50b789fc39 82614c1c73
commit c18799b938
7 changed files with 50 additions and 3 deletions
--- a/public/javascripts/dialogs/settings.js
+++ b/public/javascripts/dialogs/settings.js
@@ -21,7 +21,7 @@ const settings = (function() {

        dialogEl.dialog({
            modal: true,
-            width: 600
+            width: 800
        });

        tabsEl.tabs();
@@ -146,6 +146,21 @@ settings.addModule((function () {
        return false;
    });

+    return {
+        settingsLoaded
+    };
+})());
+
+settings.addModule((function () {
+    const buildDateEl = $("#build-date");
+    const buildRevisionEl = $("#build-revision");
+
+    function settingsLoaded(settings) {
+        buildDateEl.html(settings['buildDate']);
+        buildRevisionEl.html(settings['buildRevision']);
+        buildRevisionEl.attr('href', 'https://github.com/zadam/trilium/commit/' + settings['buildRevision']);
+    }
+
    return {
        settingsLoaded
    };