aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release-4.0'

Browse source
This commit is contained in:
Yuya Ochiai 2018-03-30 00:19:40 +09:00
parent 554da97926 8dcbeed296
commit e63404664e
4 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -54,14 +54,15 @@ Release date: March 28, 2018
This release contains multiple security updates for Windows, Mac and Linux, and it is highly recommended that users upgrade to this version. This release contains multiple security updates for Windows, Mac and Linux, and it is highly recommended that users upgrade to this version.
### Architectural Changes ### Architectural Changes
- Minor version upgrade of Electron from v1.7.11 to v1.7.13. Electron is the underlying technology used to build the Desktop apps.
Minor version upgrade of Electron from v1.7.11 to v1.7.13. Electron is the underlying technology used to build the Desktop apps. ### Bug Fixes
### Bux Fixes
#### All Platforms #### All Platforms
- Disabled Certificate Transparency verification that produced unnecessary certificate errors. - Disabled Certificate Transparency verification that produced unnecessary certificate errors.
[#743](https://github.com/mattermost/desktop/pull/743)
----
## Release v4.0.0 ## Release v4.0.0

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "mattermost-desktop", "name": "mattermost-desktop",
"productName": "Mattermost", "productName": "Mattermost",
"version": "4.0.0", "version": "4.0.1",
"description": "Mattermost", "description": "Mattermost",
"main": "main.js", "main": "main.js",
"author": "Mattermost, Inc. <feedback@mattermost.com>", "author": "Mattermost, Inc. <feedback@mattermost.com>",

15
src/main.js
View file

@ -15,6 +15,7 @@ const {
} = require('electron'); } = require('electron');
const isDev = require('electron-is-dev'); const isDev = require('electron-is-dev');
const installExtension = require('electron-devtools-installer'); const installExtension = require('electron-devtools-installer');
const semver = require('semver');
const parseArgv = require('yargs').parse; const parseArgv = require('yargs').parse;
const protocols = require('../electron-builder.json').protocols; const protocols = require('../electron-builder.json').protocols;
@ -624,6 +625,20 @@ app.on('ready', () => {
permissionManager = new PermissionManager(permissionFile, trustedURLs); permissionManager = new PermissionManager(permissionFile, trustedURLs);
session.defaultSession.setPermissionRequestHandler(permissionRequestHandler(mainWindow, permissionManager)); session.defaultSession.setPermissionRequestHandler(permissionRequestHandler(mainWindow, permissionManager));
// Disable Certificate Transparency until Electron 1.8.3
// due to https://github.com/electron/electron/issues/11997
if (semver.lt(process.versions.electron, '1.8.3')) {
const SUCCESS_AND_DISABLE_CERTIFICATE_TRANSPARENCY = 0;
const USE_VERIFICATION_RESULT_FROM_CHROMIUM = -3;
session.defaultSession.setCertificateVerifyProc((request, callback) => {
if (request.verificationResult === 'net::OK') {
callback(SUCCESS_AND_DISABLE_CERTIFICATE_TRANSPARENCY);
} else {
callback(USE_VERIFICATION_RESULT_FROM_CHROMIUM);
}
});
}
// Open the DevTools. // Open the DevTools.
// mainWindow.openDevTools(); // mainWindow.openDevTools();
}); });

2
src/package.json
View file

@ -2,7 +2,7 @@
"name": "mattermost-desktop", "name": "mattermost-desktop",
"productName": "Mattermost", "productName": "Mattermost",
"desktopName": "Mattermost.desktop", "desktopName": "Mattermost.desktop",
"version": "4.0.0", "version": "4.0.1",
"description": "Mattermost", "description": "Mattermost",
"main": "main_bundle.js", "main": "main_bundle.js",
"author": "Mattermost, Inc. <feedback@mattermost.com>", "author": "Mattermost, Inc. <feedback@mattermost.com>",