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

Merge branch 'master' into develop

This commit is contained in:
antelle 2016-09-21 00:10:53 +03:00
parent 7876d32237 52701af6d6
commit 7ba47860cc
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/models/app-model.js
View File

@ -360,17 +360,17 @@ var AppModel = Backbone.Model.extend({
} else if (!params.storage) {
logger.info('Open file from cache as main storage');
this.openFileFromCache(params, callback, fileInfo);
} else if (fileInfo && fileInfo.openDate && fileInfo.get('rev') === params.rev && fileInfo.get('storage') !== 'file') {
} else if (fileInfo && fileInfo.get('openDate') && fileInfo.get('rev') === params.rev && fileInfo.get('storage') !== 'file') {
logger.info('Open file from cache because it is latest');
this.openFileFromCache(params, callback, fileInfo);
} else if (!fileInfo || !fileInfo.openDate || params.storage === 'file') {
} else if (!fileInfo || !fileInfo.get('openDate') || params.storage === 'file') {
logger.info('Open file from storage', params.storage);
var storage = Storage[params.storage];
var storageLoad = () => {
logger.info('Load from storage');
storage.load(params.path, params.opts, (err, data, stat) => {
if (err) {
if (fileInfo && fileInfo.openDate) {
if (fileInfo && fileInfo.get('openDate')) {
logger.info('Open file from cache because of storage load error', err);
this.openFileFromCache(params, callback, fileInfo);
} else {

2
app/scripts/views/settings/settings-file-view.js
View File

@ -180,7 +180,7 @@ var SettingsFileView = Backbone.View.extend({
if (Launcher) {
Launcher.getSaveFileName(fileName, path => {
if (path) {
Storage.file.save(path, data, err => {
Storage.file.save(path, null, data, err => {
if (err) {
Alerts.error({
header: Locale.setFileSaveError,

2
electron/package.json
View File

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

2
package.json
View File

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

7
release-notes.md
View File

@ -1,10 +1,15 @@
Release notes
-------------
##### v1.4.0 (WIP)
`+` allow password copy on mobile Safari
`+` password generator usability improvements
`+` warning about several tabs
##### v1.3.3 (2016-09-20)
`+` translations: fr, pl, pt
`-` fix #368: desktop file save error
`-` fix #369: removed additional webdav request
`+` allow password copy on mobile Safari
##### v1.3.2 (2016-09-13)
`-` fix #342: url detection in Microsoft Edge
`-` fix #351: error alert on power shutdown