Merge branch 'master' into t35

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.33.7",
+  "version": "0.34.0-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

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

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2019-07-11T20:55:56+02:00", buildRevision: "a76dcb44ae1c1cef58b9a66041b183893745a944" };
+module.exports = { buildDate:"2019-07-21T21:57:35+02:00", buildRevision: "6d5f8e056263dbaaf3abf2d532a4fd1059745b58" };

src/services/request.js

@@ -98,6 +98,11 @@ function getClient(opts) {
         return require('electron').net;
     }
     else {
+        // hack for cases where electron.net does not work but we don't want to set proxy
+        if (opts.proxy === 'noproxy') {
+            opts.proxy = null;
+        }
+
         // in case there's explicit proxy then we need to use protocol of the proxy since we're actually
         // connecting to the proxy server and not to the end-target server
         const {protocol} = url.parse(opts.proxy || opts.url);