diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b7090222..7dfb570c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,11 +37,11 @@ Working on your first Pull Request? You can learn how from this *free* series [H ### Prerequisites -| Prerequisite | Version | -| ------------------------------------------------------------- | ----------- | -| [Sencha](https://www.sencha.com/products/extjs/cmd-download/) | `=6.1.2.15` | -| [Ruby](https://www.ruby-lang.org/en/downloads/) | `=2.3` | -| [Node.js](http://nodejs.org) | `~ ^4.0.0` | +| Prerequisite | Version | +| ------------------------------------------------------------- | ------- | +| [Sencha](https://www.sencha.com/products/extjs/cmd-download/) | `=6.1.2.15` | +| [Ruby](https://www.ruby-lang.org/en/downloads/) | `=2.3` | +| [Node.js](https://nodejs.org) | `~ ^4.0.0` | | npm (comes with Node) | `~ ^3.8.7` | > _Updating to the latest releases is recommended_. diff --git a/README.md b/README.md index ba458420..17536cef 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@


- Rambox
+ Rambox
Rambox

@@ -26,9 +26,9 @@
Available for Windows, Mac and Linux.
-
DOWNLOAD HERE
+
DOWNLOAD HERE
-
Logo designed by Andriy Yurchenko
+
Logo designed by Andriy Yurchenko
--- diff --git a/app/Application.js b/app/Application.js index 5039e032..32aed8e3 100644 --- a/app/Application.js +++ b/app/Application.js @@ -229,7 +229,7 @@ Ext.define('Rambox.Application', { ,checkUpdate: function(silence) { console.info('Checking for updates...'); Ext.Ajax.request({ - url: 'http://rambox.pro/api/latestversion.json' + url: 'https://rambox.pro/api/latestversion.json' ,method: 'GET' ,success: function(response) { var json = Ext.decode(response.responseText); diff --git a/app/package.json b/app/package.json index fc94570c..dd29b68f 100644 --- a/app/package.json +++ b/app/package.json @@ -12,7 +12,7 @@ "bugs": { "url": "https://github.com/saenzramiro/rambox/issues" }, - "homepage": "http://rambox.pro", + "homepage": "https://rambox.pro", "keywords": [ "Rambox", "messaging", diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index 1e9a9304..7c3cff7e 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -125,7 +125,7 @@ Ext.define('Rambox.store.ServicesList', { ,logo: 'inbox.png' ,name: 'Inbox' ,description: locale['services[10]'] - ,url: 'http://inbox.google.com/?cid=imp' + ,url: 'https://inbox.google.com/?cid=imp' ,type: 'email' ,manual_notifications: true ,js_unread: 'function checkUnread(){updateBadge(document.getElementsByClassName("ss").length)}function updateBadge(a){a>=1?document.title="("+a+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);' @@ -876,7 +876,7 @@ Ext.define('Rambox.store.ServicesList', { ,logo: 'mailru.png' ,name: 'Mail.Ru' ,description: 'Free voice and video calls, ICQ support, Odnoklassniki, VKontakte, Facebook, online games, free SMS.' - ,url: 'http://webagent.mail.ru/webim/agent/popup.html' + ,url: 'https://webagent.mail.ru/webim/agent/popup.html' ,type: 'email' }, { diff --git a/app/ux/WebView.js b/app/ux/WebView.js index 51af59cf..03820aaf 100644 --- a/app/ux/WebView.js +++ b/app/ux/WebView.js @@ -174,7 +174,7 @@ Ext.define('Rambox.ux.WebView',{ ,plugins: 'true' ,allowtransparency: 'on' ,autosize: 'on' - ,webpreferences: 'allowRunningInsecureContent=yes' //,nativeWindowOpen=yes + ,webpreferences: '' //,nativeWindowOpen=yes //,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled ,useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent') ,preload: './resources/js/rambox-service-api.js' diff --git a/app/view/add/Add.js b/app/view/add/Add.js index 9c9730cc..fee06298 100644 --- a/app/view/add/Add.js +++ b/app/view/add/Add.js @@ -65,7 +65,7 @@ Ext.define('Rambox.view.add.Add',{ ,readOnly: me.edit ? (me.service.get('custom_domain') && me.service.get('url') === me.record.get('url') ? true : me.service.get('url').indexOf('___') === -1 && !me.service.get('custom_domain')) : me.record.get('url').indexOf('___') === -1 && me.record.get('custom_domain') ,allowBlank: false ,submitEmptyText: false - ,emptyText: me.record.get('url') === '___' ? 'http://' : '' + ,emptyText: me.record.get('url') === '___' ? 'https://' : '' ,vtype: me.record.get('url') === '___' ? 'url' : '' ,listeners: { specialkey: 'onEnter' } ,flex: 1 @@ -97,7 +97,7 @@ Ext.define('Rambox.view.add.Add',{ } ,changeHandler: function(cycleBtn, activeItem) { Ext.apply(cycleBtn.previousSibling(), { - emptyText: activeItem.custom ? 'http://' : ' ' + emptyText: activeItem.custom ? 'https://' : ' ' ,vtype: activeItem.custom ? 'url' : '' }); cycleBtn.previousSibling().applyEmptyText(); @@ -127,7 +127,7 @@ Ext.define('Rambox.view.add.Add',{ ,{ xtype: 'textfield' ,fieldLabel: locale['app.window[18]'] - ,emptyText: 'http://url.com/image.png' + ,emptyText: 'https://url.com/image.png' ,name: 'logo' ,vtype: me.record.get('type') === 'custom' ? 'url' : '' ,value: me.record.get('type') === 'custom' ? (me.edit ? me.record.get('logo') : '') : me.record.get('logo') diff --git a/app/view/main/Main.js b/app/view/main/Main.js index 27dd3703..73deaeab 100644 --- a/app/view/main/Main.js +++ b/app/view/main/Main.js @@ -313,7 +313,7 @@ Ext.define('Rambox.view.main.Main', { text: locale['app.main[22]'] ,icon: 'resources/auth0.png' ,id: 'loginBtn' - ,tooltip: locale['app.main[23]']+'

'+locale['app.main[24]']+' Auth0 (http://auth0.com)' + ,tooltip: locale['app.main[23]']+'

'+locale['app.main[24]']+' Auth0 (https://auth0.com)' ,bind: { hidden: '{username}' } diff --git a/electron/main.js b/electron/main.js index 3fc125b8..3688498a 100644 --- a/electron/main.js +++ b/electron/main.js @@ -157,9 +157,7 @@ function createWindow () { ,show: !config.get('start_minimized') ,acceptFirstMouse: true ,webPreferences: { - webSecurity: false - ,nodeIntegration: true - ,plugins: true + plugins: true ,partition: 'persist:rambox' } }); diff --git a/electron/menu.js b/electron/menu.js index 7b485e91..83560074 100644 --- a/electron/menu.js +++ b/electron/menu.js @@ -22,7 +22,7 @@ module.exports = function(config) { { label: `&`+locale['menu.help[0]'], click() { - shell.openExternal('http://rambox.pro'); + shell.openExternal('https://rambox.pro'); } }, {