mirror of https://github.com/keeweb/keeweb.git
Merge branch 'release-1.6'
* release-1.6: bump version fixed white screen on startup fixed white screen on startup
This commit is contained in:
commit
09b1c60cc7
|
@ -66,10 +66,12 @@ const PluginGallery = {
|
||||||
getCachedGallery() {
|
getCachedGallery() {
|
||||||
const ts = this.logger.ts();
|
const ts = this.logger.ts();
|
||||||
return SettingsStore.load('plugin-gallery').then(data => {
|
return SettingsStore.load('plugin-gallery').then(data => {
|
||||||
return this.verifySignature(data).then(gallery => {
|
if (data) {
|
||||||
this.logger.debug(`Loaded cached plugin gallery`, this.logger.ts(ts));
|
return this.verifySignature(data).then(gallery => {
|
||||||
return gallery;
|
this.logger.debug(`Loaded cached plugin gallery`, this.logger.ts(ts));
|
||||||
});
|
return gallery;
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ let htmlPath = process.argv.filter(arg => arg.startsWith('--htmlpath=')).map(arg
|
||||||
if (!htmlPath) {
|
if (!htmlPath) {
|
||||||
htmlPath = 'file://' + path.join(__dirname, 'index.html');
|
htmlPath = 'file://' + path.join(__dirname, 'index.html');
|
||||||
}
|
}
|
||||||
|
const showDevToolsOnStart = process.argv.some(arg => arg.startsWith('--devtools'));
|
||||||
|
|
||||||
app.setPath('userData', path.join(tempUserDataPath, tempUserDataPathRand));
|
app.setPath('userData', path.join(tempUserDataPath, tempUserDataPathRand));
|
||||||
|
|
||||||
|
@ -141,6 +142,9 @@ function createMainWindow() {
|
||||||
});
|
});
|
||||||
setMenu();
|
setMenu();
|
||||||
mainWindow.loadURL(htmlPath);
|
mainWindow.loadURL(htmlPath);
|
||||||
|
if (showDevToolsOnStart) {
|
||||||
|
mainWindow.openDevTools();
|
||||||
|
}
|
||||||
mainWindow.webContents.on('dom-ready', () => {
|
mainWindow.webContents.on('dom-ready', () => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
mainWindow.show();
|
mainWindow.show();
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "KeeWeb",
|
"name": "KeeWeb",
|
||||||
"version": "1.6.0",
|
"version": "1.6.1",
|
||||||
"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.6.0",
|
"version": "1.6.1",
|
||||||
"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,9 @@
|
||||||
Release notes
|
Release notes
|
||||||
-------------
|
-------------
|
||||||
|
##### v1.6.0 (2017-12-03)
|
||||||
|
`-` fixed white screen on startup
|
||||||
|
`+` `--devtools` command line argument
|
||||||
|
|
||||||
##### v1.6.0 (2017-12-02)
|
##### v1.6.0 (2017-12-02)
|
||||||
`+` desktop apps integrity protection
|
`+` desktop apps integrity protection
|
||||||
`+` auto-lock on computer lock
|
`+` auto-lock on computer lock
|
||||||
|
|
Loading…
Reference in New Issue