diff --git a/.travis.yml b/.travis.yml
index 0ca1f3df..1b53baa1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
sudo: required
language: node_js
+dist: trusty
node_js:
- "8"
diff --git a/app/package.json b/app/package.json
index 062637f0..fc94570c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
{
"name": "Rambox",
"productName": "Rambox",
- "version": "0.5.16",
+ "version": "0.5.17",
"description": "Rambox",
"main": "electron/main.js",
"private": true,
@@ -30,14 +30,14 @@
"license": "GPL-3.0",
"dependencies": {
"@exponent/electron-cookies": "2.0.0",
- "auth0-js": "^8.10.1",
+ "auth0-js": "^8.12.3",
"auth0-lock": "^10.22.0",
"auto-launch-patched": "5.0.2",
"electron-config": "0.2.1",
+ "electron-context-menu": "0.9.1",
"electron-is-dev": "^0.3.0",
"mime": "^1.4.0",
"rimraf": "2.6.1",
- "tmp": "0.0.28",
- "electron-context-menu": "0.9.1"
+ "tmp": "0.0.28"
}
}
diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js
index a2edb3dd..a9fb0405 100644
--- a/app/store/ServicesList.js
+++ b/app/store/ServicesList.js
@@ -771,6 +771,15 @@ Ext.define('Rambox.store.ServicesList', {
,type: 'messaging'
,js_unread: 'function remove(e){var r=document.getElementById(e);return r.parentNode.removeChild(r)}remove("pagelet_bluebar"),remove("pages_manager_top_bar_container");'
},
+ {
+ id: 'messengerbusiness'
+ ,logo: 'messengerpages.png'
+ ,name: 'Messenger for Business'
+ ,description: 'Messenger can help facilitate communication with your customers.'
+ ,url: 'https://business.facebook.com/___/inbox/'
+ ,type: 'messaging'
+ ,js_unread: 'function remove(e){var r=document.getElementById(e);return r.parentNode.removeChild(r)}remove("pagelet_bluebar"),remove("pages_manager_top_bar_container");'
+ },
{
id: 'vk'
,logo: 'vk.png'
diff --git a/app/view/main/Main.js b/app/view/main/Main.js
index 1b0f1e34..34d9d1c3 100644
--- a/app/view/main/Main.js
+++ b/app/view/main/Main.js
@@ -25,6 +25,15 @@ Ext.define('Rambox.view.main.Main', {
,autoRender: true
,autoShow: true
,deferredRender: false
+ ,tabBar: {
+ items: [{
+ xtype: 'button'
+ ,html: ''
+ ,baseCls: ''
+ ,tooltip: locale['app.main[25]']
+ ,href: 'https://fundraiseup.com/widget/FUNSGXPIJWQ/donate?key=KPCFEZKZ'
+ }]
+ }
,items: [
{
icon: 'resources/IconTray@2x.png'
@@ -329,7 +338,7 @@ Ext.define('Rambox.view.main.Main', {
,{
text: locale['app.main[25]']
,glyph: 'xf21e@FontAwesome'
- ,handler: 'showDonate'
+ ,href: 'https://fundraiseup.com/widget/FUNSGXPIJWQ/donate?key=KPCFEZKZ'
}
,{
text: 'Translation'
diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js
index 59ab47d1..916d1489 100644
--- a/app/view/main/MainController.js
+++ b/app/view/main/MainController.js
@@ -484,6 +484,6 @@ Ext.define('Rambox.view.main.MainController', {
}
,showDonate: function( btn ) {
- Tooltip.API.show('zxzKWZfcmgRtHXgth');
+ Signalayer.API.show('tChaoq3PwSG9wswhn');
}
});
diff --git a/appveyor.yml b/appveyor.yml
index 255640f0..c20178ed 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.5.16
+version: 0.5.17
pull_requests:
do_not_increment_build_number: true
branches:
diff --git a/electron/main.js b/electron/main.js
index 21507719..d1d1620c 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -277,7 +277,8 @@ function createMasterPasswordWindow() {
function updateBadge(title) {
title = title.split(" - ")[0]; //Discard service name if present, could also contain digits
var messageCount = title.match(/\d+/g) ? parseInt(title.match(/\d+/g).join("")) : 0;
-
+ messageCount = isNaN(messageCount) ? 0 : messageCount;
+
tray.setBadge(messageCount, config.get('systemtray_indicator'));
if (process.platform === 'win32') { // Windows
@@ -469,7 +470,7 @@ if ( config.get('proxy') ) {
app.on('login', (event, webContents, request, authInfo, callback) => {
if(!authInfo.isProxy)
return;
-
+
event.preventDefault()
callback(config.get('proxyLogin'), config.get('proxyPassword'))
})
diff --git a/electron/tray.js b/electron/tray.js
index 45d627ab..bd079ed5 100644
--- a/electron/tray.js
+++ b/electron/tray.js
@@ -67,9 +67,9 @@ exports.setBadge = function(messageCount, showUnreadTray) {
let icon;
if (process.platform === 'linux') {
- icon = messageCount && showUnreadTray ? 'IconTrayUnread.png' : 'IconTray.png';
+ icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.png' : 'IconTray.png';
} else {
- icon = messageCount && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
+ icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
}
const iconPath = path.join(__dirname, `../resources/${icon}`);
diff --git a/index.html b/index.html
index 42f1c9da..1e96df1c 100644
--- a/index.html
+++ b/index.html
@@ -44,16 +44,22 @@
-
+
-
+