mirror of
https://github.com/zulip/zulip-desktop.git
synced 2025-10-27 18:13:45 +00:00
Compare commits
30 Commits
v2.3.2
...
v2.3.4-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
82199dd1c3 | ||
|
|
952baf1f42 | ||
|
3342d7da91 | ||
|
|
c0ec292090 | ||
|
|
8f6fba0b97 | ||
|
d3453a3fe1 | ||
|
|
18e14fd3f8 | ||
|
|
c52bfd6a45 | ||
|
|
428087110a | ||
|
|
781883a898 | ||
|
|
7299cd51e6 | ||
|
|
a45254cff0 | ||
|
|
4095c121ba | ||
|
|
6787b8d557 | ||
|
|
306e0f3b5e | ||
|
|
f030d5d56b | ||
|
|
acf7c5a238 | ||
|
|
da22f75300 | ||
|
|
df35ffc3b0 | ||
|
|
eeb0b4a666 | ||
|
|
0a893c97c7 | ||
|
|
99a1711bb0 | ||
|
|
a27cf9e0e7 | ||
|
|
22d6c6a2f3 | ||
|
|
c742591471 | ||
|
|
339a415d60 | ||
|
|
f7696cc04d | ||
|
|
1eabf5c5a2 | ||
|
|
4d020c639b | ||
|
|
85a6cf6890 |
@@ -1,16 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
const { crashReporter } = require('electron');
|
||||
|
||||
const crashHandler = () => {
|
||||
crashReporter.start({
|
||||
productName: 'zulip-electron',
|
||||
companyName: 'Kandra Labs, Inc.',
|
||||
submitURL: 'https://zulip-sentry.herokuapp.com/crashreport',
|
||||
uploadToServer: true
|
||||
});
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
crashHandler
|
||||
};
|
||||
@@ -5,7 +5,6 @@ const windowStateKeeper = require('electron-window-state');
|
||||
const isDev = require('electron-is-dev');
|
||||
const appMenu = require('./menu');
|
||||
const { appUpdater } = require('./autoupdater');
|
||||
const { crashHandler } = require('./crash-reporter');
|
||||
|
||||
const { setAutoLaunch } = require('./startup');
|
||||
|
||||
@@ -13,6 +12,8 @@ const { app, ipcMain } = electron;
|
||||
|
||||
const BadgeSettings = require('./../renderer/js/pages/preference/badge-settings.js');
|
||||
const ConfigUtil = require('./../renderer/js/utils/config-util.js');
|
||||
const ProxyUtil = require('./../renderer/js/utils/proxy-util.js');
|
||||
const { sentryInit } = require('./../renderer/js/utils/sentry-util.js');
|
||||
|
||||
// Adds debug features like hotkeys for triggering dev tools and reload
|
||||
// in development mode
|
||||
@@ -53,7 +54,8 @@ function createMainWindow() {
|
||||
// Load the previous state with fallback to defaults
|
||||
const mainWindowState = windowStateKeeper({
|
||||
defaultWidth: 1100,
|
||||
defaultHeight: 720
|
||||
defaultHeight: 720,
|
||||
path: `${app.getPath('userData')}/config`
|
||||
});
|
||||
|
||||
// Let's keep the window position global so that we can access it in other process
|
||||
@@ -153,6 +155,15 @@ app.on('ready', () => {
|
||||
});
|
||||
mainWindow = createMainWindow();
|
||||
|
||||
// Initialize sentry for main process
|
||||
sentryInit();
|
||||
|
||||
const isSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
|
||||
|
||||
if (isSystemProxy) {
|
||||
ProxyUtil.resolveSystemProxy(mainWindow);
|
||||
}
|
||||
|
||||
const page = mainWindow.webContents;
|
||||
|
||||
page.on('dom-ready', () => {
|
||||
@@ -168,7 +179,6 @@ app.on('ready', () => {
|
||||
if (ConfigUtil.getConfigItem('autoUpdate')) {
|
||||
appUpdater();
|
||||
}
|
||||
crashHandler();
|
||||
});
|
||||
|
||||
// Temporarily remove this event
|
||||
@@ -230,6 +240,44 @@ app.on('ready', () => {
|
||||
ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
|
||||
setAutoLaunch(AutoLaunchValue);
|
||||
});
|
||||
|
||||
ipcMain.on('downloadFile', (event, url, downloadPath) => {
|
||||
page.downloadURL(url);
|
||||
page.session.once('will-download', (event, item) => {
|
||||
const filePath = path.join(downloadPath, item.getFilename());
|
||||
item.setSavePath(filePath);
|
||||
item.on('updated', (event, state) => {
|
||||
switch (state) {
|
||||
case 'interrupted' : {
|
||||
// Can interrupted to due to network error, cancel download then
|
||||
console.log('Download interrupted, cancelling and fallback to dialog download.');
|
||||
item.cancel();
|
||||
break;
|
||||
}
|
||||
case 'progressing': {
|
||||
if (item.isPaused()) {
|
||||
item.cancel();
|
||||
}
|
||||
// This event can also be used to show progres in percentage in future.
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
console.info('Unknown updated state of download item');
|
||||
}
|
||||
}
|
||||
});
|
||||
item.once('done', (event, state) => {
|
||||
if (state === 'completed') {
|
||||
page.send('downloadFileCompleted', item.getSavePath(), item.getFilename());
|
||||
} else {
|
||||
console.log('Download failed state: ', state);
|
||||
page.send('downloadFileFailed');
|
||||
}
|
||||
// To stop item for listening to updated events of this file
|
||||
item.removeAllListeners('updated');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
app.on('before-quit', () => {
|
||||
|
||||
@@ -5,6 +5,12 @@ const request = require('request');
|
||||
const semver = require('semver');
|
||||
const ConfigUtil = require('../renderer/js/utils/config-util');
|
||||
const LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
|
||||
const Logger = require('../renderer/js/utils/logger-util');
|
||||
|
||||
const logger = new Logger({
|
||||
file: 'linux-update-util.log',
|
||||
timestamp: true
|
||||
});
|
||||
|
||||
function linuxUpdateNotification() {
|
||||
let url = 'https://api.github.com/repos/zulip/zulip-electron/releases';
|
||||
@@ -17,7 +23,8 @@ function linuxUpdateNotification() {
|
||||
|
||||
request(options, (error, response, body) => {
|
||||
if (error) {
|
||||
console.log('Error:', error);
|
||||
logger.error('Linux update error.');
|
||||
logger.error(error);
|
||||
return;
|
||||
}
|
||||
if (response.statusCode < 400) {
|
||||
@@ -32,7 +39,7 @@ function linuxUpdateNotification() {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log('Status:', response.statusCode);
|
||||
logger.log('Linux update response status: ', response.statusCode);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -4,13 +4,20 @@ const path = require('path');
|
||||
const { app, shell, BrowserWindow, Menu, dialog } = require('electron');
|
||||
|
||||
const fs = require('fs-extra');
|
||||
const AdmZip = require('adm-zip');
|
||||
const { appUpdater } = require('./autoupdater');
|
||||
|
||||
const ConfigUtil = require(__dirname + '/../renderer/js/utils/config-util.js');
|
||||
const DNDUtil = require(__dirname + '/../renderer/js/utils/dnd-util.js');
|
||||
const Logger = require(__dirname + '/../renderer/js/utils/logger-util.js');
|
||||
|
||||
const appName = app.getName();
|
||||
|
||||
const logger = new Logger({
|
||||
file: 'errors.log',
|
||||
timestamp: true
|
||||
});
|
||||
|
||||
class AppMenu {
|
||||
getHistorySubmenu() {
|
||||
return [{
|
||||
@@ -135,13 +142,26 @@ class AppMenu {
|
||||
}, {
|
||||
label: 'Show App Logs',
|
||||
click() {
|
||||
shell.openItem(app.getPath('userData'));
|
||||
const zip = new AdmZip();
|
||||
let date = new Date();
|
||||
date = date.toLocaleDateString().replace(/\//g, '-');
|
||||
|
||||
// Create a zip file of all the logs and config data
|
||||
zip.addLocalFolder(`${app.getPath('appData')}/${appName}/Logs`);
|
||||
zip.addLocalFolder(`${app.getPath('appData')}/${appName}/config`);
|
||||
|
||||
// Put the log file in downloads folder
|
||||
const logFilePath = `${app.getPath('downloads')}/Zulip-logs-${date}.zip`;
|
||||
zip.writeZip(logFilePath);
|
||||
|
||||
// Open and select the log file
|
||||
shell.showItemInFolder(logFilePath);
|
||||
}
|
||||
}, {
|
||||
label: 'Report an Issue...',
|
||||
click() {
|
||||
// the goal is to notify the main.html BrowserWindow
|
||||
// which may not be the focused window.
|
||||
// the goal is to notify the main.html BrowserWindow
|
||||
// which may not be the focused window.
|
||||
BrowserWindow.getAllWindows().forEach(window => {
|
||||
window.webContents.send('open-feedback-modal');
|
||||
});
|
||||
@@ -196,12 +216,12 @@ class AppMenu {
|
||||
AppMenu.sendAction('open-about');
|
||||
}
|
||||
}
|
||||
}, {
|
||||
}, {
|
||||
label: `Check for Update`,
|
||||
click() {
|
||||
AppMenu.checkForUpdate();
|
||||
}
|
||||
}, {
|
||||
}, {
|
||||
type: 'separator'
|
||||
}, {
|
||||
label: 'Desktop App Settings',
|
||||
@@ -308,12 +328,12 @@ class AppMenu {
|
||||
AppMenu.sendAction('open-about');
|
||||
}
|
||||
}
|
||||
}, {
|
||||
}, {
|
||||
label: `Check for Update`,
|
||||
click() {
|
||||
AppMenu.checkForUpdate();
|
||||
}
|
||||
}, {
|
||||
}, {
|
||||
type: 'separator'
|
||||
}, {
|
||||
label: 'Desktop App Settings',
|
||||
@@ -417,7 +437,7 @@ class AppMenu {
|
||||
const resetAppSettingsMessage = 'By proceeding you will be removing all connected organizations and preferences from Zulip.';
|
||||
|
||||
// We save App's settings/configurations in following files
|
||||
const settingFiles = ['window-state.json', 'domain.json', 'settings.json'];
|
||||
const settingFiles = ['config/window-state.json', 'config/domain.json', 'config/settings.json', 'config/certificates.json'];
|
||||
|
||||
dialog.showMessageBox({
|
||||
type: 'warning',
|
||||
@@ -431,7 +451,8 @@ class AppMenu {
|
||||
const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
|
||||
fs.access(getSettingFilesPath, error => {
|
||||
if (error) {
|
||||
console.log(error);
|
||||
logger.error('Error while resetting app settings.');
|
||||
logger.error(error);
|
||||
} else {
|
||||
fs.unlink(getSettingFilesPath, () => {
|
||||
AppMenu.sendAction('clear-app-data');
|
||||
|
||||
351
app/package-lock.json
generated
351
app/package-lock.json
generated
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"name": "zulip",
|
||||
"version": "2.3.2",
|
||||
"version": "2.3.4-beta",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
"@electron-elements/send-feedback": {
|
||||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/@electron-elements/send-feedback/-/send-feedback-1.0.7.tgz",
|
||||
"integrity": "sha512-3VS5JlAkZi0Ik2xHPdO0ZT3VvtLH7fqY8UXKHiR4BJxJPdoqlPM9Z0YT0uQxSz/xfBjcfCRV1DlnuJ/S3J99ow==",
|
||||
"integrity": "sha1-HmTsFMvNkmZAngeu1BDoUi45deA=",
|
||||
"requires": {
|
||||
"@electron-elements/utils": "1.0.3"
|
||||
}
|
||||
@@ -15,7 +15,7 @@
|
||||
"@electron-elements/utils": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@electron-elements/utils/-/utils-1.0.3.tgz",
|
||||
"integrity": "sha512-SMIKfu0UrmslHVKDQhOJDE2OeynWnuznkZlhgB5X2V2h+0t00Pq+ekusxBAAXIdZSdnLPlMcH3zZ6TfDq6mbPA=="
|
||||
"integrity": "sha1-23sB2Zzaay/sNM+XuJcJCWnznII="
|
||||
},
|
||||
"@paulcbetts/cld": {
|
||||
"version": "2.4.6",
|
||||
@@ -31,16 +31,73 @@
|
||||
"@paulcbetts/spellchecker": {
|
||||
"version": "4.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@paulcbetts/spellchecker/-/spellchecker-4.0.6.tgz",
|
||||
"integrity": "sha512-9lhLEvWfAB00n2oOM/S08sna9AuFk+b+bPk8ficpSa2X0Ll40PahMwfFS3G54nqQBIFFZgTPrhoHtCLAao0xmg==",
|
||||
"integrity": "sha1-ee8fnBnFoxVpIcyqn/3D77vuR+M=",
|
||||
"requires": {
|
||||
"nan": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"@sentry/browser": {
|
||||
"version": "0.5.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-0.5.4.tgz",
|
||||
"integrity": "sha1-Yh/5chgrc7YoVlhLkvxl/elpBMw=",
|
||||
"requires": {
|
||||
"@sentry/core": "0.5.4",
|
||||
"@sentry/shim": "0.5.4"
|
||||
}
|
||||
},
|
||||
"@sentry/core": {
|
||||
"version": "0.5.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-0.5.4.tgz",
|
||||
"integrity": "sha1-mwqEK0QhMbOAG65wviyk6cUQV04=",
|
||||
"requires": {
|
||||
"@sentry/shim": "0.5.4"
|
||||
}
|
||||
},
|
||||
"@sentry/electron": {
|
||||
"version": "0.5.5",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-0.5.5.tgz",
|
||||
"integrity": "sha1-kInWNC22xr1sCSpTdHcIAx1ft8M=",
|
||||
"requires": {
|
||||
"@sentry/browser": "0.5.4",
|
||||
"@sentry/core": "0.5.4",
|
||||
"@sentry/node": "0.5.4",
|
||||
"@sentry/shim": "0.5.4",
|
||||
"@sentry/utils": "0.5.4",
|
||||
"electron-fetch": "^1.1.0",
|
||||
"form-data": "^2.3.2",
|
||||
"util.promisify": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"@sentry/node": {
|
||||
"version": "0.5.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/node/-/node-0.5.4.tgz",
|
||||
"integrity": "sha1-s+c0nRs2EjmVkDbqrhnOvzVkw9M=",
|
||||
"requires": {
|
||||
"@sentry/core": "0.5.4",
|
||||
"@sentry/shim": "0.5.4",
|
||||
"raven": "^2.6.0"
|
||||
}
|
||||
},
|
||||
"@sentry/shim": {
|
||||
"version": "0.5.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/shim/-/shim-0.5.4.tgz",
|
||||
"integrity": "sha1-y4JrGjR2WuXhsh5h3y3vL42pHcE="
|
||||
},
|
||||
"@sentry/utils": {
|
||||
"version": "0.5.4",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-0.5.4.tgz",
|
||||
"integrity": "sha1-jt54rOlgIW3WMv1WHIP1AGLlruE="
|
||||
},
|
||||
"@sindresorhus/is": {
|
||||
"version": "0.7.0",
|
||||
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
|
||||
"integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
|
||||
},
|
||||
"adm-zip": {
|
||||
"version": "0.4.11",
|
||||
"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
|
||||
"integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA=="
|
||||
},
|
||||
"aggregate-error": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz",
|
||||
@@ -69,7 +126,7 @@
|
||||
"argparse": {
|
||||
"version": "1.0.10",
|
||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
|
||||
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
|
||||
"integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
|
||||
"requires": {
|
||||
"sprintf-js": "~1.0.2"
|
||||
}
|
||||
@@ -109,7 +166,7 @@
|
||||
"aws4": {
|
||||
"version": "1.7.0",
|
||||
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
|
||||
"integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
|
||||
"integrity": "sha1-1NDpudv8p3vwjusKikcVUP454ok="
|
||||
},
|
||||
"balanced-match": {
|
||||
"version": "1.0.0",
|
||||
@@ -139,12 +196,12 @@
|
||||
"bluebird": {
|
||||
"version": "3.5.1",
|
||||
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
|
||||
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
|
||||
"integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk="
|
||||
},
|
||||
"bluebird-lst": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.5.tgz",
|
||||
"integrity": "sha512-Ey0bDNys5qpYPhZ/oQ9vOEvD0TYQDTILMXWP2iGfvMg7rSDde+oV4aQQgqRH+CvBFNz2BSDQnPGMUl6LKBUUQA==",
|
||||
"integrity": "sha1-vryDAmt+kqcocaPcWZ4hnL+wAqk=",
|
||||
"requires": {
|
||||
"bluebird": "^3.5.1"
|
||||
}
|
||||
@@ -160,25 +217,25 @@
|
||||
"brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
|
||||
"integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
|
||||
"requires": {
|
||||
"balanced-match": "^1.0.0",
|
||||
"concat-map": "0.0.1"
|
||||
}
|
||||
},
|
||||
"buffer-from": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz",
|
||||
"integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA=="
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
|
||||
"integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="
|
||||
},
|
||||
"builder-util-runtime": {
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.2.1.tgz",
|
||||
"integrity": "sha512-6Ufp6ExT40RDYNXQgD4xG0fgtpUHyc8XIld6lptKr0re1DNnUrQP4sSV/lJOajpzyercMP/YIzO60/mNuAFiWg==",
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.0.tgz",
|
||||
"integrity": "sha512-tkTF1o7XAX79ZkMo8822ZdQMpEBGSgfJ9kEYgyTAja90BPu7HO8C02pb8iSlFXfmK0Q0UA6D8MmnSNNPi0JLeg==",
|
||||
"requires": {
|
||||
"bluebird-lst": "^1.0.5",
|
||||
"debug": "^3.1.0",
|
||||
"fs-extra-p": "^4.6.0",
|
||||
"fs-extra-p": "^4.6.1",
|
||||
"sax": "^1.2.4"
|
||||
},
|
||||
"dependencies": {
|
||||
@@ -223,6 +280,11 @@
|
||||
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
|
||||
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
|
||||
},
|
||||
"charenc": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
|
||||
"integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
|
||||
},
|
||||
"clean-stack": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz",
|
||||
@@ -254,6 +316,11 @@
|
||||
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
|
||||
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
|
||||
},
|
||||
"cookie": {
|
||||
"version": "0.3.1",
|
||||
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
|
||||
"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
|
||||
},
|
||||
"core-util-is": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
|
||||
@@ -267,6 +334,11 @@
|
||||
"capture-stack-trace": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"crypt": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
|
||||
"integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
|
||||
},
|
||||
"cryptiles": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
|
||||
@@ -296,7 +368,7 @@
|
||||
"debug": {
|
||||
"version": "2.6.9",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
|
||||
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
|
||||
"integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
|
||||
"requires": {
|
||||
"ms": "2.0.0"
|
||||
}
|
||||
@@ -319,6 +391,15 @@
|
||||
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
|
||||
"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
|
||||
},
|
||||
"define-properties": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
|
||||
"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
|
||||
"requires": {
|
||||
"foreach": "^2.0.5",
|
||||
"object-keys": "^1.0.8"
|
||||
}
|
||||
},
|
||||
"delayed-stream": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
|
||||
@@ -327,7 +408,7 @@
|
||||
"dns-packet": {
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
|
||||
"integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
|
||||
"integrity": "sha1-EqpCaYEHW+UAuRDu3NC0fdfe2lo=",
|
||||
"requires": {
|
||||
"ip": "^1.1.0",
|
||||
"safe-buffer": "^5.0.1"
|
||||
@@ -355,6 +436,14 @@
|
||||
"jsbn": "~0.1.0"
|
||||
}
|
||||
},
|
||||
"electron-fetch": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.1.0.tgz",
|
||||
"integrity": "sha512-eBtqbB522c/RJwC5v1yF/Y0SMVLiwel98BWGx050GucWbKlejHtPkfpq/vfMxCjg0SGpHGUISYUaMfu65QH+xg==",
|
||||
"requires": {
|
||||
"encoding": "^0.1.12"
|
||||
}
|
||||
},
|
||||
"electron-is-dev": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz",
|
||||
@@ -368,7 +457,7 @@
|
||||
"electron-remote": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/electron-remote/-/electron-remote-1.2.0.tgz",
|
||||
"integrity": "sha512-Fo2wnwK2tzd81Ux4pfNhz9DwHBoooZahdWBqOh9HtESYh2jrcsjc6FAibIu2oIOk71T1USyC7OBcqE8BZw3FGQ==",
|
||||
"integrity": "sha1-DwDB04A852URF/b7bydNJnge+b0=",
|
||||
"requires": {
|
||||
"debug": "^2.5.1",
|
||||
"hashids": "^1.1.1",
|
||||
@@ -381,7 +470,7 @@
|
||||
"electron-spellchecker": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/electron-spellchecker/-/electron-spellchecker-1.1.2.tgz",
|
||||
"integrity": "sha512-AdzD/Q82Svk9EDTc65vRr271UPLVIxsruKJM0iwqxEG9Y/CogNhEAJz/asV0BFWom4tpdB6cHcLbYePb11Musw==",
|
||||
"integrity": "sha1-X74eZdJGt35udDPuI4fZ0mAQ96g=",
|
||||
"requires": {
|
||||
"@paulcbetts/cld": "^2.4.6",
|
||||
"@paulcbetts/spellchecker": "^4.0.6",
|
||||
@@ -398,19 +487,19 @@
|
||||
}
|
||||
},
|
||||
"electron-updater": {
|
||||
"version": "2.21.10",
|
||||
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.21.10.tgz",
|
||||
"integrity": "sha512-9QNUGHqwddLFIsFiAoFSxu0NdmvB1VGKrH2dGCn/b8nDwfWwHUyCnetMsnwcVSMjHA2Lz4tGfRSDSN3PtlVDKA==",
|
||||
"version": "2.23.3",
|
||||
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.23.3.tgz",
|
||||
"integrity": "sha512-ZoQZpiEbhT3xA5Oxn7a5o4Z9adRaYs901pnTKBVBxPWmc0Qw5sZXAHkRjftlRmEn3RiEVkJtBPQSfx8kIkRcUA==",
|
||||
"requires": {
|
||||
"bluebird-lst": "^1.0.5",
|
||||
"builder-util-runtime": "~4.2.1",
|
||||
"builder-util-runtime": "~4.4.0",
|
||||
"electron-is-dev": "^0.3.0",
|
||||
"fs-extra-p": "^4.6.0",
|
||||
"js-yaml": "^3.11.0",
|
||||
"fs-extra-p": "^4.6.1",
|
||||
"js-yaml": "^3.12.0",
|
||||
"lazy-val": "^1.0.3",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"semver": "^5.5.0",
|
||||
"source-map-support": "^0.5.5"
|
||||
"source-map-support": "^0.5.6"
|
||||
},
|
||||
"dependencies": {
|
||||
"semver": {
|
||||
@@ -440,6 +529,36 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"encoding": {
|
||||
"version": "0.1.12",
|
||||
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
|
||||
"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
|
||||
"requires": {
|
||||
"iconv-lite": "~0.4.13"
|
||||
}
|
||||
},
|
||||
"es-abstract": {
|
||||
"version": "1.12.0",
|
||||
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
|
||||
"integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
|
||||
"requires": {
|
||||
"es-to-primitive": "^1.1.1",
|
||||
"function-bind": "^1.1.1",
|
||||
"has": "^1.0.1",
|
||||
"is-callable": "^1.1.3",
|
||||
"is-regex": "^1.0.4"
|
||||
}
|
||||
},
|
||||
"es-to-primitive": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
|
||||
"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
|
||||
"requires": {
|
||||
"is-callable": "^1.1.1",
|
||||
"is-date-object": "^1.0.1",
|
||||
"is-symbol": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"escape-html": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
|
||||
@@ -448,12 +567,12 @@
|
||||
"esprima": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
|
||||
"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
|
||||
"integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ="
|
||||
},
|
||||
"event-kit": {
|
||||
"version": "2.4.0",
|
||||
"resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.4.0.tgz",
|
||||
"integrity": "sha512-ZXd9jxUoc/f/zdLdR3OUcCzT84WnpaNWefquLyE125akIC90sDs8S3T/qihliuVsaj7Osc0z8lLL2fjooE9Z4A=="
|
||||
"integrity": "sha1-cYqvIt92ZwAkrWaSJIPhu6BUTzM="
|
||||
},
|
||||
"event-target-shim": {
|
||||
"version": "1.1.1",
|
||||
@@ -481,6 +600,11 @@
|
||||
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
|
||||
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
|
||||
},
|
||||
"foreach": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
|
||||
"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
|
||||
},
|
||||
"forever-agent": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
|
||||
@@ -516,12 +640,12 @@
|
||||
}
|
||||
},
|
||||
"fs-extra-p": {
|
||||
"version": "4.6.0",
|
||||
"resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.0.tgz",
|
||||
"integrity": "sha512-nSVqB5UfWZQdU6pzBwcFh+7lJpBynnTsVtNJTBhAnAppUQRut0W7WeM271iS0TqQ9FoCqDXqyL0+h+h8DQUCpg==",
|
||||
"version": "4.6.1",
|
||||
"resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz",
|
||||
"integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==",
|
||||
"requires": {
|
||||
"bluebird-lst": "^1.0.5",
|
||||
"fs-extra": "^6.0.0"
|
||||
"fs-extra": "^6.0.1"
|
||||
}
|
||||
},
|
||||
"fs.realpath": {
|
||||
@@ -529,6 +653,11 @@
|
||||
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
|
||||
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
|
||||
},
|
||||
"function-bind": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
|
||||
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
|
||||
},
|
||||
"get-stream": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
|
||||
@@ -591,6 +720,14 @@
|
||||
"har-schema": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"has": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
|
||||
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
|
||||
"requires": {
|
||||
"function-bind": "^1.1.1"
|
||||
}
|
||||
},
|
||||
"has-symbol-support-x": {
|
||||
"version": "1.4.2",
|
||||
"resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
|
||||
@@ -607,7 +744,7 @@
|
||||
"hashids": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmjs.org/hashids/-/hashids-1.1.4.tgz",
|
||||
"integrity": "sha512-U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="
|
||||
"integrity": "sha1-5P+SrWa2hKO9aqznwX1mYY7l+iE="
|
||||
},
|
||||
"hawk": {
|
||||
"version": "6.0.2",
|
||||
@@ -640,6 +777,14 @@
|
||||
"sshpk": "^1.7.0"
|
||||
}
|
||||
},
|
||||
"iconv-lite": {
|
||||
"version": "0.4.23",
|
||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
|
||||
"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
|
||||
"requires": {
|
||||
"safer-buffer": ">= 2.1.2 < 3"
|
||||
}
|
||||
},
|
||||
"indent-string": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
|
||||
@@ -678,6 +823,21 @@
|
||||
"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
|
||||
"integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
|
||||
},
|
||||
"is-buffer": {
|
||||
"version": "1.1.6",
|
||||
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
|
||||
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
|
||||
},
|
||||
"is-callable": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
|
||||
"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
|
||||
},
|
||||
"is-date-object": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
|
||||
"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
|
||||
},
|
||||
"is-ip": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz",
|
||||
@@ -712,6 +872,14 @@
|
||||
"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
|
||||
"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
|
||||
},
|
||||
"is-regex": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
|
||||
"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
|
||||
"requires": {
|
||||
"has": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"is-retry-allowed": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
|
||||
@@ -722,6 +890,11 @@
|
||||
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
|
||||
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
|
||||
},
|
||||
"is-symbol": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
|
||||
"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
|
||||
},
|
||||
"is-typedarray": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
|
||||
@@ -747,9 +920,9 @@
|
||||
}
|
||||
},
|
||||
"js-yaml": {
|
||||
"version": "3.11.0",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
|
||||
"integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
|
||||
"version": "3.12.0",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
|
||||
"integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
|
||||
"requires": {
|
||||
"argparse": "^1.0.7",
|
||||
"esprima": "^4.0.0"
|
||||
@@ -803,7 +976,7 @@
|
||||
"keyboard-layout": {
|
||||
"version": "2.0.13",
|
||||
"resolved": "https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz",
|
||||
"integrity": "sha512-WxVc3bBITttHozSyEYPsyr5rN2KQuXtEaXMlQfQjEze1JrkLw30yH/bcNn1IGx48b+tdOdybpnq++JFLU2FaZg==",
|
||||
"integrity": "sha1-W09cJYNeXSIae52ol2YxANiXSH0=",
|
||||
"requires": {
|
||||
"event-kit": "^2.0.0",
|
||||
"nan": "^2.0.0"
|
||||
@@ -820,7 +993,7 @@
|
||||
"lazy-val": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.3.tgz",
|
||||
"integrity": "sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg=="
|
||||
"integrity": "sha1-u5eyAO8AgB2UwxfincbtOeMcXtw="
|
||||
},
|
||||
"lodash.assign": {
|
||||
"version": "4.2.0",
|
||||
@@ -840,7 +1013,7 @@
|
||||
"lowercase-keys": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
|
||||
"integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
|
||||
"integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8="
|
||||
},
|
||||
"lru-cache": {
|
||||
"version": "4.1.3",
|
||||
@@ -851,15 +1024,25 @@
|
||||
"yallist": "^2.1.2"
|
||||
}
|
||||
},
|
||||
"md5": {
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
|
||||
"integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
|
||||
"requires": {
|
||||
"charenc": "~0.0.1",
|
||||
"crypt": "~0.0.1",
|
||||
"is-buffer": "~1.1.1"
|
||||
}
|
||||
},
|
||||
"mime-db": {
|
||||
"version": "1.33.0",
|
||||
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
|
||||
"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
|
||||
"integrity": "sha1-o0kgUKXLm2NFBUHjnZeI0icng9s="
|
||||
},
|
||||
"mime-types": {
|
||||
"version": "2.1.18",
|
||||
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
|
||||
"integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
|
||||
"integrity": "sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g=",
|
||||
"requires": {
|
||||
"mime-db": "~1.33.0"
|
||||
}
|
||||
@@ -872,7 +1055,7 @@
|
||||
"minimatch": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
|
||||
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
|
||||
"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
|
||||
"requires": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
}
|
||||
@@ -898,7 +1081,7 @@
|
||||
"nan": {
|
||||
"version": "2.10.0",
|
||||
"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
|
||||
"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
|
||||
"integrity": "sha1-ltDNYQ69WNS03pzAxoKM2pnHVI8="
|
||||
},
|
||||
"node-json-db": {
|
||||
"version": "0.7.3",
|
||||
@@ -952,6 +1135,20 @@
|
||||
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
|
||||
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
|
||||
},
|
||||
"object-keys": {
|
||||
"version": "1.0.12",
|
||||
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
|
||||
"integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="
|
||||
},
|
||||
"object.getownpropertydescriptors": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
|
||||
"integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
|
||||
"requires": {
|
||||
"define-properties": "^1.1.2",
|
||||
"es-abstract": "^1.5.1"
|
||||
}
|
||||
},
|
||||
"once": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
|
||||
@@ -1112,6 +1309,18 @@
|
||||
"strict-uri-encode": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"raven": {
|
||||
"version": "2.6.3",
|
||||
"resolved": "https://registry.npmjs.org/raven/-/raven-2.6.3.tgz",
|
||||
"integrity": "sha512-bKre7qlDW+y1+G2bUtCuntdDYc8o5v1T233t0vmJfbj8ttGOgLrGRlYB8saelVMW9KUAJNLrhFkAKOwFWFJonw==",
|
||||
"requires": {
|
||||
"cookie": "0.3.1",
|
||||
"md5": "^2.2.1",
|
||||
"stack-trace": "0.0.10",
|
||||
"timed-out": "4.0.1",
|
||||
"uuid": "3.0.0"
|
||||
}
|
||||
},
|
||||
"readable-stream": {
|
||||
"version": "2.3.6",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||
@@ -1158,7 +1367,7 @@
|
||||
"uuid": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
|
||||
"integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
|
||||
"integrity": "sha1-EsUou51Y0LkmXZovbw/ovhf/HxQ="
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -1173,7 +1382,7 @@
|
||||
"rimraf": {
|
||||
"version": "2.6.2",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
|
||||
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
|
||||
"integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
|
||||
"requires": {
|
||||
"glob": "^7.0.5"
|
||||
},
|
||||
@@ -1181,7 +1390,7 @@
|
||||
"glob": {
|
||||
"version": "7.1.2",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
|
||||
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
|
||||
"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
|
||||
"requires": {
|
||||
"fs.realpath": "^1.0.0",
|
||||
"inflight": "^1.0.4",
|
||||
@@ -1196,7 +1405,7 @@
|
||||
"rxjs": {
|
||||
"version": "5.5.8",
|
||||
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz",
|
||||
"integrity": "sha512-Bz7qou7VAIoGiglJZbzbXa4vpX5BmTTN2Dj/se6+SwADtw4SihqBIiEa7VmTXJ8pynvq0iFr5Gx9VLyye1rIxQ==",
|
||||
"integrity": "sha1-srCAmldhStYlTAPXRG3qDYPKN5E=",
|
||||
"requires": {
|
||||
"symbol-observable": "1.0.1"
|
||||
}
|
||||
@@ -1214,15 +1423,20 @@
|
||||
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
|
||||
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
|
||||
},
|
||||
"safer-buffer": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
|
||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
||||
},
|
||||
"sax": {
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
|
||||
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
|
||||
"integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
|
||||
},
|
||||
"semver": {
|
||||
"version": "5.4.1",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
|
||||
"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
|
||||
"integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
|
||||
},
|
||||
"sntp": {
|
||||
"version": "2.1.0",
|
||||
@@ -1243,12 +1457,12 @@
|
||||
"source-map": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
|
||||
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
|
||||
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
|
||||
},
|
||||
"source-map-support": {
|
||||
"version": "0.5.5",
|
||||
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz",
|
||||
"integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==",
|
||||
"version": "0.5.6",
|
||||
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
|
||||
"integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
|
||||
"requires": {
|
||||
"buffer-from": "^1.0.0",
|
||||
"source-map": "^0.6.0"
|
||||
@@ -1257,7 +1471,7 @@
|
||||
"spawn-rx": {
|
||||
"version": "2.0.12",
|
||||
"resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
|
||||
"integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
|
||||
"integrity": "sha1-tihSlEmUJgib7qDDwewy1/xXo3Y=",
|
||||
"requires": {
|
||||
"debug": "^2.5.1",
|
||||
"lodash.assign": "^4.2.0",
|
||||
@@ -1284,6 +1498,11 @@
|
||||
"tweetnacl": "~0.14.0"
|
||||
}
|
||||
},
|
||||
"stack-trace": {
|
||||
"version": "0.0.10",
|
||||
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
|
||||
"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
|
||||
},
|
||||
"strict-uri-encode": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
|
||||
@@ -1315,7 +1534,7 @@
|
||||
"tough-cookie": {
|
||||
"version": "2.3.4",
|
||||
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
|
||||
"integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
|
||||
"integrity": "sha1-7GDO44rGdQY//JelwYlwV47oNlU=",
|
||||
"requires": {
|
||||
"punycode": "^1.4.1"
|
||||
}
|
||||
@@ -1340,9 +1559,9 @@
|
||||
"integrity": "sha512-4IV1DSSxC1QK48j9ONFK1MoIAKKkbE8i7u55w2R6IqBqbT7A/iG7aZBCR2Bi8piF0Uz+i/MG1aeqLwl/5vqF+A=="
|
||||
},
|
||||
"universalify": {
|
||||
"version": "0.1.1",
|
||||
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
|
||||
"integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
|
||||
"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
|
||||
},
|
||||
"untildify": {
|
||||
"version": "3.0.2",
|
||||
@@ -1372,6 +1591,20 @@
|
||||
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
|
||||
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
|
||||
},
|
||||
"util.promisify": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
|
||||
"integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
|
||||
"requires": {
|
||||
"define-properties": "^1.1.2",
|
||||
"object.getownpropertydescriptors": "^2.0.3"
|
||||
}
|
||||
},
|
||||
"uuid": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz",
|
||||
"integrity": "sha1-Zyj8BFnEUNeWqZwxg3VpvfZy1yg="
|
||||
},
|
||||
"verror": {
|
||||
"version": "1.10.0",
|
||||
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "zulip",
|
||||
"productName": "Zulip",
|
||||
"version": "2.3.2",
|
||||
"version": "2.3.4-beta",
|
||||
"description": "Zulip Desktop App",
|
||||
"license": "Apache-2.0",
|
||||
"copyright": "Kandra Labs, Inc.",
|
||||
@@ -27,13 +27,15 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"@electron-elements/send-feedback": "1.0.7",
|
||||
"escape-html": "1.0.3",
|
||||
"@sentry/electron": "0.5.5",
|
||||
"adm-zip": "0.4.11",
|
||||
"auto-launch": "5.0.5",
|
||||
"electron-is-dev": "0.3.0",
|
||||
"electron-log": "2.2.14",
|
||||
"electron-spellchecker": "1.1.2",
|
||||
"electron-updater": "2.21.10",
|
||||
"electron-updater": "2.23.3",
|
||||
"electron-window-state": "4.1.1",
|
||||
"escape-html": "1.0.3",
|
||||
"is-online": "7.0.0",
|
||||
"node-json-db": "0.7.3",
|
||||
"request": "2.85.0",
|
||||
|
||||
@@ -258,8 +258,8 @@ img.server-info-icon {
|
||||
border: #4EBFAC 2px solid;
|
||||
}
|
||||
|
||||
.setting-block {
|
||||
width: 100%;
|
||||
.manual-proxy-block {
|
||||
width: 96%;
|
||||
}
|
||||
|
||||
.actions-container {
|
||||
@@ -364,7 +364,8 @@ i.open-tab-button {
|
||||
}
|
||||
|
||||
.reset-data-button,
|
||||
.custom-css-button {
|
||||
.custom-css-button,
|
||||
.download-folder-button {
|
||||
display: inline-block;
|
||||
border: none;
|
||||
padding: 10px;
|
||||
@@ -384,7 +385,8 @@ i.open-tab-button {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.selected-css-path {
|
||||
.selected-css-path,
|
||||
.download-folder-path {
|
||||
background: #eeeeee;
|
||||
padding: 10px;
|
||||
margin-top: 10px;
|
||||
@@ -557,6 +559,31 @@ input.toggle-round:checked+label:after {
|
||||
background: #329588;
|
||||
}
|
||||
|
||||
.certificates-card {
|
||||
width:70%
|
||||
}
|
||||
|
||||
.certificate-input {
|
||||
width:100%;
|
||||
margin-top: 10px;
|
||||
display:inline-flex;
|
||||
}
|
||||
|
||||
.certificate-input div {
|
||||
align-self:center;
|
||||
}
|
||||
|
||||
.certificate-input .setting-input-value {
|
||||
margin-left:10px;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
#add-certificate-button {
|
||||
width:20%;
|
||||
margin-right:0px;
|
||||
height: 35px;
|
||||
}
|
||||
|
||||
.tip {
|
||||
background-color: hsl(46,63%,95%);
|
||||
border: 1px solid hsl(46,63%,84%);
|
||||
@@ -577,7 +604,8 @@ input.toggle-round:checked+label:after {
|
||||
/* responsive grid */
|
||||
|
||||
@media (max-width: 650px) {
|
||||
.selected-css-path {
|
||||
.selected-css-path,
|
||||
.download-folder-path {
|
||||
margin-right: 15px;
|
||||
}
|
||||
#css-delete-action {
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
const { shell } = require('electron').remote;
|
||||
const { ipcRenderer } = require('electron');
|
||||
const { shell, app } = require('electron').remote;
|
||||
const LinkUtil = require('../utils/link-util');
|
||||
const DomainUtil = require('../utils/domain-util');
|
||||
const ConfigUtil = require('../utils/config-util');
|
||||
|
||||
const dingSound = new Audio('../resources/sounds/ding.ogg');
|
||||
|
||||
function handleExternalLink(event) {
|
||||
const { url } = event;
|
||||
const domainPrefix = DomainUtil.getDomain(this.props.index).url;
|
||||
|
||||
const downloadPath = ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`);
|
||||
// Whitelist URLs which are allowed to be opened in the app
|
||||
const {
|
||||
isInternalUrl: isWhiteListURL,
|
||||
@@ -20,7 +24,30 @@ function handleExternalLink(event) {
|
||||
// and not trigger webview reload while image in webview will
|
||||
// do nothing and will not save it
|
||||
if (!LinkUtil.isImage(url) && isUploadsURL) {
|
||||
this.$el.downloadURL(url);
|
||||
ipcRenderer.send('downloadFile', url, downloadPath);
|
||||
ipcRenderer.once('downloadFileCompleted', (event, filePath, fileName) => {
|
||||
const downloadNotification = new Notification('Download Complete', {
|
||||
body: `Click to open ${fileName}`,
|
||||
silent: true // We'll play our own sound - ding.ogg
|
||||
});
|
||||
|
||||
// Play sound to indicate download complete
|
||||
if (!ConfigUtil.getConfigItem('silent')) {
|
||||
dingSound.play();
|
||||
}
|
||||
|
||||
downloadNotification.onclick = () => {
|
||||
shell.openItem(filePath);
|
||||
};
|
||||
ipcRenderer.removeAllListeners('downloadFileFailed');
|
||||
});
|
||||
|
||||
ipcRenderer.once('downloadFileFailed', () => {
|
||||
// Automatic download failed, so show save dialog prompt and download
|
||||
// through webview
|
||||
this.$el.downloadURL(url);
|
||||
ipcRenderer.removeAllListeners('downloadFileCompleted');
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -75,11 +75,16 @@ class WebView extends BaseComponent {
|
||||
|
||||
this.$el.addEventListener('page-favicon-updated', event => {
|
||||
const { favicons } = event;
|
||||
|
||||
// This returns a string of favicons URL. If there is a PM counts in unread messages then the URL would be like
|
||||
// https://chat.zulip.org/static/images/favicon/favicon-pms.png
|
||||
if (favicons[0].indexOf('favicon-pms') > 0 && process.platform === 'darwin') {
|
||||
// This api is only supported on macOS
|
||||
app.dock.setBadge('●');
|
||||
// bounce the dock
|
||||
if (ConfigUtil.getConfigItem('dockBouncing')) {
|
||||
app.dock.bounce();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
const { ipcRenderer, remote } = require('electron');
|
||||
const isDev = require('electron-is-dev');
|
||||
|
||||
const { session } = remote;
|
||||
const { session, app } = remote;
|
||||
|
||||
require(__dirname + '/js/tray.js');
|
||||
const DomainUtil = require(__dirname + '/js/utils/domain-util.js');
|
||||
@@ -13,8 +13,16 @@ const FunctionalTab = require(__dirname + '/js/components/functional-tab.js');
|
||||
const ConfigUtil = require(__dirname + '/js/utils/config-util.js');
|
||||
const DNDUtil = require(__dirname + '/js/utils/dnd-util.js');
|
||||
const ReconnectUtil = require(__dirname + '/js/utils/reconnect-util.js');
|
||||
const Logger = require(__dirname + '/js/utils/logger-util.js');
|
||||
const { feedbackHolder } = require(__dirname + '/js/feedback.js');
|
||||
|
||||
const escape = require('escape-html');
|
||||
|
||||
const logger = new Logger({
|
||||
file: 'errors.log',
|
||||
timestamp: true
|
||||
});
|
||||
|
||||
class ServerManagerView {
|
||||
constructor() {
|
||||
this.$addServerButton = document.getElementById('add-tab');
|
||||
@@ -58,7 +66,17 @@ class ServerManagerView {
|
||||
|
||||
loadProxy() {
|
||||
return new Promise(resolve => {
|
||||
const proxyEnabled = ConfigUtil.getConfigItem('useProxy', false);
|
||||
// To change proxyEnable to useManualProxy in older versions
|
||||
const proxyEnabledOld = ConfigUtil.isConfigItemExists('useProxy');
|
||||
if (proxyEnabledOld) {
|
||||
const proxyEnableOldState = ConfigUtil.getConfigItem('useProxy');
|
||||
if (proxyEnableOldState) {
|
||||
ConfigUtil.setConfigItem('useManualProxy', true);
|
||||
}
|
||||
ConfigUtil.removeConfigItem('useProxy');
|
||||
}
|
||||
|
||||
const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
|
||||
if (proxyEnabled) {
|
||||
session.fromPartition('persist:webviewsession').setProxy({
|
||||
pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
|
||||
@@ -82,7 +100,8 @@ class ServerManagerView {
|
||||
// Default settings which should be respected
|
||||
const settingOptions = {
|
||||
trayIcon: true,
|
||||
useProxy: false,
|
||||
useManualProxy: false,
|
||||
useSystemProxy: false,
|
||||
showSidebar: true,
|
||||
badgeOption: true,
|
||||
startAtLogin: false,
|
||||
@@ -97,7 +116,8 @@ class ServerManagerView {
|
||||
dndPreviousSettings: {
|
||||
showNotification: true,
|
||||
silent: false
|
||||
}
|
||||
},
|
||||
downloadsPath: `${app.getPath('downloads')}`
|
||||
};
|
||||
|
||||
// Platform specific settings
|
||||
@@ -108,6 +128,11 @@ class ServerManagerView {
|
||||
settingOptions.dndPreviousSettings.flashTaskbarOnMessage = true;
|
||||
}
|
||||
|
||||
if (process.platform === 'darwin') {
|
||||
// Only available on macOS
|
||||
settingOptions.dockBouncing = true;
|
||||
}
|
||||
|
||||
for (const i in settingOptions) {
|
||||
if (ConfigUtil.getConfigItem(i) === null) {
|
||||
ConfigUtil.setConfigItem(i, settingOptions[i]);
|
||||
@@ -227,7 +252,7 @@ class ServerManagerView {
|
||||
}
|
||||
|
||||
onHover(index, serverName) {
|
||||
this.$serverIconTooltip[index].innerText = serverName;
|
||||
this.$serverIconTooltip[index].innerHTML = escape(serverName);
|
||||
this.$serverIconTooltip[index].removeAttribute('style');
|
||||
// To handle position of servers' tooltip due to scrolling of list of organizations
|
||||
// This could not be handled using CSS, hence the top of the tooltip is made same
|
||||
@@ -495,6 +520,7 @@ class ServerManagerView {
|
||||
this.loadProxy().then(() => {
|
||||
if (showAlert) {
|
||||
alert('Proxy settings saved!');
|
||||
ipcRenderer.send('reload-full-app');
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -569,7 +595,7 @@ window.onload = () => {
|
||||
|
||||
window.addEventListener('offline', () => {
|
||||
reconnectUtil.clearState();
|
||||
console.log('No internet connection, you are offline.');
|
||||
logger.log('No internet connection, you are offline.');
|
||||
});
|
||||
|
||||
// only start electron-connect (auto reload on change) when its ran
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
const { remote } = require('electron');
|
||||
const Logger = require('../utils/logger-util.js');
|
||||
|
||||
const logger = new Logger({
|
||||
file: 'errors.log',
|
||||
timestamp: true
|
||||
});
|
||||
|
||||
// Do not change this
|
||||
const appId = 'org.zulip.zulip-electron';
|
||||
@@ -28,8 +34,8 @@ function loadBots(sync = false) {
|
||||
botsListLoaded = true;
|
||||
})
|
||||
.fail(error => {
|
||||
console.log('Request failed: ', error.responseText);
|
||||
console.log('Request status: ', error.statusText);
|
||||
logger.log('Load bots request failed: ', error.responseText);
|
||||
logger.log('Load bots request status: ', error.statusText);
|
||||
});
|
||||
if (sync) {
|
||||
$.ajaxSetup({async: true});
|
||||
|
||||
91
app/renderer/js/pages/preference/add-certificate.js
Normal file
91
app/renderer/js/pages/preference/add-certificate.js
Normal file
@@ -0,0 +1,91 @@
|
||||
'use-strict';
|
||||
|
||||
const { dialog } = require('electron').remote;
|
||||
|
||||
const BaseComponent = require(__dirname + '/../../components/base.js');
|
||||
const CertificateUtil = require(__dirname + '/../../utils/certificate-util.js');
|
||||
const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
|
||||
|
||||
class AddCertificate extends BaseComponent {
|
||||
constructor(props) {
|
||||
super();
|
||||
this.props = props;
|
||||
this._certFile = '';
|
||||
}
|
||||
|
||||
template() {
|
||||
return `
|
||||
<div class="settings-card server-center certificates-card">
|
||||
<div class="certificate-input">
|
||||
<div>Organization URL :</div>
|
||||
<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
|
||||
</div>
|
||||
<div class="certificate-input">
|
||||
<div>Custom CA's certificate file :</div>
|
||||
<button id="add-certificate-button">Add</button>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
init() {
|
||||
this.$addCertificate = this.generateNodeFromTemplate(this.template());
|
||||
this.props.$root.appendChild(this.$addCertificate);
|
||||
this.addCertificateButton = this.$addCertificate.querySelector('#add-certificate-button');
|
||||
this.serverUrl = this.$addCertificate.querySelectorAll('input.setting-input-value')[0];
|
||||
this.initListeners();
|
||||
}
|
||||
|
||||
validateAndAdd() {
|
||||
const certificate = this._certFile;
|
||||
const serverUrl = this.serverUrl.value;
|
||||
if (certificate !== '' && serverUrl !== '') {
|
||||
const server = encodeURIComponent(DomainUtil.formatUrl(serverUrl));
|
||||
const fileName = certificate.substring(certificate.lastIndexOf('/') + 1);
|
||||
const copy = CertificateUtil.copyCertificate(server, certificate, fileName);
|
||||
if (!copy) {
|
||||
return;
|
||||
}
|
||||
CertificateUtil.setCertificate(server, fileName);
|
||||
dialog.showMessageBox({
|
||||
title: 'Success',
|
||||
message: `Certificate saved!`
|
||||
});
|
||||
this.serverUrl.value = '';
|
||||
} else {
|
||||
dialog.showErrorBox('Error', `Please, ${serverUrl === '' ?
|
||||
'Enter an Organization URL' : 'Choose certificate file'}`);
|
||||
}
|
||||
}
|
||||
|
||||
addHandler() {
|
||||
const showDialogOptions = {
|
||||
title: 'Select file',
|
||||
defaultId: 1,
|
||||
properties: ['openFile'],
|
||||
filters: [{ name: 'crt, pem', extensions: ['crt', 'pem'] }]
|
||||
};
|
||||
dialog.showOpenDialog(showDialogOptions, selectedFile => {
|
||||
if (selectedFile) {
|
||||
this._certFile = selectedFile[0] || '';
|
||||
this.validateAndAdd();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
initListeners() {
|
||||
this.addCertificateButton.addEventListener('click', () => {
|
||||
this.addHandler();
|
||||
});
|
||||
|
||||
this.serverUrl.addEventListener('keypress', event => {
|
||||
const EnterkeyCode = event.keyCode;
|
||||
|
||||
if (EnterkeyCode === 13) {
|
||||
this.addHandler();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = AddCertificate;
|
||||
@@ -3,6 +3,7 @@
|
||||
const BaseSection = require(__dirname + '/base-section.js');
|
||||
const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
|
||||
const ServerInfoForm = require(__dirname + '/server-info-form.js');
|
||||
const AddCertificate = require(__dirname + '/add-certificate.js');
|
||||
|
||||
class ConnectedOrgSection extends BaseSection {
|
||||
constructor(props) {
|
||||
@@ -16,6 +17,9 @@ class ConnectedOrgSection extends BaseSection {
|
||||
<div class="page-title">Connected organizations</div>
|
||||
<div class="title" id="existing-servers">All the connected orgnizations will appear here.</div>
|
||||
<div id="server-info-container"></div>
|
||||
|
||||
<div class="page-title">Add Custom Certificates</div>
|
||||
<div id="add-certificate-container"></div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
@@ -44,6 +48,15 @@ class ConnectedOrgSection extends BaseSection {
|
||||
onChange: this.reloadApp
|
||||
}).init();
|
||||
}
|
||||
|
||||
this.$addCertificateContainer = document.getElementById('add-certificate-container');
|
||||
this.initAddCertificate();
|
||||
}
|
||||
|
||||
initAddCertificate() {
|
||||
new AddCertificate({
|
||||
$root: this.$addCertificateContainer
|
||||
}).init();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -31,6 +31,10 @@ class GeneralSection extends BaseSection {
|
||||
<div class="setting-description">Show app unread badge</div>
|
||||
<div class="setting-control"></div>
|
||||
</div>
|
||||
<div class="setting-row" id="dock-bounce-option" style= "display:${process.platform === 'darwin' ? '' : 'none'}">
|
||||
<div class="setting-description">Bounce dock on new private message</div>
|
||||
<div class="setting-control"></div>
|
||||
</div>
|
||||
<div class="setting-row" id="flash-taskbar-option" style= "display:${process.platform === 'win32' ? '' : 'none'}">
|
||||
<div class="setting-description">Flash taskbar on new message</div>
|
||||
<div class="setting-control"></div>
|
||||
@@ -91,6 +95,20 @@ class GeneralSection extends BaseSection {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="title">Advanced</div>
|
||||
<div class="settings-card">
|
||||
<div class="setting-row" id="download-folder">
|
||||
<div class="setting-description">
|
||||
Default download location
|
||||
</div>
|
||||
<button class="download-folder-button blue">Choose</button>
|
||||
</div>
|
||||
<div class="setting-row">
|
||||
<div class="setting-description">
|
||||
<div class="download-folder-path">${ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`)}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="title">Reset Application Data</div>
|
||||
<div class="settings-card">
|
||||
<div class="setting-row" id="resetdata-option">
|
||||
@@ -119,12 +137,18 @@ class GeneralSection extends BaseSection {
|
||||
this.addCustomCSS();
|
||||
this.showCustomCSSPath();
|
||||
this.removeCustomCSS();
|
||||
this.downloadFolder();
|
||||
|
||||
// Platform specific settings
|
||||
|
||||
// Flashing taskbar on Windows
|
||||
if (process.platform === 'win32') {
|
||||
this.updateFlashTaskbar();
|
||||
}
|
||||
// Dock bounce on macOS
|
||||
if (process.platform === 'darwin') {
|
||||
this.updateDockBouncing();
|
||||
}
|
||||
}
|
||||
|
||||
updateTrayOption() {
|
||||
@@ -153,6 +177,18 @@ class GeneralSection extends BaseSection {
|
||||
});
|
||||
}
|
||||
|
||||
updateDockBouncing() {
|
||||
this.generateSettingOption({
|
||||
$element: document.querySelector('#dock-bounce-option .setting-control'),
|
||||
value: ConfigUtil.getConfigItem('dockBouncing', true),
|
||||
clickHandler: () => {
|
||||
const newValue = !ConfigUtil.getConfigItem('dockBouncing');
|
||||
ConfigUtil.setConfigItem('dockBouncing', newValue);
|
||||
this.updateDockBouncing();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
updateFlashTaskbar() {
|
||||
this.generateSettingOption({
|
||||
$element: document.querySelector('#flash-taskbar-option .setting-control'),
|
||||
@@ -327,6 +363,28 @@ class GeneralSection extends BaseSection {
|
||||
});
|
||||
}
|
||||
|
||||
downloadFolderDialog() {
|
||||
const showDialogOptions = {
|
||||
title: 'Select Download Location',
|
||||
defaultId: 1,
|
||||
properties: ['openDirectory']
|
||||
};
|
||||
|
||||
dialog.showOpenDialog(showDialogOptions, selectedFolder => {
|
||||
if (selectedFolder) {
|
||||
ConfigUtil.setConfigItem('downloadsPath', selectedFolder[0]);
|
||||
const downloadFolderPath = document.querySelector('.download-folder-path');
|
||||
downloadFolderPath.innerText = selectedFolder[0];
|
||||
}
|
||||
});
|
||||
}
|
||||
downloadFolder() {
|
||||
const downloadFolder = document.querySelector('#download-folder .download-folder-button');
|
||||
downloadFolder.addEventListener('click', () => {
|
||||
this.downloadFolderDialog();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = GeneralSection;
|
||||
|
||||
@@ -16,11 +16,15 @@ class NetworkSection extends BaseSection {
|
||||
<div class="settings-pane">
|
||||
<div class="title">Proxy</div>
|
||||
<div id="appearance-option-settings" class="settings-card">
|
||||
<div class="setting-row" id="use-proxy-option">
|
||||
<div class="setting-description">Connect servers through a proxy</div>
|
||||
<div class="setting-row" id="use-system-settings">
|
||||
<div class="setting-description">Use system proxy settings (requires restart)</div>
|
||||
<div class="setting-control"></div>
|
||||
</div>
|
||||
<div class="setting-block">
|
||||
<div class="setting-row" id="use-manual-settings">
|
||||
<div class="setting-description">Manual proxy configuration</div>
|
||||
<div class="setting-control"></div>
|
||||
</div>
|
||||
<div class="manual-proxy-block">
|
||||
<div class="setting-row" id="proxy-pac-option">
|
||||
<span class="setting-input-key">PAC script</span>
|
||||
<input class="setting-input-value" placeholder="e.g. foobar.com/pacfile.js"/>
|
||||
@@ -51,7 +55,7 @@ class NetworkSection extends BaseSection {
|
||||
this.$proxyRules = document.querySelector('#proxy-rules-option .setting-input-value');
|
||||
this.$proxyBypass = document.querySelector('#proxy-bypass-option .setting-input-value');
|
||||
this.$proxySaveAction = document.getElementById('proxy-save-action');
|
||||
this.$settingBlock = this.props.$root.querySelector('.setting-block');
|
||||
this.$manualProxyBlock = this.props.$root.querySelector('.manual-proxy-block');
|
||||
this.initProxyOption();
|
||||
|
||||
this.$proxyPAC.value = ConfigUtil.getConfigItem('proxyPAC', '');
|
||||
@@ -68,31 +72,54 @@ class NetworkSection extends BaseSection {
|
||||
}
|
||||
|
||||
initProxyOption() {
|
||||
const proxyEnabled = ConfigUtil.getConfigItem('useProxy', false);
|
||||
this.toggleProxySettings(proxyEnabled);
|
||||
const manualProxyEnabled = ConfigUtil.getConfigItem('useManualProxy', false);
|
||||
this.toggleManualProxySettings(manualProxyEnabled);
|
||||
|
||||
this.updateProxyOption();
|
||||
}
|
||||
|
||||
toggleProxySettings(option) {
|
||||
toggleManualProxySettings(option) {
|
||||
if (option) {
|
||||
this.$settingBlock.classList.remove('hidden');
|
||||
this.$manualProxyBlock.classList.remove('hidden');
|
||||
} else {
|
||||
this.$settingBlock.classList.add('hidden');
|
||||
this.$manualProxyBlock.classList.add('hidden');
|
||||
}
|
||||
}
|
||||
|
||||
updateProxyOption() {
|
||||
this.generateSettingOption({
|
||||
$element: document.querySelector('#use-proxy-option .setting-control'),
|
||||
value: ConfigUtil.getConfigItem('useProxy', false),
|
||||
$element: document.querySelector('#use-system-settings .setting-control'),
|
||||
value: ConfigUtil.getConfigItem('useSystemProxy', false),
|
||||
clickHandler: () => {
|
||||
const newValue = !ConfigUtil.getConfigItem('useProxy');
|
||||
ConfigUtil.setConfigItem('useProxy', newValue);
|
||||
this.toggleProxySettings(newValue);
|
||||
if (newValue === false) {
|
||||
// Reload proxy if the proxy is turned off
|
||||
ipcRenderer.send('forward-message', 'reload-proxy', false);
|
||||
const newValue = !ConfigUtil.getConfigItem('useSystemProxy');
|
||||
const manualProxyValue = ConfigUtil.getConfigItem('useManualProxy');
|
||||
if (manualProxyValue && newValue) {
|
||||
ConfigUtil.setConfigItem('useManualProxy', !manualProxyValue);
|
||||
this.toggleManualProxySettings(!manualProxyValue);
|
||||
}
|
||||
if (newValue === false) {
|
||||
// Remove proxy system proxy settings
|
||||
ConfigUtil.setConfigItem('proxyRules', '');
|
||||
ipcRenderer.send('forward-message', 'reload-proxy', true);
|
||||
}
|
||||
ConfigUtil.setConfigItem('useSystemProxy', newValue);
|
||||
this.updateProxyOption();
|
||||
}
|
||||
});
|
||||
this.generateSettingOption({
|
||||
$element: document.querySelector('#use-manual-settings .setting-control'),
|
||||
value: ConfigUtil.getConfigItem('useManualProxy', false),
|
||||
clickHandler: () => {
|
||||
const newValue = !ConfigUtil.getConfigItem('useManualProxy');
|
||||
const systemProxyValue = ConfigUtil.getConfigItem('useSystemProxy');
|
||||
this.toggleManualProxySettings(newValue);
|
||||
if (systemProxyValue && newValue) {
|
||||
ConfigUtil.setConfigItem('useSystemProxy', !systemProxyValue);
|
||||
}
|
||||
ConfigUtil.setConfigItem('proxyRules', '');
|
||||
ConfigUtil.setConfigItem('useManualProxy', newValue);
|
||||
// Reload app only when turning manual proxy off, hence !newValue
|
||||
ipcRenderer.send('forward-message', 'reload-proxy', !newValue);
|
||||
this.updateProxyOption();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
'use strict';
|
||||
|
||||
const { ipcRenderer } = require('electron');
|
||||
const { ipcRenderer, shell } = require('electron');
|
||||
const SetupSpellChecker = require('./spellchecker');
|
||||
|
||||
const ConfigUtil = require(__dirname + '/utils/config-util.js');
|
||||
@@ -71,6 +71,11 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
// prevent the message compose dialog from happening.
|
||||
e.stopPropagation();
|
||||
|
||||
// Open image in the default browser if image preview is unavailable
|
||||
if (!$img[0]) {
|
||||
shell.openExternal(window.location.origin + url);
|
||||
}
|
||||
// Open image in lightbox
|
||||
lightbox.open($img);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -3,6 +3,12 @@
|
||||
const { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } = require('electron-spellchecker');
|
||||
|
||||
const ConfigUtil = require(__dirname + '/utils/config-util.js');
|
||||
const Logger = require(__dirname + '/utils/logger-util.js');
|
||||
|
||||
const logger = new Logger({
|
||||
file: 'errors.log',
|
||||
timestamp: true
|
||||
});
|
||||
|
||||
class SetupSpellChecker {
|
||||
init() {
|
||||
@@ -16,7 +22,7 @@ class SetupSpellChecker {
|
||||
try {
|
||||
this.SpellCheckHandler = new SpellCheckHandler();
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
logger.error(err);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
86
app/renderer/js/utils/certificate-util.js
Normal file
86
app/renderer/js/utils/certificate-util.js
Normal file
@@ -0,0 +1,86 @@
|
||||
'use strict';
|
||||
|
||||
const { app, dialog } = require('electron').remote;
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const JsonDB = require('node-json-db');
|
||||
const Logger = require('./logger-util');
|
||||
const { initSetUp } = require('./default-util');
|
||||
|
||||
initSetUp();
|
||||
|
||||
const logger = new Logger({
|
||||
file: `certificate-util.log`,
|
||||
timestamp: true
|
||||
});
|
||||
|
||||
let instance = null;
|
||||
const certificatesDir = `${app.getPath('userData')}/certificates`;
|
||||
|
||||
class CertificateUtil {
|
||||
constructor() {
|
||||
if (instance) {
|
||||
return instance;
|
||||
} else {
|
||||
instance = this;
|
||||
}
|
||||
|
||||
this.reloadDB();
|
||||
return instance;
|
||||
}
|
||||
getCertificate(server, defaultValue = null) {
|
||||
this.reloadDB();
|
||||
const value = this.db.getData('/')[server];
|
||||
if (value === undefined) {
|
||||
return defaultValue;
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
// Function to copy the certificate to userData folder
|
||||
copyCertificate(server, location, fileName) {
|
||||
let copied = false;
|
||||
const filePath = `${certificatesDir}/${fileName}`;
|
||||
try {
|
||||
fs.copyFileSync(location, filePath);
|
||||
copied = true;
|
||||
} catch (err) {
|
||||
dialog.showErrorBox(
|
||||
'Error saving certificate',
|
||||
'We encountered error while saving the certificate.'
|
||||
);
|
||||
logger.error('Error while copying the certificate to certificates folder.');
|
||||
logger.error(err);
|
||||
}
|
||||
return copied;
|
||||
}
|
||||
setCertificate(server, fileName) {
|
||||
const filePath = `${certificatesDir}/${fileName}`;
|
||||
this.db.push(`/${server}`, filePath, true);
|
||||
this.reloadDB();
|
||||
}
|
||||
removeCertificate(server) {
|
||||
this.db.delete(`/${server}`);
|
||||
this.reloadDB();
|
||||
}
|
||||
reloadDB() {
|
||||
const settingsJsonPath = path.join(app.getPath('userData'), '/config/certificates.json');
|
||||
try {
|
||||
const file = fs.readFileSync(settingsJsonPath, 'utf8');
|
||||
JSON.parse(file);
|
||||
} catch (err) {
|
||||
if (fs.existsSync(settingsJsonPath)) {
|
||||
fs.unlinkSync(settingsJsonPath);
|
||||
dialog.showErrorBox(
|
||||
'Error saving settings',
|
||||
'We encountered error while saving the certificate.'
|
||||
);
|
||||
logger.error('Error while JSON parsing certificates.json: ');
|
||||
logger.error(err);
|
||||
}
|
||||
}
|
||||
this.db = new JsonDB(settingsJsonPath, true, true);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = new CertificateUtil();
|
||||
@@ -48,6 +48,12 @@ class ConfigUtil {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
// This function returns whether a key exists in the configuration file (settings.json)
|
||||
isConfigItemExists(key) {
|
||||
this.reloadDB();
|
||||
const value = this.db.getData('/')[key];
|
||||
return (value !== undefined);
|
||||
}
|
||||
|
||||
setConfigItem(key, value) {
|
||||
this.db.push(`/${key}`, value, true);
|
||||
@@ -60,7 +66,7 @@ class ConfigUtil {
|
||||
}
|
||||
|
||||
reloadDB() {
|
||||
const settingsJsonPath = path.join(app.getPath('userData'), '/settings.json');
|
||||
const settingsJsonPath = path.join(app.getPath('userData'), '/config/settings.json');
|
||||
try {
|
||||
const file = fs.readFileSync(settingsJsonPath, 'utf8');
|
||||
JSON.parse(file);
|
||||
@@ -69,10 +75,11 @@ class ConfigUtil {
|
||||
fs.unlinkSync(settingsJsonPath);
|
||||
dialog.showErrorBox(
|
||||
'Error saving settings',
|
||||
'We encountered error while saving current settings.'
|
||||
'We encountered an error while saving the settings.'
|
||||
);
|
||||
logger.error('Error while JSON parsing settings.json: ');
|
||||
logger.error(err);
|
||||
logger.reportSentry(err);
|
||||
}
|
||||
}
|
||||
this.db = new JsonDB(settingsJsonPath, true, true);
|
||||
|
||||
@@ -10,6 +10,8 @@ if (process.type === 'renderer') {
|
||||
|
||||
const zulipDir = app.getPath('userData');
|
||||
const logDir = `${zulipDir}/Logs/`;
|
||||
const certificatesDir = `${zulipDir}/certificates/`;
|
||||
const configDir = `${zulipDir}/config/`;
|
||||
const initSetUp = () => {
|
||||
// if it is the first time the app is running
|
||||
// create zulip dir in userData folder to
|
||||
@@ -22,6 +24,51 @@ const initSetUp = () => {
|
||||
if (!fs.existsSync(logDir)) {
|
||||
fs.mkdirSync(logDir);
|
||||
}
|
||||
|
||||
if (!fs.existsSync(certificatesDir)) {
|
||||
fs.mkdirSync(certificatesDir);
|
||||
}
|
||||
|
||||
// Migrate config files from app data folder to config folder inside app
|
||||
// data folder. This will be done once when a user updates to the new version.
|
||||
if (!fs.existsSync(configDir)) {
|
||||
fs.mkdirSync(configDir);
|
||||
const domainJson = `${zulipDir}/domain.json`;
|
||||
const certificatesJson = `${zulipDir}/certificates.json`;
|
||||
const settingsJson = `${zulipDir}/settings.json`;
|
||||
const updatesJson = `${zulipDir}/updates.json`;
|
||||
const windowStateJson = `${zulipDir}/window-state.json`;
|
||||
const configData = [
|
||||
{
|
||||
path: domainJson,
|
||||
fileName: `domain.json`
|
||||
},
|
||||
{
|
||||
path: certificatesJson,
|
||||
fileName: `certificates.json`
|
||||
},
|
||||
{
|
||||
path: settingsJson,
|
||||
fileName: `settings.json`
|
||||
},
|
||||
{
|
||||
path: updatesJson,
|
||||
fileName: `updates.json`
|
||||
}
|
||||
];
|
||||
configData.forEach(data => {
|
||||
if (fs.existsSync(data.path)) {
|
||||
fs.copyFileSync(data.path, configDir + data.fileName);
|
||||
fs.unlinkSync(data.path);
|
||||
}
|
||||
});
|
||||
// window-state.json is only deleted not moved, as the electron-window-state
|
||||
// package will recreate the file in the config folder.
|
||||
if (fs.existsSync(windowStateJson)) {
|
||||
fs.unlinkSync(windowStateJson);
|
||||
}
|
||||
}
|
||||
|
||||
setupCompleted = true;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -9,6 +9,8 @@ const escape = require('escape-html');
|
||||
|
||||
const Logger = require('./logger-util');
|
||||
|
||||
const CertificateUtil = require(__dirname + '/certificate-util.js');
|
||||
|
||||
const logger = new Logger({
|
||||
file: `domain-util.log`,
|
||||
timestamp: true
|
||||
@@ -106,7 +108,19 @@ class DomainUtil {
|
||||
|
||||
domain = this.formatUrl(domain);
|
||||
|
||||
const checkDomain = domain + '/static/audio/zulip.ogg';
|
||||
const certificate = CertificateUtil.getCertificate(encodeURIComponent(domain));
|
||||
let certificateLocation = '';
|
||||
|
||||
if (certificate) {
|
||||
// To handle case where certificate has been moved from the location in certificates.json
|
||||
try {
|
||||
certificateLocation = fs.readFileSync(certificate);
|
||||
} catch (err) {
|
||||
logger.warn('Error while trying to get certificate: ' + err);
|
||||
}
|
||||
}
|
||||
// If certificate for the domain exists add it as a ca key in the request's parameter else consider only domain as the parameter for request
|
||||
const checkDomain = (certificateLocation) ? ({url: domain + '/static/audio/zulip.ogg', ca: certificateLocation}) : domain + '/static/audio/zulip.ogg';
|
||||
|
||||
const serverConf = {
|
||||
icon: defaultIconUrl,
|
||||
@@ -116,21 +130,16 @@ class DomainUtil {
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
request(checkDomain, (error, response) => {
|
||||
const certsError =
|
||||
[
|
||||
'Error: self signed certificate',
|
||||
'Error: unable to verify the first certificate',
|
||||
'Error: unable to get local issuer certificate'
|
||||
];
|
||||
|
||||
// If the domain contains following strings we just bypass the server
|
||||
const whitelistDomains = [
|
||||
'zulipdev.org'
|
||||
];
|
||||
|
||||
// make sure that error is a error or string not undefined
|
||||
// make sure that error is an error or string not undefined
|
||||
// so validation does not throw error.
|
||||
error = error || '';
|
||||
|
||||
const certsError = error.toString().includes('certificate');
|
||||
if (!error && response.statusCode < 400) {
|
||||
// Correct
|
||||
this.getServerSettings(domain).then(serverSettings => {
|
||||
@@ -138,7 +147,7 @@ class DomainUtil {
|
||||
}, () => {
|
||||
resolve(serverConf);
|
||||
});
|
||||
} else if (domain.indexOf(whitelistDomains) >= 0 || certsError.indexOf(error.toString()) >= 0) {
|
||||
} else if (domain.indexOf(whitelistDomains) >= 0 || certsError) {
|
||||
if (silent) {
|
||||
this.getServerSettings(domain).then(serverSettings => {
|
||||
resolve(serverSettings);
|
||||
@@ -146,15 +155,19 @@ class DomainUtil {
|
||||
resolve(serverConf);
|
||||
});
|
||||
} else {
|
||||
// Report error to sentry to get idea of possible certificate errors
|
||||
// users get when adding the servers
|
||||
logger.reportSentry(new Error(error));
|
||||
const certErrorMessage = `Do you trust certificate from ${domain}? \n ${error}`;
|
||||
const certErrorDetail = `The server you're connecting to is either someone impersonating the Zulip server you entered, or the server you're trying to connect to is configured in an insecure way.
|
||||
\n Unless you have a good reason to believe otherwise, you should not proceed.
|
||||
\n You can click here if you'd like to proceed with the connection.`;
|
||||
const certErrorDetail = `The organization you're connecting to is either someone impersonating the Zulip server you entered, or the server you're trying to connect to is configured in an insecure way.
|
||||
\nIf you have a valid certificate please add it from Settings>Organizations and try to add the organization again.
|
||||
\nUnless you have a good reason to believe otherwise, you should not proceed.
|
||||
\nYou can click here if you'd like to proceed with the connection.`;
|
||||
|
||||
dialog.showMessageBox({
|
||||
type: 'warning',
|
||||
buttons: ['Yes', 'No'],
|
||||
defaultId: 0,
|
||||
defaultId: 1,
|
||||
message: certErrorMessage,
|
||||
detail: certErrorDetail
|
||||
}, response => {
|
||||
@@ -171,7 +184,8 @@ class DomainUtil {
|
||||
}
|
||||
} else {
|
||||
const invalidZulipServerError = `${domain} does not appear to be a valid Zulip server. Make sure that \
|
||||
\n(1) you can connect to that URL in a web browser and \n (2) if you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings \n (3) its a zulip server`;
|
||||
\n (1) you can connect to that URL in a web browser and \n (2) if you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings \n (3) its a zulip server \
|
||||
\n (4) the server has a valid certificate, you can add custom certificates in Settings>Organizations`;
|
||||
reject(invalidZulipServerError);
|
||||
}
|
||||
});
|
||||
@@ -208,18 +222,24 @@ class DomainUtil {
|
||||
try {
|
||||
request(url).on('response', response => {
|
||||
response.on('error', err => {
|
||||
console.log(err);
|
||||
logger.log('Could not get server icon.');
|
||||
logger.log(err);
|
||||
logger.reportSentry(err);
|
||||
resolve(defaultIconUrl);
|
||||
});
|
||||
response.pipe(file).on('finish', () => {
|
||||
resolve(filePath);
|
||||
});
|
||||
}).on('error', err => {
|
||||
console.log(err);
|
||||
logger.log('Could not get server icon.');
|
||||
logger.log(err);
|
||||
logger.reportSentry(err);
|
||||
resolve(defaultIconUrl);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
logger.log('Could not get server icon.');
|
||||
logger.log(err);
|
||||
logger.reportSentry(err);
|
||||
resolve(defaultIconUrl);
|
||||
}
|
||||
});
|
||||
@@ -237,7 +257,7 @@ class DomainUtil {
|
||||
}
|
||||
|
||||
reloadDB() {
|
||||
const domainJsonPath = path.join(app.getPath('userData'), '/domain.json');
|
||||
const domainJsonPath = path.join(app.getPath('userData'), 'config/domain.json');
|
||||
try {
|
||||
const file = fs.readFileSync(domainJsonPath, 'utf8');
|
||||
JSON.parse(file);
|
||||
@@ -251,6 +271,7 @@ class DomainUtil {
|
||||
);
|
||||
logger.error('Error while JSON parsing domain.json: ');
|
||||
logger.error(err);
|
||||
logger.reportSentry(err);
|
||||
}
|
||||
}
|
||||
this.db = new JsonDB(domainJsonPath, true, true);
|
||||
|
||||
@@ -52,7 +52,7 @@ class LinuxUpdateUtil {
|
||||
}
|
||||
|
||||
reloadDB() {
|
||||
const linuxUpdateJsonPath = path.join(app.getPath('userData'), '/updates.json');
|
||||
const linuxUpdateJsonPath = path.join(app.getPath('userData'), '/config/updates.json');
|
||||
try {
|
||||
const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
|
||||
JSON.parse(file);
|
||||
@@ -61,7 +61,7 @@ class LinuxUpdateUtil {
|
||||
fs.unlinkSync(linuxUpdateJsonPath);
|
||||
dialog.showErrorBox(
|
||||
'Error saving update notifications.',
|
||||
'We encountered error while saving update notifications.'
|
||||
'We encountered an error while saving the update notifications.'
|
||||
);
|
||||
logger.error('Error while JSON parsing updates.json: ');
|
||||
logger.error(err);
|
||||
|
||||
@@ -2,8 +2,10 @@ const NodeConsole = require('console').Console;
|
||||
const fs = require('fs');
|
||||
const isDev = require('electron-is-dev');
|
||||
const { initSetUp } = require('./default-util');
|
||||
const { sentryInit, captureException } = require('./sentry-util');
|
||||
|
||||
initSetUp();
|
||||
sentryInit();
|
||||
let app = null;
|
||||
if (process.type === 'renderer') {
|
||||
app = require('electron').remote.app;
|
||||
@@ -82,6 +84,10 @@ class Logger {
|
||||
`${date.getMinutes()}:${date.getSeconds()}`;
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
reportSentry(err) {
|
||||
captureException(err);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Logger;
|
||||
|
||||
96
app/renderer/js/utils/proxy-util.js
Normal file
96
app/renderer/js/utils/proxy-util.js
Normal file
@@ -0,0 +1,96 @@
|
||||
'use strict';
|
||||
|
||||
const ConfigUtil = require('./config-util.js');
|
||||
|
||||
let instance = null;
|
||||
|
||||
class ProxyUtil {
|
||||
constructor() {
|
||||
if (instance) {
|
||||
return instance;
|
||||
} else {
|
||||
instance = this;
|
||||
}
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
resolveSystemProxy(mainWindow) {
|
||||
const page = mainWindow.webContents;
|
||||
const ses = page.session;
|
||||
const resolveProxyUrl = 'www.google.com';
|
||||
|
||||
// Check HTTP Proxy
|
||||
const httpProxy = new Promise(resolve => {
|
||||
ses.resolveProxy('http://' + resolveProxyUrl, proxy => {
|
||||
let httpString = '';
|
||||
if (proxy !== 'DIRECT') {
|
||||
// in case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
|
||||
// for all other HTTP or direct url:port both uses PROXY
|
||||
if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
|
||||
httpString = 'http=' + proxy.split('PROXY')[1] + ';';
|
||||
}
|
||||
}
|
||||
resolve(httpString);
|
||||
});
|
||||
});
|
||||
// Check HTTPS Proxy
|
||||
const httpsProxy = new Promise(resolve => {
|
||||
ses.resolveProxy('https://' + resolveProxyUrl, proxy => {
|
||||
let httpsString = '';
|
||||
if (proxy !== 'DIRECT' || proxy.includes('HTTPS')) {
|
||||
// in case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
|
||||
// for all other HTTP or direct url:port both uses PROXY
|
||||
if (proxy.includes('PROXY' || proxy.includes('HTTPS'))) {
|
||||
httpsString += 'https=' + proxy.split('PROXY')[1] + ';';
|
||||
}
|
||||
}
|
||||
resolve(httpsString);
|
||||
});
|
||||
});
|
||||
|
||||
// Check FTP Proxy
|
||||
const ftpProxy = new Promise(resolve => {
|
||||
ses.resolveProxy('ftp://' + resolveProxyUrl, proxy => {
|
||||
let ftpString = '';
|
||||
if (proxy !== 'DIRECT') {
|
||||
if (proxy.includes('PROXY')) {
|
||||
ftpString += 'ftp=' + proxy.split('PROXY')[1] + ';';
|
||||
}
|
||||
}
|
||||
resolve(ftpString);
|
||||
});
|
||||
});
|
||||
|
||||
// Check SOCKS Proxy
|
||||
const socksProxy = new Promise(resolve => {
|
||||
ses.resolveProxy('socks4://' + resolveProxyUrl, proxy => {
|
||||
let socksString = '';
|
||||
if (proxy !== 'DIRECT') {
|
||||
if (proxy.includes('SOCKS5')) {
|
||||
socksString += 'socks=' + proxy.split('SOCKS5')[1] + ';';
|
||||
} else if (proxy.includes('SOCKS4')) {
|
||||
socksString += 'socks=' + proxy.split('SOCKS4')[1] + ';';
|
||||
} else if (proxy.includes('PROXY')) {
|
||||
socksString += 'socks=' + proxy.split('PROXY')[1] + ';';
|
||||
}
|
||||
}
|
||||
resolve(socksString);
|
||||
});
|
||||
});
|
||||
|
||||
Promise.all([httpProxy, httpsProxy, ftpProxy, socksProxy]).then(values => {
|
||||
let proxyString = '';
|
||||
values.forEach(proxy => {
|
||||
proxyString += proxy;
|
||||
});
|
||||
ConfigUtil.setConfigItem('systemProxyRules', proxyString);
|
||||
const useSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
|
||||
if (useSystemProxy) {
|
||||
ConfigUtil.setConfigItem('proxyRules', proxyString);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = new ProxyUtil();
|
||||
@@ -1,4 +1,10 @@
|
||||
const isOnline = require('is-online');
|
||||
const Logger = require('./logger-util');
|
||||
|
||||
const logger = new Logger({
|
||||
file: `domain-util.log`,
|
||||
timestamp: true
|
||||
});
|
||||
|
||||
class ReconnectUtil {
|
||||
constructor(serverManagerView) {
|
||||
@@ -31,11 +37,11 @@ class ReconnectUtil {
|
||||
if (!this.alreadyReloaded) {
|
||||
this.serverManagerView.reloadView();
|
||||
}
|
||||
console.log('You\'re back online.');
|
||||
logger.log('You\'re back online.');
|
||||
return resolve(true);
|
||||
}
|
||||
|
||||
console.log('There is no internet connection, try checking network cables, modem and router.');
|
||||
logger.log('There is no internet connection, try checking network cables, modem and router.');
|
||||
const errMsgHolder = document.querySelector('#description');
|
||||
if (errMsgHolder) {
|
||||
errMsgHolder.innerHTML = `
|
||||
|
||||
16
app/renderer/js/utils/sentry-util.js
Normal file
16
app/renderer/js/utils/sentry-util.js
Normal file
@@ -0,0 +1,16 @@
|
||||
const { init, captureException } = require('@sentry/electron');
|
||||
const isDev = require('electron-is-dev');
|
||||
|
||||
const sentryInit = () => {
|
||||
if (!isDev) {
|
||||
init({
|
||||
dsn: 'SENTRY_DSN',
|
||||
sendTimeout: 30 // wait 30 seconds before considering the sending capture to have failed, default is 1 second
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
sentryInit,
|
||||
captureException
|
||||
};
|
||||
BIN
app/resources/sounds/ding.ogg
Normal file
BIN
app/resources/sounds/ding.ogg
Normal file
Binary file not shown.
687
changelog.md
Normal file
687
changelog.md
Normal file
@@ -0,0 +1,687 @@
|
||||
# Version History
|
||||
|
||||
|
||||
|
||||
All notable changes to the Zulip desktop app are documented in this file.
|
||||
|
||||
|
||||
### v2.3.3 --2018-07-14
|
||||
|
||||
**Enhancements**:
|
||||
* Add dock bounce effect on macOS
|
||||
* Add a setting option to use the system proxy settings
|
||||
* Add support for self/custom signed certificate
|
||||
* Add Sentry support to get the bug reports
|
||||
* Show a notification when a user clicks on file attachments and open the same in default native app
|
||||
|
||||
|
||||
**Fixes**:
|
||||
* Fix auto-updates on Windows
|
||||
* Fix image attachments not opening up in the app
|
||||
* Security fix - Do proper HTML escaping for server data to avoid XSS attacks
|
||||
* Other minor fixes
|
||||
|
||||
**Updated dependencies**:
|
||||
|
||||
electron-builder: v20.20.4
|
||||
|
||||
electron-updater: v2.23.3
|
||||
|
||||
|
||||
### v2.3.2 --2018-05-28
|
||||
|
||||
|
||||
This is a quick release since we recently updated the certificate for code signing the app and we want to make sure the previous versions of the app get auto-updates without any conflicts.
|
||||
|
||||
<hr>
|
||||
|
||||
### v2.3.1 --2018-05-23
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Add a new setting to disable auto-updates
|
||||
|
||||
* Add a menu item to check for updates manually
|
||||
|
||||
* Other minor improvements
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Fix app not rendering colors properly
|
||||
|
||||
* **Security fix** - Do proper HTML escaping for server data to avoid XSS attacks
|
||||
|
||||
* Fix loading indicator when server is loaded
|
||||
* Other minor fixes
|
||||
|
||||
|
||||
|
||||
|
||||
**Updated dependencies**:
|
||||
|
||||
electron - `v2.0.1`
|
||||
|
||||
electron-builder - `v20.13.4`
|
||||
|
||||
electron-updater - `v2.21.10`
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
### v2.2.0-beta --2018-05-08
|
||||
|
||||
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Added do not disturb feature
|
||||
|
||||
* New DMG installer image
|
||||
|
||||
* Minor improvements
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Fix download functionality of file attachment links
|
||||
|
||||
* Fix tray icon not showing unread counts
|
||||
|
||||
|
||||
|
||||
|
||||
**Updated dependencies**:
|
||||
|
||||
electron - `v2.0.0`
|
||||
|
||||
electron-builder - `v2.21.10`
|
||||
|
||||
electron-updater - `v2.21.8`
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v2.0.0 -- 2018-04-20
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* [Snap](https://snapcraft.io/zulip) support for Linux
|
||||
|
||||
* Add an option to download the file attachments instead of opening it in the browser
|
||||
|
||||
* Open image link in webapp lightbox
|
||||
|
||||
* Add scrollbar for list of organizations on overflow
|
||||
|
||||
* Better report issue UX
|
||||
|
||||
* Add F5 shortcut for reloading the app
|
||||
|
||||
* Responsive UI for connected orgs in smaller window sizes
|
||||
|
||||
* Minor improvements
|
||||
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
|
||||
|
||||
* Remove unused shortcuts
|
||||
|
||||
* Update toggle sidebar shortcut to CMD/CTRL+SHIFT+S
|
||||
|
||||
* Warning dialog box for Reset App Settings
|
||||
|
||||
* Fix reinstall script for working across all platforms
|
||||
|
||||
* Other minor fixes
|
||||
|
||||
|
||||
|
||||
**Updated dependencies**:
|
||||
|
||||
* Update electron-builder to `v20.8.1`
|
||||
<hr>
|
||||
|
||||
|
||||
|
||||
### v1.9.0 --2018-03-23
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Major UI changes in the add new server and setting page
|
||||
|
||||
* Some users wanted to change the look of the Zulip. Now you have the power. Feel free to add your own CSS using the all-new setting option **Add Custom CSS**
|
||||
|
||||
* Added i18n locale helper script. Internalization is coming in the next release
|
||||
|
||||
* Added **What's new** in `help` submenu so that you can see all the latest changes in the app
|
||||
|
||||
* Other small improvements
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Add Zulip binary link to the bin. It was a regression we missed somehow. You can now start the app using `zulip` from a terminal [Linux]
|
||||
|
||||
* Fix app settings overriding issue. This bug was unnoticed from `v1.4.0`. The bug was overriding the app settings which was pretty bad. Don't worry this works as expected now
|
||||
|
||||
|
||||
|
||||
* Prevent drag and drop events to avoid few security risks
|
||||
|
||||
* Do not allow running insecure contents in the app
|
||||
|
||||
* The ugly white flickering in the webview is now fixed
|
||||
|
||||
* Fix position of left-sidebar on toggle
|
||||
|
||||
* Fix actions tooltip not visible on hover
|
||||
|
||||
* Other small fixes
|
||||
|
||||
|
||||
|
||||
|
||||
**Updated dependencies**:
|
||||
|
||||
* electron - `v1.8.4`
|
||||
|
||||
* Spectron - `v3.8.0`
|
||||
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v1.8.2 --2018-02-27
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Add bots mention support to reply option
|
||||
|
||||
* Show a notification when a new update available [Linux]
|
||||
|
||||
* Add back button in left-sidebar
|
||||
|
||||
* Add a Loading indication for new server button
|
||||
|
||||
* Improve help menu
|
||||
|
||||
* Add menu-item to reveal app logs in file manager
|
||||
|
||||
* Setting page and left-sidebar UI improvements
|
||||
|
||||
* Other minor improvments
|
||||
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Fix broken last active tab
|
||||
|
||||
* Fix Zoom In shortcut
|
||||
|
||||
* Check whether the internet is working before reloading
|
||||
|
||||
* New organization link overlapping existing servers
|
||||
|
||||
* Disable electron-connect when it's run from npm start
|
||||
|
||||
* Do not auto-reload app when the system comes back from sleep
|
||||
|
||||
* Only toggle the setting state if the element is present
|
||||
|
||||
* Other minor fixes
|
||||
|
||||
|
||||
|
||||
**Updated dependencies**:
|
||||
|
||||
* electron - `v1.8.2`
|
||||
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v1.8.1 --2018-01-19
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Reply from notifications [macOS]
|
||||
|
||||
* Add a setting option to start the app in the background
|
||||
|
||||
* 32-bit Debian installer
|
||||
|
||||
* 32-bit AppImage installer
|
||||
|
||||
* Automatically add apt-repo and GPG public keys on installing Debian file [Linux]
|
||||
|
||||
* Remove app data, config files etc on uninstalling Debian installer [Linux]
|
||||
|
||||
* Add logger utility for debugging that makes easier to sharing the apps
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Handle corrupted config files
|
||||
|
||||
* Reload full app on system hibernation
|
||||
* Load default icon if organization icon is not available
|
||||
|
||||
* Focus app when a notification is triggered
|
||||
|
||||
* Reflect changes in the preference page (#362)
|
||||
|
||||
* Set the default value of flash taskbar setting [Windows]
|
||||
|
||||
* Rename Zoom In keyboard shortcut
|
||||
|
||||
* Fix checkDomain, so it checks all error codes
|
||||
|
||||
* Disable hardware acceleration to decrease the load on GPU
|
||||
|
||||
* Minor bug fixes
|
||||
|
||||
|
||||
|
||||
**Updated dependencies**:
|
||||
|
||||
* electron - `v1.7.10`
|
||||
|
||||
* electron-builder - `v19.53.6`
|
||||
|
||||
* electron-updater - `v2.18.2`
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
|
||||
### v1.7.0 --2017-11-24
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Updated to Electron `v1.6.15`, electron-builder `v19.46.4`
|
||||
|
||||
* Improved setting page for new users
|
||||
|
||||
* On the developer side, we have added few tests to make sure app doesn't fail
|
||||
|
||||
* Minor improvements
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
### 1.6.0-beta --2017-11-16
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Added setting option to enable/disable spellcheck
|
||||
|
||||
* Added setting option to control Windows taskbar flashing [Windows]
|
||||
|
||||
* Auto-updates for Linux [AppImage]
|
||||
|
||||
* Better tray icons for retina display
|
||||
|
||||
* Reset app settings from Menu item
|
||||
|
||||
* Show detailed error message on invalid Zulip server
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Fixed a bug which was caused by app's shortcuts. From now on our shortcuts won't hijack other apps shortcuts
|
||||
|
||||
* Removed [electron-localshortcut](https://github.com/parro-it/electron-localshortcut) completely. Now we only depends on menu accelerators for keyboard shortcuts
|
||||
|
||||
* Handle certificate issue properly
|
||||
|
||||
* Other minor fixes
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
### v1.5.0 --2017-10-11
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Added an option to clear app data
|
||||
|
||||
* Added an option to show/hide desktop notifications
|
||||
|
||||
* Redesigned setting page
|
||||
|
||||
* Red dot over dock icon for PM [macOS]
|
||||
|
||||
* Show server-info on hovering the server icon
|
||||
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Fetch correct organization icon from server_settings API
|
||||
|
||||
* Minor improvements
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v1.4.0 --2017-09-04
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Added proxy support
|
||||
|
||||
* Added setting option for badges
|
||||
|
||||
* Start app at login setting option
|
||||
|
||||
* Added app category for Linux
|
||||
|
||||
* Minor improvements in settings page
|
||||
|
||||
* apt-repo on bintray for linux - [here](https://bintray.com/zulip/debian/zulip-elec)
|
||||
|
||||
|
||||
|
||||
**Fixes**
|
||||
|
||||
* Fixed auto-updates
|
||||
|
||||
* Better warning message on certificate error
|
||||
|
||||
* Don't allow duplicate servers
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
### 1.3.0-beta -- 2017-08-09
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Added back/forward option under `History` submenu
|
||||
|
||||
* Added taskbar overlay icon [Windows]
|
||||
|
||||
* Added `Window` submenu by which users can switch to other servers
|
||||
|
||||
* Added flashing taskbar icon on incoming message [Windows]
|
||||
|
||||
* Option to hide the left sidebar
|
||||
|
||||
* Staged rollouts
|
||||
|
||||
* Minor style improvements
|
||||
|
||||
|
||||
|
||||
|
||||
**Fixes**
|
||||
|
||||
* Handle focus event properly
|
||||
|
||||
* Open external links in default browser
|
||||
|
||||
* Allow user to change installation directory
|
||||
|
||||
* Fixed server-icon path error [Windows]
|
||||
|
||||
* Fixed server validation error
|
||||
|
||||
* Fetch server details from Zulip api
|
||||
|
||||
* Added tooltip in left sidebar
|
||||
|
||||
* Added publisher name in windows installer
|
||||
|
||||
|
||||
|
||||
**Updated dependencies**:
|
||||
|
||||
* electron - `v1.6.11`
|
||||
|
||||
* spellchecker - `v1.2.0`
|
||||
|
||||
* electron-builder - `v19.9.1`
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v1.2.0-beta -- 2017-07-12
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
|
||||
|
||||
* Added new setting page
|
||||
|
||||
* Setting for beta-updates. You can opt in for beta updates via selecting it from setting page
|
||||
|
||||
* Added Keyboard shortcuts to switch between multiple servers
|
||||
|
||||
* Desktop notifications support on Windows
|
||||
|
||||
|
||||
|
||||
**Fixes**
|
||||
|
||||
* Unregister keyboard shortcuts on windows close
|
||||
|
||||
* Show warning dialog while deleting server
|
||||
|
||||
* Allow server which is signed by root cert
|
||||
|
||||
* Other minor bug fixes
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
### v1.1.0-beta --2017-06-23
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* New network error page. App will auto-reload once the network comes back
|
||||
* Quit shortcut - CTRL+Q [Windows]
|
||||
* Improved preferences
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Fixed power-monitor module error
|
||||
* Fixed code signing error [macOS]
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
|
||||
### v1.0.0-beta --2017-06-21
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Sign in to multiple teams
|
||||
* Windows 7 desktop notification support
|
||||
* Show badge count for each Zulip server
|
||||
* Toggle window on clicking tray icon [Windows]
|
||||
|
||||
* Windows installer is properly code signed using [DigiCert](https://www.digicert.com/) certificate. You may get a warning regarding the certificate, please make it false positive
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Close/hide app properly
|
||||
* Keep app running in background on clicking X
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v0.5.10 --2017-05-12
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Added self-signed server support
|
||||
* Unread message counts in tray icon
|
||||
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v0.5.9 --2017-04-12
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
* Properly signed app for macOS
|
||||
* Toggle tray icon
|
||||
* Better error handling when no internet connenction
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
* Fixed permission issue on windows
|
||||
* Fixed wrong keyboard shortcuts
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v0.5.8 --2017-02-13
|
||||
|
||||
**Enhacements**:
|
||||
Smaller Windows installer size
|
||||
|
||||
<hr>
|
||||
|
||||
### v0.5.7 --2017-02-08
|
||||
|
||||
Minor improvements
|
||||
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v0.5.6 --2017-02-07
|
||||
|
||||
|
||||
**Enhacements**:
|
||||
|
||||
- Using NSIS instead of [Squirrel.Windows](https://github.com/Squirrel/Squirrel.Windows) on Windows
|
||||
|
||||
- Autoupdates: now using [electron-updater](https://www.npmjs.com/package/electron-updater)
|
||||
|
||||
- Removed nuts dependency
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
- Windows installer error
|
||||
- Compile and build error in native node modules + spellchecker [Windows]
|
||||
- Missing icon on installing [Windows]
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
### v0.5.4 --2017-01-09
|
||||
|
||||
**Fixes**:
|
||||
- Fixed :
|
||||
- Auto-updates
|
||||
- Spellchecker
|
||||
- Zooming functionality
|
||||
|
||||
- Removed unused node modules
|
||||
- Using stable version for node modules
|
||||
- Added icon for AppImage
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
### v0.5.3 --2016-12-24
|
||||
**Enhancements**:
|
||||
- 🎉 Added automatic update support on Windows
|
||||
|
||||
**Fixes**:
|
||||
|
||||
- Fixed javascript error when electron has been left running and try to right-click
|
||||
|
||||
- Fixed error - Unregister Spellchecker while window is closed
|
||||
|
||||
- Fixed - Keyboard shortcuts not getting unregistered
|
||||
|
||||
- Minor UI Changes
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v0.5.2 --2016-12-13
|
||||
|
||||
**Enhancements**:
|
||||
|
||||
- ⚡️ Added automatic app updates for macOS
|
||||
- Added windows installer for 32 bit machine
|
||||
|
||||
- Better tray icons
|
||||
|
||||
**Fixes**:
|
||||
- Blurry Unity icon fixed
|
||||
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v0.5.1 --2016-11-23
|
||||
|
||||
**Enhacements**:
|
||||
|
||||
- Added Spellchecker support with correct spell suggestions
|
||||
|
||||
- Added Code-Signing on MAC
|
||||
|
||||
- Added Win/linux/Mac installers
|
||||
|
||||
- Added Continuous Integration on travis and appveyor
|
||||
|
||||
- Open internal links in app only and external in default browser
|
||||
|
||||
- Better icons
|
||||
|
||||
- Electron version updated to `v1.4.7`
|
||||
|
||||
- Using two package.json structure
|
||||
|
||||
- Node integration disabled in main window due to jquery error
|
||||
|
||||
- Now using electron-builder for packaging instead of electron-packager
|
||||
|
||||
- Removed electron-context-menu and simple-spellchecker dependency
|
||||
|
||||
|
||||
|
||||
**Fixes**:
|
||||
|
||||
- Better error handling when user enters wrong zulip server
|
||||
|
||||
- Fixed close Zulip window JavaScript error
|
||||
|
||||
- Fixed opening image in default browser
|
||||
|
||||
- Fixed native notifications issue on linux
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
### v0.0.1-alpha -- 2016-08-31
|
||||
|
||||
**Enhacements**:
|
||||
|
||||
* Added DMG installer for macOS
|
||||
913
package-lock.json
generated
913
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "zulip",
|
||||
"productName": "Zulip",
|
||||
"version": "2.3.2",
|
||||
"version": "2.3.4-beta",
|
||||
"main": "./app/main",
|
||||
"description": "Zulip Desktop App",
|
||||
"license": "Apache-2.0",
|
||||
@@ -124,7 +124,7 @@
|
||||
"cp-file": "^5.0.0",
|
||||
"devtron": "1.4.0",
|
||||
"electron": "2.0.1",
|
||||
"electron-builder": "20.15.1",
|
||||
"electron-builder": "20.20.4",
|
||||
"electron-connect": "0.6.2",
|
||||
"electron-debug": "1.4.0",
|
||||
"google-translate-api": "2.3.0",
|
||||
|
||||
81
tools/push-to-pull-request
Executable file
81
tools/push-to-pull-request
Executable file
@@ -0,0 +1,81 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
usage () {
|
||||
cat >&2 <<EOF
|
||||
usage: $0 PULL_REQUEST_ID [REMOTE]
|
||||
|
||||
Force-push our HEAD to the given GitHub pull request branch.
|
||||
|
||||
Useful for a maintainer to run just before pushing to master,
|
||||
after tweaking the branch and/or rebasing to latest. This causes
|
||||
GitHub to see the subsequent push to master as representing a
|
||||
merge of the PR, rather than requiring the PR to be manually
|
||||
(and to the casual observer misleadingly) closed instead.
|
||||
|
||||
REMOTE defaults to the value of the Git config variable
|
||||
\`zulip.zulipRemote\` if set, else to \`upstream\`.
|
||||
|
||||
See also \`reset-to-pull-request\`.
|
||||
EOF
|
||||
exit 1
|
||||
}
|
||||
|
||||
remote_default="$(git config zulip.zulipRemote || echo upstream)"
|
||||
|
||||
pr_id="$1"
|
||||
remote="${2:-"$remote_default"}"
|
||||
|
||||
if [ -z "$pr_id" ]; then
|
||||
usage
|
||||
fi
|
||||
|
||||
remote_url="$(git config remote."$remote".url)"
|
||||
repo_fq="$(echo "$remote_url" | perl -lne 'print $1 if (
|
||||
m, ^ git\@github\.com:
|
||||
([^/]+ / [^/]+?)
|
||||
(?:\.git)?
|
||||
$ ,x )')"
|
||||
|
||||
if [ -z "$repo_fq" ]; then
|
||||
# We're pretty specific about what we expect the URL to look like;
|
||||
# there are probably more cases we could legitimately cover, which
|
||||
# we can add if/when they come up for someone.
|
||||
echo "error: couldn't parse remote URL as GitHub repo" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# See https://developer.github.com/v3/pulls/#get-a-single-pull-request .
|
||||
# This is the old REST API; the new GraphQL API does look neat, but it
|
||||
# seems to require authentication even for simple lookups of public data,
|
||||
# and that'd be a pain for a simple script like this.
|
||||
pr_url=https://api.github.com/repos/"${repo_fq}"/pulls/"${pr_id}"
|
||||
pr_details="$(curl -s "$pr_url")"
|
||||
|
||||
pr_jq () {
|
||||
echo "$pr_details" | jq "$@"
|
||||
}
|
||||
|
||||
if [ "$(pr_jq -r .message)" = "Not Found" ]; then
|
||||
echo "Invalid PR URL: $pr_url"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$(pr_jq .maintainer_can_modify)" != "true" ]; then
|
||||
# This happens when the PR has already been merged or closed, or
|
||||
# if the contributor has turned off the (default) setting to allow
|
||||
# maintainers of the target repo to push to their PR branch.
|
||||
#
|
||||
# The latter seems to be rare (in Greg's experience doing the
|
||||
# manual equivalent of this script for many different
|
||||
# contributors, none have ever chosen this setting), but give a
|
||||
# decent error message if it does happen.
|
||||
echo "error: PR already closed, or contributor has disallowed pushing to branch" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
pr_head_repo_fq="$(pr_jq -r .head.repo.full_name)"
|
||||
pr_head_refname="$(pr_jq -r .head.ref)"
|
||||
|
||||
set -x
|
||||
exec git push git@github.com:"$pr_head_repo_fq" +@:"$pr_head_refname"
|
||||
19
tools/reset-to-pull-request
Executable file
19
tools/reset-to-pull-request
Executable file
@@ -0,0 +1,19 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if ! git diff-index --quiet HEAD; then
|
||||
set +x
|
||||
echo "There are uncommitted changes:"
|
||||
git status --short
|
||||
echo "Doing nothing to avoid losing your work."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
remote_default="$(git config zulip.zulipRemote || echo upstream)"
|
||||
|
||||
request_id="$1"
|
||||
remote=${2:-"$remote_default"}
|
||||
|
||||
set -x
|
||||
git fetch "$remote" "pull/$request_id/head"
|
||||
git reset --hard FETCH_HEAD
|
||||
Reference in New Issue
Block a user