From 20f4a45adfa611aaa5ec6367bb430f1b82815a77 Mon Sep 17 00:00:00 2001 From: Tommy-Carlos Williams Date: Sat, 19 Sep 2015 08:30:57 +1000 Subject: [PATCH 1/3] Finally fixes #142 --- src/views/MenuView.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/MenuView.js b/src/views/MenuView.js index e634989..00caea6 100644 --- a/src/views/MenuView.js +++ b/src/views/MenuView.js @@ -32,6 +32,9 @@ event.preventDefault(); this.dismiss(); window.sessionStorage.clear(); + if (window.app.logoutInterval) { + window.clearInterval(window.app.logoutInterval); + } window.app.accountModel.logout(function() { window.app.accountModel = new window.app.AccountModel(); window.app.loginView.disable(); From 638ddaee99e5a28455f4c9023254d8f31ebae1a5 Mon Sep 17 00:00:00 2001 From: Tommy-Carlos Williams Date: Sat, 19 Sep 2015 08:31:49 +1000 Subject: [PATCH 2/3] Bump to 1.2.1 --- config.xml | 2 +- package.json | 2 +- www/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.xml b/config.xml index 95b938b..4517803 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Encryptr A zero-knowledge, cloud-based e-wallet / password manager powered by Crypton. diff --git a/package.json b/package.json index a9233aa..1d058e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Encryptr", - "version": "1.2.0", + "version": "1.2.1", "repository": "https://github.com/devgeeks/Encryptr.git", "main": "www/js/Encryptr.js", "scripts": { diff --git a/www/package.json b/www/package.json index 715579a..6e14686 100644 --- a/www/package.json +++ b/www/package.json @@ -1,6 +1,6 @@ { "name": "Encryptr", - "version": "1.2.0", + "version": "1.2.1", "description": "", "main": "index.html", "scripts": { From ef5ebfb7e88f9aec4b8c2326a9d0ef98209d50b6 Mon Sep 17 00:00:00 2001 From: Tommy-Carlos Williams Date: Sat, 19 Sep 2015 08:32:23 +1000 Subject: [PATCH 3/3] Better CSP --- www/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/index.html b/www/index.html index 0abdaa4..8371907 100644 --- a/www/index.html +++ b/www/index.html @@ -9,7 +9,7 @@ - + Encryptr