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

Merge branch 'develop'

This commit is contained in:
Antelle 2015-11-22 15:04:03 +03:00
parent 66c90e3466 8f906541a0
commit 58d0def939
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scripts/comp/transport.js
View File

@ -46,6 +46,13 @@ var Transport = {
config.success(data);
});
}
} else if (res.headers.location && [301, 302].indexOf(res.statusCode) >= 0) {
if (config.noRedirect) {
return config.error('Too many redirects');
}
config.url = res.headers.location;
config.noRedirect = true;
Transport.httpGet(config);
} else {
config.error('HTTP status ' + res.statusCode);
}

2
electron/package.json
View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "0.4.1",
"version": "0.4.2",
"description": "KeePass web app",
"main": "main.js",
"repository": "https://github.com/antelle/keeweb",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "0.4.1",
"version": "0.4.2",
"description": "KeePass web app",
"main": "Gruntfile.js",
"repository": "https://github.com/antelle/keeweb",