Merge branch 'master' into 'stable'

v1.1.2

See merge request openflexure/openflexure-microscope-jsclient!39

app/app.js

@@ -12,11 +12,6 @@ const { store } = require('./store')
 // Auto upadater 
 autoUpdater.autoDownload = false;
 
-autoUpdater.setFeedURL({
-    provider: "generic",
-    url: "https://gitlab.com/openflexure/openflexure-microscope-jsclient/-/jobs/artifacts/stable/raw?job=package"
-});
-
 autoUpdater.on('checking-for-update', function () {});
 
 autoUpdater.on('update-available', function (info) {

app/builder-config-base.yaml

@@ -6,7 +6,7 @@ artifactName: ${name}-${os}-${arch}.${ext}
 asar: true
 publish:
   - provider: generic
-    url: https://gitlab.com
+    url: https://build.openflexure.org/openflexure-ev/
 files:
   - filter:
       - '**/*'

app/store.js

@@ -3,7 +3,7 @@ const store = new Store();
 
 if (store.has('drawCustomTitleBar') !== true) {
   // Default to false if on MacOS, otherwise true
-  store.set('drawCustomTitleBar', (process.platform !== 'darwin') ? true : false)
+  store.set('drawCustomTitleBar', (process.platform === 'win32') ? true : false)
 }
 
 module.exports.store = store

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflexure-ev",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "description": "An electron-based user client for the OpenFlexure Microscope Server",
   "author": "OpenFlexure <contact@openflexure.org> (https://www.openflexure.org)",
@@ -36,7 +36,7 @@
     "axios": "^0.18.0",
     "css-loader": "^2.1.1",
     "electron": "^4.1.4",
-    "electron-builder": "^21.0.1",
+    "electron-builder": "^21.2.0",
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
     "uikit": "^3.1.1",