Commit e7c77fa0 authored by Tasso Evangelista's avatar Tasso Evangelista

Merge branch 'hotfix/2.14.6'

parents 446c8e2a cd445f36
<a name="2.14.6"></a>
## 2.14.6 (2018-12-06)
### Bug Fixes
- Add strings specifying why some permissions are needed in MacOS
- Fix servers.json path resolution
<a name="2.14.5"></a>
## 2.14.5 (2018-12-04)
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.files.downloads.read-write</key>
<true/>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
<key>com.apple.security.device.camera</key>
<true/>
<key>com.apple.security.device.microphone</key>
<true/>
<key>com.apple.security.personal-information.location</key>
<true/>
</dict>
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.files.downloads.read-write</key>
<true/>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
<key>com.apple.security.device.camera</key>
<true/>
<key>com.apple.security.device.microphone</key>
<true/>
<!--
<key>com.apple.security.personal-information.location</key>
<true/>
-->
</dict>
</plist>
......@@ -19,10 +19,14 @@
"mas"
],
"icon": "build/icon.icns",
"bundleVersion": "43",
"bundleVersion": "44",
"helperBundleId": "chat.rocket.electron.helper",
"type": "distribution",
"artifactName": "rocketchat-${version}.${ext}"
"artifactName": "rocketchat-${version}.${ext}",
"extendInfo": {
"NSMicrophoneUsageDescription": "I need access to your microphone to record the audio you want to send.",
"NSCameraUsageDescription": "I need access to your camera to record the video you want to send."
}
},
"dmg": {
"background": "build/background.png",
......
......@@ -2,7 +2,7 @@
"name": "rocketchat",
"productName": "Rocket.Chat",
"description": "Rocket.Chat Native Cross-Platform Desktop Application via Electron.",
"version": "2.14.5",
"version": "2.14.6",
"author": "Rocket.Chat Support <support@rocket.chat>",
"copyright": "© 2018, Rocket.Chat",
"homepage": "https://rocket.chat",
......
......@@ -78,14 +78,12 @@ class Servers extends EventEmitter {
const { app } = remote;
const userDir = jetpack.cwd(app.getPath('userData'));
const appDir = jetpack.cwd(jetpack.path(app.getAppPath(), app.getAppPath().endsWith('.asar') ? '..' : '.'));
const path = userDir.find({ matching: 'servers.json', recursive: false })[0] ||
appDir.find({ matching: 'servers.json', recursive: false })[0];
const path = (userDir.find({ matching: 'servers.json', recursive: false })[0] && userDir.path('servers.json')) ||
(appDir.find({ matching: 'servers.json', recursive: false })[0] && appDir.path('servers.json'));
if (path) {
const pathToServerJson = jetpack.path(path);
try {
const result = jetpack.read(pathToServerJson, 'json');
const result = jetpack.read(path, 'json');
if (result) {
hosts = {};
Object.keys(result).forEach((title) => {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment