Merge branch 'stable'

build.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+./set-build.sh
+
 echo "Deleting dist"
 
 rm -r dist/*

public/javascripts/dialogs/settings.js

@@ -21,7 +21,7 @@ const settings = (function() {
 
         dialogEl.dialog({
             modal: true,
-            width: 600
+            width: 800
         });
 
         tabsEl.tabs();
@@ -150,3 +150,18 @@ settings.addModule((function () {
         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
+    };
+})());

routes/api/settings.js

@@ -7,6 +7,7 @@ const options = require('../../services/options');
 const audit_category = require('../../services/audit_category');
 const auth = require('../../services/auth');
 const utils = require('../../services/utils');
+const build = require('../../services/build');
 
 // options allowed to be updated directly in settings dialog
 const ALLOWED_OPTIONS = ['encryption_session_timeout', 'history_snapshot_time_interval'];
@@ -14,6 +15,8 @@ const ALLOWED_OPTIONS = ['encryption_session_timeout', 'history_snapshot_time_in
 router.get('/all', auth.checkApiAuth, async (req, res, next) => {
     const settings = await sql.getMap("SELECT opt_name, opt_value FROM options");
 
+    Object.assign(settings, build);
+
     res.send(settings);
 });
 
@@ -21,6 +24,8 @@ router.get('/', auth.checkApiAuth, async (req, res, next) => {
     const settings = await sql.getMap("SELECT opt_name, opt_value FROM options WHERE opt_name IN ("
         + ALLOWED_OPTIONS.map(x => '?').join(",") + ")", ALLOWED_OPTIONS);
 
+    Object.assign(settings, build);
+
     res.send(settings);
 });
 

services/build.js

@@ -0,0 +1 @@
+module.exports = { buildDate:"2017-11-13T23:36:03-05:00", buildRevision: "fbce84e779951056c0e8b4d5395ee2fbe426555e" };

services/sync.js

@@ -14,6 +14,7 @@ const syncUpdate = require('./sync_update');
 const SYNC_SERVER = config['Sync']['syncServerHost'];
 const isSyncSetup = !!SYNC_SERVER;
 const SYNC_TIMEOUT = config['Sync']['syncServerTimeout'] || 5000;
+const SYNC_PROXY = config['Sync']['syncProxy'];
 
 let syncInProgress = false;
 
@@ -215,14 +216,20 @@ async function syncRequest(syncContext, method, uri, body) {
     const fullUri = SYNC_SERVER + uri;
 
     try {
-        return await rp({
+        const options = {
             method: method,
             uri: fullUri,
             jar: syncContext.cookieJar,
             json: true,
             body: body,
             timeout: SYNC_TIMEOUT
-        });
+        };
+
+        if (SYNC_PROXY) {
+            options.proxy = SYNC_PROXY;
+        }
+
+        return await rp(options);
     }
     catch (e) {
         throw new Error("Request to " + method + " " + fullUri + " failed, inner exception: " + e.stack);

set-build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo 'module.exports = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > services/build.js

views/index.ejs

@@ -153,6 +153,7 @@
           <li><a href="#change-password">Change password</a></li>
           <li><a href="#encryption-timeout">Encryption timeout</a></li>
           <li><a href="#history-snapshot-time-interval">History snapshots</a></li>
+          <li><a href="#about">About Trilium</a></li>
         </ul>
         <div id="change-password">
           <form id="change-password-form">
@@ -199,6 +200,19 @@
             <button class="btn btn-sm">Save</button>
           </form>
         </div>
+        <div id="about">
+          <table class="table">
+            <tr>
+              <th>Build date:</th>
+              <td id="build-date"></td>
+            </tr>
+
+            <tr>
+              <th>Build revision:</th>
+              <td><a href="" target="_blank" id="build-revision"></a></td>
+            </tr>
+          </table>
+        </div>
       </div>
     </div>