mirrors
/
keeweb
mirror of https://github.com/keeweb/keeweb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop 

# Conflicts:
#	release-notes.md
pull/1777/head
antelle 2021-03-19 18:57:01 +01:00
parent 78642f1c9b f8a85af859
commit a923f28a8d
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/comp/launcher/launcher-electron.js
View File

@ -202,7 +202,7 @@ const Launcher = {
}
},
quitOnRealQuitEventIfMinimizeOnQuitIsEnabled() {
return this.platform() === 'darwin';
return !!(this.platform() === 'darwin' || this.pendingUpdateFile);
},
minimizeApp() {
this.remoteApp().minimizeApp({

2
desktop/package.json
View File

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

16
package-lock.json generated
View File

@ -1,11 +1,11 @@
{
"name": "keeweb",
"version": "1.17.3",
"version": "1.17.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"version": "1.17.2",
"version": "1.17.3",
"license": "MIT",
"dependencies": {
"@babel/core": "^7.13.8",
@ -14,7 +14,7 @@
"@babel/plugin-proposal-optional-chaining": "^7.13.8",
"@babel/preset-env": "^7.13.9",
"@fortawesome/fontawesome-free": "^5.15.2",
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.3/keeweb-native-modules.tgz",
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.4/keeweb-native-modules.tgz",
"adm-zip": "^0.5.3",
"argon2-browser": "1.15.3",
"autoprefixer": "^10.2.5",
@ -1468,9 +1468,9 @@
}
},
"node_modules/@keeweb/keeweb-native-modules": {
"version": "0.10.3",
"resolved": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.3/keeweb-native-modules.tgz",
"integrity": "sha512-jOhO3YzWPJouCWJ+lE4j/s0+Dkp/yMF8NS9Kn3b8tSV0M4fOGSKumrd8R5gqeToLCZgzA8GNZcjfbRNjeItojA==",
"version": "0.10.4",
"resolved": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.4/keeweb-native-modules.tgz",
"integrity": "sha512-tquZZIBLci2Yz+CKYoylFC8wUDuCrjRBuhVvstaesN0I8F0jY9IW7a9k7i5v8Dzrzhde7ELPwanXGtVQMt398Q==",
"license": "MIT"
},
"node_modules/@malept/cross-spawn-promise": {
@ -22476,8 +22476,8 @@
}
},
"@keeweb/keeweb-native-modules": {
"version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.3/keeweb-native-modules.tgz",
"integrity": "sha512-jOhO3YzWPJouCWJ+lE4j/s0+Dkp/yMF8NS9Kn3b8tSV0M4fOGSKumrd8R5gqeToLCZgzA8GNZcjfbRNjeItojA=="
"version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.4/keeweb-native-modules.tgz",
"integrity": "sha512-tquZZIBLci2Yz+CKYoylFC8wUDuCrjRBuhVvstaesN0I8F0jY9IW7a9k7i5v8Dzrzhde7ELPwanXGtVQMt398Q=="
},
"@malept/cross-spawn-promise": {
"version": "1.1.1",

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.17.3",
"version": "1.17.4",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"private": true,
@ -16,7 +16,7 @@
"@babel/plugin-proposal-optional-chaining": "^7.13.8",
"@babel/preset-env": "^7.13.9",
"@fortawesome/fontawesome-free": "^5.15.2",
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.3/keeweb-native-modules.tgz",
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.10.4/keeweb-native-modules.tgz",
"adm-zip": "^0.5.3",
"argon2-browser": "1.15.3",
"autoprefixer": "^10.2.5",

4
release-notes.md
View File

@ -4,6 +4,10 @@ Release notes
`-` legacy auto-type removed
`+` opening XML and CSV files using the Open button
##### v1.17.4 (2021-03-18)
`-` fix #1740: Windows updater issues
`-` fix #1749: auto-type freezes on macOS
##### v1.17.3 (2021-03-14)
`-` fix #1747: white screen in old Safari