diff --git a/.travis.yml b/.travis.yml index 1365a9e8..0ca1f3df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,7 @@ deploy: file_glob: true file: - "dist/*.zip" + - "dist/*.snap" - "dist/*.deb" - "dist/*.tar.gz" - "dist/*.AppImage" diff --git a/README.md b/README.md index 5fc4d600..7d4b2d1a 100644 --- a/README.md +++ b/README.md @@ -158,6 +158,7 @@ Mail.Ru Kune Zulip +Stride











































@@ -189,13 +190,10 @@ Sync feature use Auth0 for Single Sign On & Token Based Authentication and to st ## Donations -| Type | URL/Wallet | -|---------------|:------------------------------------------------------------------------------------------:| -| PayPal | [HERE](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WU75QWS7LH2CA) | -| Bitcoin | 1BjR8dARsnuqz41FZM9R8pPtYTeHn9mLSs | -| Bitcoin Cash | 1BjR8dARsnuqz41FZM9R8pPtYTeHn9mLSs | -| Ethereum | 0xf3d15f9649c6da63fc3971d8c82804dd677fd151 | -| Litecoin | Lf3CjUMhCVEvUjqMrNfRCkTbzRrd7KSdZn | +| Type | URL/Wallet | +|--------------------|:------------------------------------------------------------------------------------------:| +| PayPal | [HERE](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WU75QWS7LH2CA) | +| Cryptocurrencies | [HERE](https://www.vaulty.io/v/b6480279-af28-4855-868c-17e5cb0ae7fa) | ## Translations diff --git a/app/Application.js b/app/Application.js index 810513cd..5039e032 100644 --- a/app/Application.js +++ b/app/Application.js @@ -244,7 +244,7 @@ Ext.define('Rambox.Application', { '->' ,{ xtype: 'label' - ,html: ''+locale['app.update[0]']+' ('+json.version+')' + ( process.platform === 'win32' ? ' Is downloading in the background and you will notify when is ready to install it.' : '' ) + ,html: ''+locale['app.update[0]']+' ('+json.version+')' + ( process.platform === 'win32' ? ' is downloading in the background and you will be notified when it is ready to be installed.' : '' ) } ,{ xtype: 'button' diff --git a/app/package.json b/app/package.json index e16c5e91..0fed1b40 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "Rambox", "productName": "Rambox", - "version": "0.5.14", + "version": "0.5.16", "description": "Rambox", "main": "electron/main.js", "private": true, diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index 20b2bc90..6c0f83c1 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -28,7 +28,7 @@ Ext.define('Rambox.store.ServicesList', { ,description: locale['services[0]'] ,url: 'https://web.whatsapp.com/' ,type: 'messaging' - ,js_unread: 'function checkUnread(){var i=0;document.querySelectorAll(".unread").forEach(function(e){0===e.querySelectorAll("[data-icon=muted]").length&&i++});updateBadge(i)}function updateBadge(count) { if (count && count >= 1) { rambox.setUnreadCount(count); } else { rambox.clearUnreadCount(); } }setInterval(checkUnread,1e3);' + ,js_unread: 'function checkUnread(){const elements = document.querySelectorAll(\'.CxUIE, .unread\');let count = 0;for (let i = 0; i < elements.length; i++) {if (elements[i].querySelectorAll(\'*[data-icon="muted"]\').length === 0) {count++;}}updateBadge(count);}function updateBadge(count){if(count && count>=1){rambox.setUnreadCount(count);}else{rambox.clearUnreadCount();}}setInterval(checkUnread, 1e3);' ,dont_update_unread_from_title: true }, { @@ -880,5 +880,14 @@ Ext.define('Rambox.store.ServicesList', { ,type: 'messaging' ,custom_domain: true }, + { + id: 'stride' + ,logo: 'stride.png' + ,name: 'Stride' + ,description: 'Stride is the complete team communication solution with group messaging, video meetings, and built-in collaboration tools.' + ,url: 'https://app.stride.com/___' + ,type: 'messaging' + ,js_unread: 'function checkUnread(){var t=0,e=!1;document.querySelectorAll(".conversations-nav .nav-item .activity-indicator").forEach(function(n){n.classList.contains("has-count")?t+=parseInt(n.innerHTML):e=!0}),updateBadge(t,e)}function updateBadge(t,e){var n=t>0?"("+t+") ":e?"(•) ":"";document.title=n+originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);' + } ] }); diff --git a/appveyor.yml b/appveyor.yml index 482f0f94..255640f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.5.14 +version: 0.5.16 pull_requests: do_not_increment_build_number: true branches: diff --git a/electron/menu.js b/electron/menu.js index 033d481c..ae47f71a 100644 --- a/electron/menu.js +++ b/electron/menu.js @@ -66,7 +66,7 @@ module.exports = function(config) { { label: `&`+locale['menu.help[2]'], click() { - shell.openExternal('https://gitter.im/saenzramiro/rambox'); + shell.openExternal('https://rambox.typeform.com/to/t7jc4C'); } }, { diff --git a/index.html b/index.html index 0ee207b1..42f1c9da 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,9 @@ xhr.open('HEAD', file + "?rand=" + randomNum, true); xhr.send(); - xhr.addEventListener("readystatechange", processRequest, false); + xhr.addEventListener("readystatechange", function() { + setTimeout(processRequest, 5000); + }, false); function processRequest(e) { if (xhr.readyState == 4) { diff --git a/package-lock.json b/package-lock.json index 29257a4b..7078533c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,25 +8,9 @@ "integrity": "sha512-S2f7InK2SwceVFly0tx/+1xakOWhSZQeY5hOXFl/sZ9orfRE4i4Z9edsWonT5lyYTowBN73RwBbLqZaVrtSEuw==", "dev": true, "requires": { - "7zip-bin-linux": "1.3.1", - "7zip-bin-mac": "1.0.1", "7zip-bin-win": "2.1.0" } }, - "7zip-bin-linux": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/7zip-bin-linux/-/7zip-bin-linux-1.3.1.tgz", - "integrity": "sha512-Wv1uEEeHbTiS1+ycpwUxYNuIcyohU6Y6vEqY3NquBkeqy0YhVdsNUGsj0XKSRciHR6LoJSEUuqYUexmws3zH7Q==", - "dev": true, - "optional": true - }, - "7zip-bin-mac": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz", - "integrity": "sha1-Pmh3i78JJq3GgVlCcHRQXUdVXAI=", - "dev": true, - "optional": true - }, "7zip-bin-win": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/7zip-bin-win/-/7zip-bin-win-2.1.0.tgz", @@ -71,12 +55,6 @@ } } }, - "@types/node": { - "version": "7.0.43", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz", - "integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==", - "dev": true - }, "abbrev": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", @@ -1492,14 +1470,22 @@ } }, "electron": { - "version": "1.7.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.8.tgz", - "integrity": "sha1-J7eRpolRcafVKZG5lELNvRCjU50=", + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.3.tgz", + "integrity": "sha512-ZZYSPB9tLh0m4uZOTcQllv/U8ts3GaMyEkBTooBr5rO+xl0WfQlecUcPuyw6aqtrZfNKsqLprorXKgsFmwcI5w==", "dev": true, "requires": { - "@types/node": "7.0.43", + "@types/node": "8.9.4", "electron-download": "3.3.0", "extract-zip": "1.6.5" + }, + "dependencies": { + "@types/node": { + "version": "8.9.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.4.tgz", + "integrity": "sha512-dSvD36qnQs78G1BPsrZFdPpvLgMW/dnvr5+nTW2csMs5TiP9MOXrjUbnMZOEwnIuBklXtn7b6TPA2Cuq07bDHA==", + "dev": true + } } }, "electron-builder": { diff --git a/package.json b/package.json index 634b38aa..910fad66 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,10 @@ "tar.gz" ] }, + "snap": { + "confinement": "strict", + "grade": "stable" + }, "directories": { "buildResources": "resources/installer/", "output": "dist/", @@ -93,7 +97,7 @@ "chai": "3.5.0", "crowdin": "1.0.0", "csvjson": "4.3.3", - "electron": "^1.7.8", + "electron": "^1.8.3", "electron-builder": "^17.10.0", "electron-builder-squirrel-windows": "15.0.0", "electron-squirrel-startup": "^1.0.0", diff --git a/resources/icons/stride.png b/resources/icons/stride.png new file mode 100644 index 00000000..9d3a1217 Binary files /dev/null and b/resources/icons/stride.png differ