Merge branch 'release-1.6'

* release-1.6:
  bump version
  fixed white screen on startup
  fixed white screen on startup

app/scripts/plugins/plugin-gallery.js

@@ -66,10 +66,12 @@ const PluginGallery = {
     getCachedGallery() {
         const ts = this.logger.ts();
         return SettingsStore.load('plugin-gallery').then(data => {
-            return this.verifySignature(data).then(gallery => {
-                this.logger.debug(`Loaded cached plugin gallery`, this.logger.ts(ts));
-                return gallery;
-            });
+            if (data) {
+                return this.verifySignature(data).then(gallery => {
+                    this.logger.debug(`Loaded cached plugin gallery`, this.logger.ts(ts));
+                    return gallery;
+                });
+            }
         });
     },
 

desktop/app.js

@@ -22,6 +22,7 @@ let htmlPath = process.argv.filter(arg => arg.startsWith('--htmlpath=')).map(arg
 if (!htmlPath) {
     htmlPath = 'file://' + path.join(__dirname, 'index.html');
 }
+const showDevToolsOnStart = process.argv.some(arg => arg.startsWith('--devtools'));
 
 app.setPath('userData', path.join(tempUserDataPath, tempUserDataPathRand));
 
@@ -141,6 +142,9 @@ function createMainWindow() {
     });
     setMenu();
     mainWindow.loadURL(htmlPath);
+    if (showDevToolsOnStart) {
+        mainWindow.openDevTools();
+    }
     mainWindow.webContents.on('dom-ready', () => {
         setTimeout(() => {
             mainWindow.show();

desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "main.js",
   "homepage": "https://keeweb.info",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "private": true,

release-notes.md

@@ -1,5 +1,9 @@
 Release notes
 -------------
+##### v1.6.0 (2017-12-03)
+`-` fixed white screen on startup  
+`+` `--devtools` command line argument
+
 ##### v1.6.0 (2017-12-02)
 `+` desktop apps integrity protection  
 `+` auto-lock on computer lock