mirror of https://github.com/keeweb/keeweb.git
Merge branch 'release-1.12'
This commit is contained in:
commit
9b07bbd505
|
@ -248,12 +248,6 @@ const Launcher = {
|
||||||
|
|
||||||
window.cordova.exec(onFileSelected, callback, 'FileChooser', 'choose');
|
window.cordova.exec(onFileSelected, callback, 'FileChooser', 'choose');
|
||||||
},
|
},
|
||||||
getCookies(callback) {
|
|
||||||
// TODO
|
|
||||||
},
|
|
||||||
setCookies(cookies) {
|
|
||||||
// TODO
|
|
||||||
},
|
|
||||||
|
|
||||||
fingerprints: {
|
fingerprints: {
|
||||||
config: {
|
config: {
|
||||||
|
|
|
@ -38,14 +38,13 @@ const Launcher = {
|
||||||
const homePath = this.remReq('electron').app.getPath('userDesktop');
|
const homePath = this.remReq('electron').app.getPath('userDesktop');
|
||||||
defaultPath = this.joinPath(homePath, defaultPath);
|
defaultPath = this.joinPath(homePath, defaultPath);
|
||||||
}
|
}
|
||||||
this.remReq('electron').dialog.showSaveDialog(
|
this.remReq('electron')
|
||||||
{
|
.dialog.showSaveDialog({
|
||||||
title: Locale.launcherSave,
|
title: Locale.launcherSave,
|
||||||
defaultPath,
|
defaultPath,
|
||||||
filters: [{ name: Locale.launcherFileFilter, extensions: ['kdbx'] }]
|
filters: [{ name: Locale.launcherFileFilter, extensions: ['kdbx'] }]
|
||||||
},
|
})
|
||||||
callback
|
.then(res => callback(res.filePath));
|
||||||
);
|
|
||||||
},
|
},
|
||||||
getUserDataPath(fileName) {
|
getUserDataPath(fileName) {
|
||||||
if (!this.userDataPath) {
|
if (!this.userDataPath) {
|
||||||
|
@ -271,17 +270,6 @@ const Launcher = {
|
||||||
});
|
});
|
||||||
return ps;
|
return ps;
|
||||||
},
|
},
|
||||||
getCookies(callback) {
|
|
||||||
this.electron().remote.session.defaultSession.cookies.get({}, callback);
|
|
||||||
},
|
|
||||||
setCookies(cookies) {
|
|
||||||
if (cookies && cookies.length) {
|
|
||||||
const session = this.electron().remote.session.defaultSession;
|
|
||||||
for (const cookie of cookies) {
|
|
||||||
session.cookies.set(cookie, noop);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
checkOpenFiles() {
|
checkOpenFiles() {
|
||||||
this.readyToOpenFiles = true;
|
this.readyToOpenFiles = true;
|
||||||
if (this.pendingFileToOpen) {
|
if (this.pendingFileToOpen) {
|
||||||
|
|
|
@ -64,6 +64,7 @@
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -2px;
|
top: -2px;
|
||||||
|
min-width: 0;
|
||||||
@include mobile {
|
@include mobile {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
|
@ -363,6 +363,8 @@ function setMenu() {
|
||||||
electron.Menu.setApplicationMenu(menu);
|
electron.Menu.setApplicationMenu(menu);
|
||||||
} else {
|
} else {
|
||||||
mainWindow.setMenuBarVisibility(false);
|
mainWindow.setMenuBarVisibility(false);
|
||||||
|
mainWindow.setMenu(null);
|
||||||
|
electron.Menu.setApplicationMenu(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "KeeWeb",
|
"name": "KeeWeb",
|
||||||
"version": "1.12.2",
|
"version": "1.12.3",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "KeeWeb",
|
"name": "KeeWeb",
|
||||||
"version": "1.12.2",
|
"version": "1.12.3",
|
||||||
"description": "Free cross-platform password manager compatible with KeePass",
|
"description": "Free cross-platform password manager compatible with KeePass",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"homepage": "https://keeweb.info",
|
"homepage": "https://keeweb.info",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "keeweb",
|
"name": "keeweb",
|
||||||
"version": "1.12.2",
|
"version": "1.12.3",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "keeweb",
|
"name": "keeweb",
|
||||||
"version": "1.12.2",
|
"version": "1.12.3",
|
||||||
"description": "Free cross-platform password manager compatible with KeePass",
|
"description": "Free cross-platform password manager compatible with KeePass",
|
||||||
"main": "Gruntfile.js",
|
"main": "Gruntfile.js",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
Release notes
|
Release notes
|
||||||
-------------
|
-------------
|
||||||
|
##### v1.12.3 (2019-11-06)
|
||||||
|
`-` fix #1335: removed the menubar on Windows and Linux
|
||||||
|
`-` fix #1334: saving new files not working
|
||||||
|
`-` fixed entry title input size
|
||||||
|
|
||||||
##### v1.12.2 (2019-11-03)
|
##### v1.12.2 (2019-11-03)
|
||||||
`-` fixed non-working updater
|
`-` fixed non-working updater
|
||||||
`-` fix #1336: saving disabled storage option
|
`-` fix #1336: saving disabled storage option
|
||||||
|
|
Loading…
Reference in New Issue