Merge branch 'master' into develop

app/index.html

@@ -7,7 +7,7 @@
     <meta name="kw-signature" content="">
     <meta name="kw-config" content="(no-config)">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <link rel="manifest" href="manifest.json">
+    <!--<link rel="manifest" href="manifest.json">-->
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="apple-touch-icon" sizes="180x180" href="icons/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">

desktop/app.js

@@ -1,8 +1,9 @@
 const electron = require('electron');
-const app = electron.app;
 const path = require('path');
 const fs = require('fs');
 
+const app = electron.app;
+
 let mainWindow = null;
 let appIcon = null;
 let ready = false;
@@ -42,6 +43,7 @@ app.on('window-all-closed', () => {
         app.removeAllListeners('ready');
         app.removeAllListeners('open-file');
         app.removeAllListeners('activate');
+        app.removeAllListeners('second-instance');
         electron.globalShortcut.unregisterAll();
         electron.powerMonitor.removeAllListeners('suspend');
         electron.powerMonitor.removeAllListeners('resume');
@@ -83,6 +85,11 @@ app.on('activate', () => {
 app.on('will-quit', () => {
     electron.globalShortcut.unregisterAll();
 });
+app.on('second-instance', () => {
+    if (mainWindow) {
+        restoreMainWindow();
+    }
+});
 app.restartApp = function () {
     restartPending = true;
     mainWindow.close();

desktop/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

desktop/package.json

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

helper/win32/src/KeeWebHelper/App.config

@@ -2,5 +2,5 @@
 <configuration>
     <startup> 
         
-    <supportedRuntime version="v2.0.50727" sku="Client"/></startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup>
 </configuration>

helper/win32/src/KeeWebHelper/KeeWebHelper.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>KeeWebHelper</RootNamespace>
     <AssemblyName>KeeWebHelper</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>

helper/win32/src/KeeWebHelper/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Antelle.Net")]
 [assembly: AssemblyProduct("KeeWebHelper")]
-[assembly: AssemblyCopyright("Copyright © Antelle 2017")]
+[assembly: AssemblyCopyright("Copyright © Antelle 2019")]
 [assembly: AssemblyTrademark("KeeWeb")]
 [assembly: AssemblyCulture("")]
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

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

release-notes.md

@@ -1,5 +1,10 @@
 Release notes
 -------------
+##### v1.7.3 (2019-01-13)
+`-` fixed window activation when KeeWeb is launched second time  
+`-` fix #1087: Windows AutoType helper is now using .NET Framework v4  
+`*` fix #1085: fixed dropbox in iOS PWA, removed manifest.json  
+
 ##### v1.7.2 (2019-01-07)
 `-` fixed Google Drive cookies issues  
 `-` fixed storage providers authentication