From 9865bdd032870cf13aacb842286c82a0f1599590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 3 Dec 2016 12:14:47 +0100 Subject: [PATCH 1/3] Don't show TLS warning in cordova --- js/glowingbear.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/glowingbear.js b/js/glowingbear.js index 36b42fe..56fed48 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -107,7 +107,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', // except for local instances (testing or electron) $scope.show_tls_warning = (window.location.protocol !== "https:") && (["localhost", "127.0.0.1", "::1"].indexOf(window.location.hostname) === -1) && - !window.is_electron; + !window.is_electron && (cordova === null); if (window.is_electron) { // Use packaged emojione sprite in the electron app From 58de8546f8f0edabb88978355400fff05caf8165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 3 Dec 2016 12:34:29 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Angular=201.5.8=20=E2=86=92=201.5.9=20secur?= =?UTF-8?q?ity=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index c21e954..5670915 100644 --- a/index.html +++ b/index.html @@ -19,10 +19,10 @@ - - - - + + + + From dbd626b69c04f8d9edad9aaaca9aa539c2b1b594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 3 Dec 2016 12:39:24 +0100 Subject: [PATCH 3/3] Increment version number --- bower.json | 2 +- index.html | 2 +- manifest.json | 2 +- manifest.webapp | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 505303d..06d8ae5 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "glowing-bear", "description": "A webclient for WeeChat", - "version": "0.6.0", + "version": "0.7.0", "homepage": "https://github.com/glowing-bear/glowing-bear", "license": "GPLv3", "private": true, diff --git a/index.html b/index.html index 5670915..54264bd 100644 --- a/index.html +++ b/index.html @@ -341,7 +341,7 @@ npm run build-electron-{windows, darwin, linux}
- Glowing Bear version 0.6.1-dev + Glowing Bear version 0.7.0

Settings

Settings will be stored in your browser.

diff --git a/manifest.json b/manifest.json index 437ce9d..98f4f2d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Glowing Bear", "description": "WeeChat Web frontend", - "version": "0.6.0", + "version": "0.7.0", "manifest_version": 2, "icons": { "32": "assets/img/favicon.png", diff --git a/manifest.webapp b/manifest.webapp index eb8cdcd..d324eda 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -25,5 +25,5 @@ "desktop-notification":{} }, "default_locale": "en", - "version": "0.6.0" + "version": "0.7.0" } diff --git a/package.json b/package.json index 7658fd6..7cbe0ca 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "glowing-bear", "private": true, - "version": "0.6.0", + "version": "0.7.0", "description": "A web client for Weechat", "repository": "https://github.com/glowing-bear/glowing-bear", "main": "electron-main.js",