Merge branch 'master' into develop

This commit is contained in:
antelle 2020-04-04 22:54:23 +02:00
commit a6a9554868
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
8 changed files with 17 additions and 7 deletions

View File

@ -24,8 +24,9 @@
script-src 'self' 'unsafe-eval';
style-src 'self' blob:;
connect-src 'self' ws: https:;
child-src blob:;
img-src 'self' data:;
child-src 'self' blob:;
worker-src 'self' blob:;
img-src 'self' data: blob: https://services.keeweb.info/;
object-src 'none';
form-action 'none';
"

View File

@ -586,7 +586,7 @@
"setHelpProblems1": "If something goes wrong, please {}",
"setHelpProblems2": "or {}",
"setHelpOpenIssue": "open an issue on GitHub",
"setHelpContactLink": "contact a developer directly",
"setHelpContactLink": "contact the developer directly",
"setHelpAppInfo": "App information",
"setHelpOtherPlatforms": "Other platforms",
"setHelpDesktopApps": "Desktop apps",

View File

@ -614,6 +614,10 @@ function coerceMainWindowPositionToConnectedDisplay() {
}
function reportStartProfile() {
if (!perfTimestamps) {
return;
}
const processCreationTime = process.getCreationTime();
const totalTime = Math.round(Date.now() - processCreationTime);
let lastTs = 0;

View File

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

View File

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

2
package-lock.json generated
View File

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

View File

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

View File

@ -1,5 +1,10 @@
Release notes
-------------
##### v1.13.1 (2020-04-04)
`-` fix #1444: fixed website favicons and attached images
`-` fix #1445: fixed offline mode in Chrome and Firefox
`-` fix #1447: fixed opening databases from Dock
##### v1.13.0 (2020-04-03)
`-` #1359: fixed Google Drive login issues in desktop apps
`+` #1341: auto-lock the app on screen lock on Windows