Update docs and code to point to new repo url.

Adds an option to enable or disable sentry error
reporting under Advanced section in General Settings. 
Handles both main and renderer processes.

Also, changes the domain used to resolve proxy
in proxy-util from google.com to example.com.

Fixes #702.

.gitattributes

@@ -1 +1,16 @@
-* text=auto
+* text=auto eol=lf
+
+package-lock.json binary
+app/package-lock.json binary
+*.gif binary
+*.jpg binary
+*.jpeg binary
+*.eot binary
+*.woff binary
+*.woff2 binary
+*.svg binary
+*.ttf binary
+*.png binary
+*.otf binary
+*.tif binary
+*.ogg binary

.github/ISSUE_TEMPLATE.md

@@ -2,7 +2,7 @@
 <!-- Please Include: -->
 - **Operating System**:
   - [ ] Windows
-  - [ ] Linux/Ubutnu
+  - [ ] Linux/Ubuntu
   - [ ] macOS
 - **Clear steps to reproduce the issue**:
 - **Relevant error messages and/or screenshots**:

.gitignore

@@ -33,6 +33,6 @@ yarn-error.log*
 config.gypi
 
 # Test generated files
-tests/package.json
+# tests/package.json
 
 .python-version

.htmlhintrc

@@ -0,0 +1,25 @@
+{
+  "tagname-lowercase": true,
+  "attr-lowercase": true,
+  "attr-value-double-quotes": true,
+  "attr-value-not-empty": false,
+  "attr-no-duplication": true,
+  "doctype-first": true,
+  "tag-pair": true,
+  "empty-tag-not-self-closed": true,
+  "spec-char-escape": true,
+  "id-unique": true,
+  "src-not-empty": true,
+  "title-require": true,
+  "alt-require": false,
+  "doctype-html5": true,
+  "id-class-value": "dash",
+  "style-disabled": false,
+  "inline-style-disabled": false,
+  "inline-script-disabled": false,
+  "space-tab-mixed-disabled": "space4",
+  "id-class-ad-disabled": false,
+  "href-abs-or-rel": false,
+  "attr-unsafe-chars": true,
+  "head-script-disabled": true
+}

.stylelintrc

@@ -0,0 +1,67 @@
+{
+    "rules": {
+        # Stylistic rules for CSS.
+        "function-comma-space-after": "always",
+        "function-comma-space-before": "never",
+        "function-max-empty-lines": 0,
+        "function-whitespace-after": "always",
+
+        "value-keyword-case": "lower",
+        "value-list-comma-newline-after": "always-multi-line",
+        "value-list-comma-space-after": "always-single-line",
+        "value-list-comma-space-before": "never",
+        "value-list-max-empty-lines": 0,
+
+        "unit-case": "lower",
+        "property-case": "lower",
+        "color-hex-case": "lower",
+
+        "declaration-bang-space-before": "always",
+        "declaration-colon-newline-after": "always-multi-line",
+        "declaration-colon-space-after": "always-single-line",
+        "declaration-colon-space-before": "never",
+        "declaration-block-semicolon-newline-after": "always",
+        "declaration-block-semicolon-space-before": "never",
+        "declaration-block-trailing-semicolon": "always",
+
+        "block-closing-brace-empty-line-before": "never",
+        "block-closing-brace-newline-after": "always",
+        "block-closing-brace-newline-before": "always",
+        "block-opening-brace-newline-after": "always",
+        "block-opening-brace-space-before": "always",
+
+        "selector-attribute-brackets-space-inside": "never",
+        "selector-attribute-operator-space-after": "never",
+        "selector-attribute-operator-space-before": "never",
+        "selector-combinator-space-after": "always",
+        "selector-combinator-space-before": "always",
+        "selector-descendant-combinator-no-non-space": true,
+        "selector-pseudo-class-parentheses-space-inside": "never",
+        "selector-pseudo-element-case": "lower",
+        "selector-pseudo-element-colon-notation": "double",
+        "selector-type-case": "lower",
+        "selector-list-comma-newline-after": "always",
+        "selector-list-comma-space-before": "never",
+
+        "media-feature-colon-space-after": "always",
+        "media-feature-colon-space-before": "never",
+        "media-feature-name-case": "lower",
+        "media-feature-parentheses-space-inside": "never",
+        "media-feature-range-operator-space-after": "always",
+        "media-feature-range-operator-space-before": "always",
+        "media-query-list-comma-newline-after": "always",
+        "media-query-list-comma-space-before": "never",
+
+        "at-rule-name-case": "lower",
+        "at-rule-name-space-after": "always",
+        "at-rule-semicolon-newline-after": "always",
+        "at-rule-semicolon-space-before": "never",
+
+        "comment-whitespace-inside": "always",
+        "indentation": 4,
+        
+        # Limit language features
+        "color-no-hex": true,
+        "color-named": "never",
+    }
+}

.travis.yml

@@ -15,7 +15,7 @@ addons:
 
 language: node_js
 node_js:
-- '6'
+- '8'
 
 before_install:
   - ./scripts/travis-xvfb.sh

CONTRIBUTING.md

@@ -2,20 +2,20 @@
 
 Thanks for taking the time to contribute!
 
-The following is a set of guidelines for contributing to Zulip Electron Desktop Client. These are just guidelines, not rules, so use your best judgement and feel free to propose changes to this document in a pull request.
+The following is a set of guidelines for contributing to Zulip's desktop Client. These are just guidelines, not rules, so use your best judgement and feel free to propose changes to this document in a pull request.
 
 ## Getting Started
 
-Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron, please head over to [this](http://jlord.us/essential-electron/) great article.
+Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron, please head over to [this](https://jlord.dev/blog/essential-electron) great article.
 
 ## Community
 
 * The whole Zulip documentation, such as setting up a development environment, setting up with the Zulip webapp project, and testing, can be read [here](https://zulip.readthedocs.io).
 
-* If you have any questions regarding zulip-electron, open an [issue](https://github.com/zulip/zulip-electron/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/electron).
+* If you have any questions regarding zulip-desktop, open an [issue](https://github.com/zulip/zulip-desktop/issues/new/) or ask it on [chat.zulip.org](https://chat.zulip.org/#narrow/stream/16-desktop).
 
 ## Issue
-Ensure the bug was not already reported by searching on GitHub under [issues](https://github.com/zulip/zulip-electron/issues). If you're unable to find an open issue addressing the bug, open a [new issue](https://github.com/zulip/zulip-electron/issues/new).
+Ensure the bug was not already reported by searching on GitHub under [issues](https://github.com/zulip/zulip-desktop/issues). If you're unable to find an open issue addressing the bug, open a [new issue](https://github.com/zulip/zulip-desktop/issues/new).
 
 The [zulipbot](https://github.com/zulip/zulipbot) helps to claim an issue by commenting the following in the comment section: "**@zulipbot** claim". **@zulipbot** will assign you to the issue and label the issue as **in progress**. For more details, check out [**@zulipbot**](https://github.com/zulip/zulipbot).
 
@@ -38,7 +38,7 @@ For example:
 
 
 ## Pull Requests
-Pull Requests are always welcome. 
+Pull Requests are always welcome.
 
 1. When you edit the code, please run `npm run test` to check the formatting of your code before you `git commit`.
 2. Ensure the PR description clearly describes the problem and solution. It should include:

README.md

@@ -1,32 +1,27 @@
 # Zulip Desktop Client
-[![Build Status](https://travis-ci.org/zulip/zulip-electron.svg?branch=master)](https://travis-ci.org/zulip/zulip-electron)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-electron?branch=master&svg=true)](https://ci.appveyor.com/project/akashnimare/zulip-electron/branch/master)
+[![Build Status](https://travis-ci.org/zulip/zulip-desktop.svg?branch=master)](https://travis-ci.org/zulip/zulip-desktop)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-desktop?branch=master&svg=true)](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/master)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
+[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org)
 
-Desktop client for Zulip. Available for Mac, Linux and Windows.
+Desktop client for Zulip. Available for Mac, Linux, and Windows.
 
 <img src="http://i.imgur.com/ChzTq4F.png"/>
 
 # Download
-Please see [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
+Please see the [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
 
 # Features
-* Sign in to multiple teams
-* Desktop Notifications with inline reply support
-* Multilanguage SpellChecker
-* OSX/Win/Linux installers
-* Automatic Updates (macOS/Windows/Linux)
-* Keyboard shortcuts
-
-# Development
-Please see our [development guide](./development.md) to get started and run app locally.
+* Sign in to multiple organizations
+* Desktop notifications with inline reply
+* Tray/dock integration
+* Multi-language spell checker
+* Automatic updates
 
 # Contribute
 
-If you want to contribute please make sure to read [our documentation about contributing](./CONTRIBUTING.md) first.
-
-* [Issue Tracker](https://github.com/zulip/zulip-electron/issues)
-* [Source Code](https://github.com/zulip/zulip-electron/)
+First, join us on the [Zulip community server](https://zulip.readthedocs.io/en/latest/contributing/chat-zulip-org.html)!
+Also see our [contribution guidelines](./CONTRIBUTING.md) and our [development guide](./development.md).
 
 # License
 Released under the [Apache-2.0](./LICENSE) license.

app/main/autoupdater.js

@@ -30,7 +30,9 @@ function appUpdater(updateFromMenu = false) {
 	autoUpdater.logger = log;
 
 	// Handle auto updates for beta/pre releases
-	autoUpdater.allowPrerelease = ConfigUtil.getConfigItem('betaUpdate') || false;
+	const isBetaUpdate = ConfigUtil.getConfigItem('betaUpdate');
+
+	autoUpdater.allowPrerelease = isBetaUpdate || false;
 
 	const eventsListenerRemove = ['update-available', 'update-not-available'];
 	autoUpdater.on('update-available', info => {

app/main/crash-reporter.js

@@ -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
-};

app/main/index.js

@@ -1,11 +1,12 @@
 'use strict';
 const path = require('path');
+const fs = require('fs');
+
 const electron = require('electron');
 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 +14,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
@@ -29,18 +32,19 @@ let isQuitting = false;
 // Load this url in main window
 const mainURL = 'file://' + path.join(__dirname, '../renderer', 'main.html');
 
-const isAlreadyRunning = app.makeSingleInstance(() => {
-	if (mainWindow) {
-		if (mainWindow.isMinimized()) {
-			mainWindow.restore();
+const singleInstanceLock = app.requestSingleInstanceLock();
+if (singleInstanceLock) {
+	app.on('second-instance', () => {
+		if (mainWindow) {
+			if (mainWindow.isMinimized()) {
+				mainWindow.restore();
+			}
+
+			mainWindow.show();
 		}
-
-		mainWindow.show();
-	}
-});
-
-if (isAlreadyRunning) {
-	return app.quit();
+	});
+} else {
+	app.quit();
 }
 
 const APP_ICON = path.join(__dirname, '../resources', 'Icon');
@@ -53,7 +57,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
@@ -71,7 +76,8 @@ function createMainWindow() {
 		minHeight: 400,
 		webPreferences: {
 			plugins: true,
-			nodeIntegration: true
+			nodeIntegration: true,
+			partition: 'persist:webviewsession'
 		},
 		show: false
 	});
@@ -80,14 +86,6 @@ function createMainWindow() {
 		win.webContents.send('focus');
 	});
 
-	win.once('ready-to-show', () => {
-		if (ConfigUtil.getConfigItem('startMinimized')) {
-			win.minimize();
-		} else {
-			win.show();
-		}
-	});
-
 	win.loadURL(mainURL);
 
 	// Keep the app running in background on close event
@@ -131,6 +129,10 @@ function createMainWindow() {
 // Decrease load on GPU (experimental)
 app.disableHardwareAcceleration();
 
+// Temporary fix for Electron render colors differently
+// More info here - https://github.com/electron/electron/issues/10732
+app.commandLine.appendSwitch('force-color-profile', 'srgb');
+
 // eslint-disable-next-line max-params
 app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
 	event.preventDefault();
@@ -149,20 +151,40 @@ app.on('ready', () => {
 	});
 	mainWindow = createMainWindow();
 
+	// Auto-hide menu bar on Windows + Linux
+	if (process.platform !== 'darwin') {
+		const shouldHideMenu = ConfigUtil.getConfigItem('autoHideMenubar') || false;
+		mainWindow.setAutoHideMenuBar(shouldHideMenu);
+		mainWindow.setMenuBarVisibility(!shouldHideMenu);
+	}
+
+	// Initialize sentry for main process
+	const errorReporting = ConfigUtil.getConfigItem('errorReporting');
+	if (errorReporting) {
+		sentryInit();
+	}
+
+	const isSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
+
+	if (isSystemProxy) {
+		ProxyUtil.resolveSystemProxy(mainWindow);
+	}
+
 	const page = mainWindow.webContents;
 
 	page.on('dom-ready', () => {
 		if (ConfigUtil.getConfigItem('startMinimized')) {
-			mainWindow.minimize();
+			mainWindow.hide();
 		} else {
 			mainWindow.show();
 		}
 	});
 
 	page.once('did-frame-finish-load', () => {
-		// Initate auto-updates on MacOS and Windows
-		appUpdater();
-		crashHandler();
+		// Initiate auto-updates on MacOS and Windows
+		if (ConfigUtil.getConfigItem('autoUpdate')) {
+			appUpdater();
+		}
 	});
 
 	// Temporarily remove this event
@@ -179,6 +201,32 @@ app.on('ready', () => {
 		app.quit();
 	});
 
+	// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+	// ipcMain.on('pdf-view', (event, url) => {
+	// 	// Paddings for pdfWindow so that it fits into the main browserWindow
+	// 	const paddingWidth = 55;
+	// 	const paddingHeight = 22;
+
+	// 	// Get the config of main browserWindow
+	// 	const mainWindowState = global.mainWindowState;
+
+	// 	// Window to view the pdf file
+	// 	const pdfWindow = new electron.BrowserWindow({
+	// 		x: mainWindowState.x + paddingWidth,
+	// 		y: mainWindowState.y + paddingHeight,
+	// 		width: mainWindowState.width - paddingWidth,
+	// 		height: mainWindowState.height - paddingHeight,
+	// 		webPreferences: {
+	// 			plugins: true,
+	// 			partition: 'persist:webviewsession'
+	// 		}
+	// 	});
+	// 	pdfWindow.loadURL(url);
+
+	// 	// We don't want to have the menu bar in pdf window
+	// 	pdfWindow.setMenu(null);
+	// });
+
 	// Reload full app not just webview, useful in debugging
 	ipcMain.on('reload-full-app', () => {
 		mainWindow.reload();
@@ -192,10 +240,10 @@ app.on('ready', () => {
 	});
 
 	ipcMain.on('toggle-app', () => {
-		if (mainWindow.isVisible()) {
-			mainWindow.hide();
-		} else {
+		if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
 			mainWindow.show();
+		} else {
+			mainWindow.hide();
 		}
 	});
 
@@ -203,6 +251,11 @@ app.on('ready', () => {
 		BadgeSettings.updateBadge(badgeCount, mainWindow);
 	});
 
+	ipcMain.on('toggle-menubar', (event, showMenubar) => {
+		mainWindow.setAutoHideMenuBar(showMenubar);
+		mainWindow.setMenuBarVisibility(!showMenubar);
+	});
+
 	ipcMain.on('update-badge', (event, messageCount) => {
 		badgeCount = messageCount;
 		BadgeSettings.updateBadge(badgeCount, mainWindow);
@@ -219,11 +272,87 @@ app.on('ready', () => {
 
 	ipcMain.on('update-menu', (event, props) => {
 		appMenu.setMenu(props);
+		const activeTab = props.tabs[props.activeTabIndex];
+		if (activeTab) {
+			mainWindow.setTitle(`Zulip - ${activeTab.webview.props.name}`);
+		}
 	});
 
 	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());
+
+			const getTimeStamp = () => {
+				const date = new Date();
+				return date.getTime();
+			};
+
+			const formatFile = filePath => {
+				const fileExtension = path.extname(filePath);
+				const baseName = path.basename(filePath, fileExtension);
+				return `${baseName}-${getTimeStamp()}${fileExtension}`;
+			};
+
+			// Update the name and path of the file if it already exists
+
+			const updatedFilePath = path.join(downloadPath, formatFile(filePath));
+
+			const setFilePath = fs.existsSync(filePath) ? updatedFilePath : filePath;
+
+			item.setSavePath(setFilePath);
+
+			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 progress in percentage in future.
+						break;
+					}
+					default: {
+						console.info('Unknown updated state of download item');
+					}
+				}
+			});
+			item.once('done', (event, state) => {
+				const getFileName = fs.existsSync(filePath) ? formatFile(filePath) : item.getFilename();
+				if (state === 'completed') {
+					page.send('downloadFileCompleted', item.getSavePath(), 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');
+			});
+		});
+	});
+
+	ipcMain.on('realm-name-changed', (event, serverURL, realmName) => {
+		page.send('update-realm-name', serverURL, realmName);
+	});
+
+	ipcMain.on('realm-icon-changed', (event, serverURL, iconURL) => {
+		page.send('update-realm-icon', serverURL, iconURL);
+	});
+
+	// Using event.sender.send instead of page.send here to
+	// make sure the value of errorReporting is sent only once on load.
+	ipcMain.on('error-reporting', event => {
+		event.sender.send('error-reporting-val', errorReporting);
+	});
 });
 
 app.on('before-quit', () => {

app/main/linuxupdater.js

@@ -4,20 +4,31 @@ const { Notification } = require('electron');
 const request = require('request');
 const semver = require('semver');
 const ConfigUtil = require('../renderer/js/utils/config-util');
+const ProxyUtil = require('../renderer/js/utils/proxy-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';
+	let	url = 'https://api.github.com/repos/zulip/zulip-desktop/releases';
 	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
+	const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
 
 	const options = {
 		url,
-		headers: {'User-Agent': 'request'}
+		headers: {'User-Agent': 'request'},
+		proxy: proxyEnabled ? ProxyUtil.getProxy(url) : '',
+		ecdhCurve: 'auto'
 	};
 
 	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 +43,7 @@ function linuxUpdateNotification() {
 				}
 			}
 		} else {
-			console.log('Status:', response.statusCode);
+			logger.log('Linux update response status: ', response.statusCode);
 		}
 	});
 }

app/main/menu.js

@@ -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 [{
@@ -32,6 +39,65 @@ class AppMenu {
 		}];
 	}
 
+	getToolsSubmenu() {
+		return [{
+			label: `Check for Updates`,
+			click() {
+				AppMenu.checkForUpdate();
+			}
+		},
+		{
+			label: `Release Notes`,
+			click() {
+				shell.openExternal(`https://github.com/zulip/zulip-desktop/releases/tag/v${app.getVersion()}`);
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: 'Factory Reset',
+			accelerator: process.platform === 'darwin' ? 'Command+Shift+D' : 'Ctrl+Shift+D',
+			click() {
+				AppMenu.resetAppSettings();
+			}
+		}, {
+			label: 'Download App Logs',
+			click() {
+				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);
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: 'Toggle DevTools for Zulip App',
+			accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					focusedWindow.webContents.toggleDevTools();
+				}
+			}
+		}, {
+			label: 'Toggle DevTools for Active Tab',
+			accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('tab-devtools');
+				}
+			}
+		}];
+	}
+
 	getViewSubmenu() {
 		return [{
 			label: 'Reload',
@@ -96,52 +162,33 @@ class AppMenu {
 					ConfigUtil.setConfigItem('showSidebar', newValue);
 				}
 			}
-		}, {
-			label: 'Toggle DevTools for Zulip App',
-			accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					focusedWindow.webContents.toggleDevTools();
-				}
-			}
-		}, {
-			label: 'Toggle DevTools for Active Tab',
-			accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('tab-devtools');
-				}
-			}
 		}];
 	}
 
 	getHelpSubmenu() {
 		return [
 			{
-				label: `${appName + ' Desktop-'} v${app.getVersion()}`,
+				label: `${appName + ' Desktop'} v${app.getVersion()}`,
 				enabled: false
 			},
 			{
-				label: `What's New...`,
-				click() {
-					shell.openExternal(`https://github.com/zulip/zulip-electron/releases/tag/v${app.getVersion()}`);
+				label: 'About Zulip',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-about');
+					}
 				}
 			},
 			{
-				label: `${appName} Help`,
+				label: `Help Center`,
 				click() {
 					shell.openExternal('https://zulipchat.com/help/');
 				}
 			}, {
-				label: 'Show App Logs',
+				label: 'Report an Issue',
 				click() {
-					shell.openItem(app.getPath('userData'));
-				}
-			}, {
-				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');
 					});
@@ -179,32 +226,55 @@ class AppMenu {
 					type: 'checkbox'
 				});
 			}
+			initialSubmenu.push({
+				type: 'separator'
+			});
+			initialSubmenu.push({
+				label: 'Switch to Next Organization',
+				accelerator: `Ctrl+Tab`,
+				enabled: tabs[activeTabIndex].props.role === 'server',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('switch-server-tab', AppMenu.getNextServer(tabs, activeTabIndex));
+					}
+				}
+			}, {
+				label: 'Switch to Previous Organization',
+				accelerator: `Ctrl+Shift+Tab`,
+				enabled: tabs[activeTabIndex].props.role === 'server',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('switch-server-tab', AppMenu.getPreviousServer(tabs, activeTabIndex));
+					}
+				}
+			});
 		}
 
 		return initialSubmenu;
 	}
 
 	getDarwinTpl(props) {
-		const { tabs, activeTabIndex } = props;
+		const { tabs, activeTabIndex, enableMenu } = props;
 
 		return [{
 			label: `${app.getName()}`,
 			submenu: [{
-				label: 'About Zulip',
+				label: 'Add Organization',
+				accelerator: 'Cmd+Shift+N',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
-						AppMenu.sendAction('open-about');
+						AppMenu.sendAction('new-server');
 					}
 				}
-			},	{
-				label: `Check for Update`,
-				click() {
-					AppMenu.checkForUpdate();
-				}
-			},	{
-				type: 'separator'
 			}, {
-				label: 'Desktop App Settings',
+				label: 'Toggle Do Not Disturb',
+				accelerator: 'Cmd+Shift+M',
+				click() {
+					const dndUtil = DNDUtil.toggle();
+					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				}
+			}, {
+				label: 'Desktop Settings',
 				accelerator: 'Cmd+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -214,6 +284,7 @@ class AppMenu {
 			}, {
 				label: 'Keyboard Shortcuts',
 				accelerator: 'Cmd+Shift+K',
+				enabled: enableMenu,
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -222,21 +293,17 @@ class AppMenu {
 			}, {
 				type: 'separator'
 			}, {
-				label: 'Toggle Do Not Disturb',
-				accelerator: 'Command+Shift+M',
-				click() {
-					const dndUtil = DNDUtil.toggle();
-					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				label: 'Copy Zulip URL',
+				accelerator: 'Cmd+Shift+C',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('copy-zulip-url');
+					}
 				}
 			}, {
-				label: 'Reset App Settings',
-				accelerator: 'Command+Shift+D',
-				click() {
-					AppMenu.resetAppSettings();
-				}
-			}, {
-				label: 'Log Out',
+				label: 'Log Out of Organization',
 				accelerator: 'Cmd+L',
+				enabled: enableMenu,
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('log-out');
@@ -276,8 +343,6 @@ class AppMenu {
 				role: 'paste'
 			}, {
 				role: 'pasteandmatchstyle'
-			}, {
-				role: 'delete'
 			}, {
 				role: 'selectall'
 			}]
@@ -290,6 +355,9 @@ class AppMenu {
 		}, {
 			label: 'Window',
 			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
+		}, {
+			label: 'Tools',
+			submenu: this.getToolsSubmenu()
 		}, {
 			role: 'help',
 			submenu: this.getHelpSubmenu()
@@ -297,40 +365,16 @@ class AppMenu {
 	}
 
 	getOtherTpl(props) {
-		const { tabs, activeTabIndex } = props;
+		const { tabs, activeTabIndex, enableMenu } = props;
 
 		return [{
-			label: 'File',
+			label: '&File',
 			submenu: [{
-				label: 'About Zulip',
+				label: 'Add Organization',
+				accelerator: 'Ctrl+Shift+N',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
-						AppMenu.sendAction('open-about');
-					}
-				}
-			}, 	{
-				label: `Check for Update`,
-				click() {
-					AppMenu.checkForUpdate();
-				}
-			},	{
-				type: 'separator'
-			}, {
-				label: 'Desktop App Settings',
-				accelerator: 'Ctrl+,',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('open-settings');
-					}
-				}
-			}, {
-				type: 'separator'
-			}, {
-				label: 'Keyboard Shortcuts',
-				accelerator: 'Ctrl+Shift+K',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('shortcut');
+						AppMenu.sendAction('new-server');
 					}
 				}
 			}, {
@@ -343,14 +387,36 @@ class AppMenu {
 					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
 				}
 			}, {
-				label: 'Reset App Settings',
-				accelerator: 'Ctrl+Shift+D',
-				click() {
-					AppMenu.resetAppSettings();
+				label: 'Desktop Settings',
+				accelerator: 'Ctrl+,',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-settings');
+					}
 				}
 			}, {
-				label: 'Log Out',
+				label: 'Keyboard Shortcuts',
+				accelerator: 'Ctrl+Shift+K',
+				enabled: enableMenu,
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('shortcut');
+					}
+				}
+			}, {
+				type: 'separator'
+			}, {
+				label: 'Copy Zulip URL',
+				accelerator: 'Ctrl+Shift+C',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('copy-zulip-url');
+					}
+				}
+			}, {
+				label: 'Log Out of Organization',
 				accelerator: 'Ctrl+L',
+				enabled: enableMenu,
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('log-out');
@@ -363,7 +429,7 @@ class AppMenu {
 				accelerator: 'Ctrl+Q'
 			}]
 		}, {
-			label: 'Edit',
+			label: '&Edit',
 			submenu: [{
 				role: 'undo'
 			}, {
@@ -378,23 +444,25 @@ class AppMenu {
 				role: 'paste'
 			}, {
 				role: 'pasteandmatchstyle'
-			}, {
-				role: 'delete'
 			}, {
 				type: 'separator'
 			}, {
 				role: 'selectall'
 			}]
 		}, {
-			label: 'View',
+			label: '&View',
 			submenu: this.getViewSubmenu()
 		}, {
-			label: 'History',
+			label: '&History',
 			submenu: this.getHistorySubmenu()
 		}, {
-			label: 'Window',
+			label: '&Window',
 			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
 		}, {
+			label: '&Tools',
+			submenu: this.getToolsSubmenu()
+		}, {
+			label: '&Help',
 			role: 'help',
 			submenu: this.getHelpSubmenu()
 		}];
@@ -413,11 +481,28 @@ class AppMenu {
 	static checkForUpdate() {
 		appUpdater(true);
 	}
+
+	static getNextServer(tabs, activeTabIndex) {
+		do {
+			activeTabIndex = (activeTabIndex + 1) % tabs.length;
+		}
+		while (tabs[activeTabIndex].props.role !== 'server');
+		return activeTabIndex;
+	}
+
+	static getPreviousServer(tabs, activeTabIndex) {
+		do {
+			activeTabIndex = (activeTabIndex - 1 + tabs.length) % tabs.length;
+		}
+		while (tabs[activeTabIndex].props.role !== 'server');
+		return activeTabIndex;
+	}
+
 	static resetAppSettings() {
 		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 +516,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');

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "2.2.0-beta",
+  "version": "2.5.0-beta",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
   "copyright": "Kandra Labs, Inc.",
@@ -11,10 +11,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/zulip/zulip-electron.git"
+    "url": "https://github.com/zulip/zulip-desktop.git"
   },
   "bugs": {
-    "url": "https://github.com/zulip/zulip-electron/issues"
+    "url": "https://github.com/zulip/zulip-desktop/issues"
   },
   "main": "main/index.js",
   "keywords": [
@@ -26,20 +26,23 @@
     "InstantMessaging"
   ],
   "dependencies": {
-    "@electron-elements/send-feedback": "1.0.7",
+    "@electron-elements/send-feedback": "1.0.8",
+    "@sentry/electron": "0.14.0",
+    "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-window-state": "4.1.1",
+    "electron-updater": "4.0.6",
+    "electron-window-state": "5.0.3",
+    "escape-html": "1.0.3",
     "is-online": "7.0.0",
-    "node-json-db": "0.7.3",
+    "node-json-db": "0.9.1",
     "request": "2.85.0",
     "semver": "5.4.1",
     "wurl": "2.5.0"
   },
   "optionalDependencies": {
-    "node-mac-notifier": "0.1.0"
+    "node-mac-notifier": "1.1.0"
   }
 }

app/renderer/about.html

@@ -1,50 +1,47 @@
 <!DOCTYPE html>
 <html lang="en">
 
-<head>
-	<meta charset="UTF-8">
-	<link rel="stylesheet" href="css/about.css">
-</head>
+    <head>
+        <meta charset="UTF-8">
+        <link rel="stylesheet" href="css/about.css">
+        <title>Zulip - About</title>
+    </head>
 
-<body>
-	<div class="about">
-		<img class="logo" src="../resources/zulip.png" />
-		<p class="detail" id="version">v?.?.?</p>
-		<div class="maintenance-info">
-			<p class="detail maintainer">
-				Maintained by
-				<a onclick="linkInBrowser('website')">Zulip</a>
-			</p>
-			<p class="detail license">
-				Available under the
-				<a onclick="linkInBrowser('license')">Apache 2.0 License</a>
-			</p>
-			<a class="bug" onclick="linkInBrowser('bug')" href="#">Found bug?</a>
-		</div>
-	</div>
-	<script>
+    <body>
+        <div class="about">
+            <img class="logo" src="../resources/zulip.png" />
+            <p class="detail" id="version">v?.?.?</p>
+            <div class="maintenance-info">
+                <p class="detail maintainer">
+                    Maintained by
+                    <a onclick="linkInBrowser('website')">Zulip</a>
+                </p>
+                <p class="detail license">
+                    Available under the
+                    <a onclick="linkInBrowser('license')">Apache 2.0 License</a>
+                </p>
+            </div>
+        </div>
+        <script>
 
-		const { app } = require('electron').remote;
-		const { shell } = require('electron');
-		const version_tag = document.querySelector('#version');
-		version_tag.innerHTML = 'v' + app.getVersion();
+            const { app } = require('electron').remote;
+            const { shell } = require('electron');
+            const version_tag = document.querySelector('#version');
+            version_tag.innerHTML = 'v' + app.getVersion();
 
-		function linkInBrowser(type) {
-			let url;
-			switch (type) {
-				case 'website':
-					url = "https://zulipchat.com";
-					break;
-				case 'license':
-					url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
-					break;
-				default:
-					url = 'https://github.com/zulip/zulip-electron/issues/new?body=' +
-						'%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
-			}
-			shell.openExternal(url);
-		}
-	</script>
-	<script>require('./js/shared/preventdrag.js')</script>
-</body>
+            function linkInBrowser(type) {
+                let url;
+                switch (type) {
+                    case 'website':
+                        url = "https://zulipchat.com";
+                        break;
+                    case 'license':
+                        url = "https://github.com/zulip/zulip-desktop/blob/master/LICENSE";
+                        break;
+                }
+                shell.openExternal(url);
+            }
+        </script>
+        <script>require('./js/shared/preventdrag.js')</script>
+    </body>
 </html>

app/renderer/css/about.css

@@ -1,82 +1,66 @@
 body {
-	background: #fafafa;
-	font-family: menu, "Helvetica Neue", sans-serif;
-	-webkit-font-smoothing: subpixel-antialiased;
+    background: rgba(250, 250, 250, 1.000);
+    font-family: menu, "Helvetica Neue", sans-serif;
+    -webkit-font-smoothing: subpixel-antialiased;
 }
 
 .logo {
-	display: block;
-	margin: -40px auto;
+    display: block;
+    margin: -40px auto;
 }
 
 #version {
-	color: #444343;
-	font-size: 1.3em;
-	padding-top: 40px;
+    color: rgba(68, 67, 67, 1.000);
+    font-size: 1.3em;
+    padding-top: 40px;
 }
 
 .about {
-	margin: 25vh auto;
-	height: 25vh;
-	text-align: center;
+    margin: 25vh auto;
+    height: 25vh;
+    text-align: center;
 }
 
 .about p {
-	font-size: 20px;
-	color: rgba(0, 0, 0, 0.62);
+    font-size: 20px;
+    color: rgba(0, 0, 0, 0.62);
 }
 
 .about img {
-	width: 150px;
+    width: 150px;
 }
 
 .detail {
-	text-align: center;
+    text-align: center;
 }
 
 .detail.maintainer {
-	font-size: 1.2em;
-	font-weight: 500;
+    font-size: 1.2em;
+    font-weight: 500;
 }
 
 .detail.license {
-	font-size: 0.8em;
+    font-size: 0.8em;
 }
 
 .maintenance-info {
-	cursor: pointer;
-	position: absolute;
-	width: 100%;
-	left: 0px;
-	color: #444;
+    cursor: pointer;
+    position: absolute;
+    width: 100%;
+    left: 0px;
+    color: rgba(68, 68, 68, 1.000);
 }
 
 .maintenance-info p {
-	margin: 0;
-	font-size: 1em;
-	width: 100%;
-}
-
-.maintenance-info .bug {
-	display: inline-block;
-	padding: 8px 15px;
-	margin-top: 30px;
-	text-decoration: none;
-	background-color: #52c2af;
-	color: #fff;
-	border-radius: 4px;
-
-	transition: background-color 0.2s ease;
-}
-
-.maintenance-info .bug:hover {
-	background-color: #32a692;
+    margin: 0;
+    font-size: 1em;
+    width: 100%;
 }
 
 p.detail a {
-	color: #355f4c;
+    color: rgba(53, 95, 76, 1.000);
 }
 
 p.detail a:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }

app/renderer/css/main.css

@@ -16,7 +16,7 @@ body {
 }
 
 .toggle-sidebar {
-    background: #222c31;
+    background: rgba(34, 44, 49, 1.000);
     width: 54px;
     padding: 27px 0 20px 0;
     justify-content: space-between;
@@ -43,25 +43,25 @@ body {
 }
 
 #view-controls-container {
-	height: calc(100% - 208px);
-	overflow-y: hidden;
+    height: calc(100% - 208px);
+    overflow-y: hidden;
 }
 
 #view-controls-container:hover {
-	overflow-y: overlay;
+    overflow-y: overlay;
 }
 
 #view-controls-container::-webkit-scrollbar {
-	width: 4px;
+    width: 4px;
 }
 
 #view-controls-container::-webkit-scrollbar-track {
-    box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
 }
 
 #view-controls-container::-webkit-scrollbar-thumb {
-  background-color: darkgrey;
-  outline: 1px solid slategrey;
+    background-color: rgba(169, 169, 169, 1.000);
+    outline: 1px solid rgba(169, 169, 169, 1.000);
 }
 
 @font-face {
@@ -119,12 +119,12 @@ body {
 }
 
 .action-button i {
-    color: #6c8592;
+    color: rgba(108, 133, 146, 1.000);
     font-size: 28px;
 }
 
 .action-button:hover i {
-    color: #98a9b3;
+    color: rgba(152, 169, 179, 1.000);
 }
 
 .action-button.disable {
@@ -136,22 +136,22 @@ body {
 }
 
 .action-button.disable:hover i {
-    color: #6c8592;
+    color: rgba(108, 133, 146, 1.000);
 }
 
 .action-button.active {
     /* background-color: rgba(255, 255, 255, 0.25); */
-    background-color: #efefef;
+    background-color: rgba(239, 239, 239, 1.000);
     opacity: 0.9;
     padding-right: 14px;
 }
 
 .action-button.active i {
-    color: #1c262b;
+    color: rgba(28, 38, 43, 1.000);
 }
 
 .tab:first-child {
-    margin-top: 8px;
+    margin-top: 9px;
 }
 
 .tab {
@@ -165,25 +165,33 @@ body {
 }
 
 .tab .server-icons {
-    border-radius: 50%;
-    width: 30px;
-    padding: 3px;
-    height: 30px;
+    width: 35px;
     vertical-align: top;
+    border-radius: 4px;
 }
 
 .tab .server-tab {
     width: 100%;
     height: 35px;
     position: relative;
-    margin: 5px 0 2px 0;
+    margin-top: 5px;
     z-index: 11;
     line-height: 31px;
-    color: #eee;
+    color: rgba(238, 238, 238, 1.000);
     text-align: center;
     overflow: hidden;
     opacity: 0.6;
-    padding: 2px 0;
+    padding: 6px 0;
+}
+
+.server-tab .alt-icon {
+    font-family: Verdana;
+    font-weight: 600;
+    font-size: 22px;
+    border: 2px solid rgba(34, 44, 49, 1.000);
+    margin-left: 17%;
+    width: 35px;
+    border-radius: 4px;
 }
 
 .tab .server-tab:hover {
@@ -208,7 +216,7 @@ body {
 
 .tab.active .server-tab {
     opacity: 1;
-    background-color: #648478;
+    background-color: rgba(100, 132, 120, 1.000);
 }
 
 .tab .server-tab-badge.active {
@@ -216,7 +224,7 @@ body {
     min-width: 11px;
     padding: 0 3px;
     height: 17px;
-    background-color: #f44336;
+    background-color: rgba(244, 67, 54, 1.000);
     font-size: 10px;
     font-family: sans-serif;
     position: absolute;
@@ -224,7 +232,7 @@ body {
     z-index: 15;
     top: 6px;
     float: right;
-    color: #fff;
+    color: rgba(255, 255, 255, 1.000);
     text-align: center;
     line-height: 17px;
     display: block;
@@ -252,7 +260,7 @@ body {
 }
 
 .tab .server-tab-shortcut {
-    color: #648478;
+    color: rgba(100, 132, 120, 1.000);
     font-size: 12px;
     text-align: center;
     font-family: sans-serif;
@@ -270,19 +278,19 @@ body {
     width: 100%;
 }
 
-/*Pseudo element for loading indicator*/
+/* Pseudo element for loading indicator */
 #webviews-container::before {
     content: "";
     position: absolute;
     z-index: 1;
-    background: #fff url(../img/ic_loading.gif) no-repeat;
+    background: rgba(255, 255, 255, 1.000) url(../img/ic_loading.gif) no-repeat;
     background-size: 60px 60px;
     background-position: center;
     width: 100%;
     height: 100%;
 }
 
-/*When the active webview is loaded*/
+/* When the active webview is loaded */
 #webviews-container.loaded::before {
     opacity: 0;
     z-index: -1;
@@ -325,27 +333,27 @@ webview.focus {
 #reload-tooltip,
 #setting-tooltip {
     font-family: sans-serif;
-    background: #222c31;
+    background: rgba(34, 44, 49, 1.000);
     margin-left: 48px;
     padding: 6px 8px;
     position: absolute;
     margin-top: 0px;
     z-index: 1000;
-    color: white;
+    color: rgba(255, 255, 255, 1.000);
     border-radius: 4px;
     text-align: center;
     width: 55px;
     font-size: 14px;
 }
 
-#dnd-tooltip:after,
-#back-tooltip:after,
-#reload-tooltip:after,
-#setting-tooltip:after {
+#dnd-tooltip::after,
+#back-tooltip::after,
+#reload-tooltip::after,
+#setting-tooltip::after {
     content: " ";
     border-top: 8px solid transparent;
     border-bottom: 8px solid transparent;
-    border-right: 8px solid #222c31;
+    border-right: 8px solid rgba(34, 44, 49, 1.000);
     position: absolute;
     top: 7px;
     right: 68px;
@@ -354,25 +362,25 @@ webview.focus {
 #add-server-tooltip,
 .server-tooltip {
     font-family: 'arial';
-    background: #222c31;
+    background: rgba(34, 44, 49, 1.000);
     left: 56px;
     padding: 10px 20px;
     position: fixed;
-    margin-top: 8px;
+    margin-top: 11px;
     z-index: 5000 !important;
-    color: #fff;
+    color: rgba(255, 255, 255, 1.000);
     border-radius: 4px;
     text-align: center;
     width: max-content;
     font-size: 14px;
 }
 
-#add-server-tooltip:after,
-.server-tooltip:after {
+#add-server-tooltip::after,
+.server-tooltip::after {
     content: " ";
     border-top: 8px solid transparent;
     border-bottom: 8px solid transparent;
-    border-right: 8px solid #222c31;
+    border-right: 8px solid rgba(34, 44, 49, 1.000);
     position: absolute;
     top: 10px;
     left: -5px;
@@ -384,14 +392,14 @@ webview.focus {
     position: absolute;
     width: 24px;
     height: 24px;
-    background: #222c31;
+    background: rgba(34, 44, 49, 1.000);
     border-radius: 20px;
     cursor: pointer;
-    box-shadow: #999 1px 1px;
+    box-shadow: rgba(153, 153, 153, 1.000) 1px 1px;
 }
 
 #collapse-button i {
-    color: #efefef;
+    color: rgba(239, 239, 239, 1.000);
 }
 
 #main-container {
@@ -412,8 +420,8 @@ webview.focus {
 
 .popup .popuptext {
     visibility: hidden;
-    background-color: #555;
-    color: #fff;
+    background-color: rgba(85, 85, 85, 1.000);
+    color: rgba(255, 255, 255, 1.000);
     text-align: center;
     border-radius: 6px;
     padding: 9px 0;
@@ -445,24 +453,24 @@ webview.focus {
 }
 
 send-feedback {
-  width: 60%;
-  height: 85%;
+    width: 60%;
+    height: 85%;
 }
 
 #feedback-modal {
-  display: none;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(68, 67, 67, 0.81);
-  align-items: center;
-  justify-content: center;
-  z-index: 2;
-  transition: all 1s ease-out;
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(68, 67, 67, 0.81);
+    align-items: center;
+    justify-content: center;
+    z-index: 2;
+    transition: all 1s ease-out;
 }
 
 #feedback-modal.show {
-  display: flex;
+    display: flex;
 }

app/renderer/css/network.css

@@ -1,10 +1,11 @@
-html, body {
+html,
+body {
     margin: 0;
     cursor: default;
     font-size: 14px;
-    color: #333;
-    background: #fff;
-    user-select:none;
+    color: rgba(51, 51, 51, 1.000);
+    background: rgba(255, 255, 255, 1.000);
+    user-select: none;
 }
 
 #content {
@@ -27,8 +28,8 @@ html, body {
 
 #reconnect {
     font-size: 16px;
-    background: #009688;
-    color: #fff;
+    background: rgba(0, 150, 136, 1.000);
+    color: rgba(255, 255, 255, 1.000);
     width: 84px;
     height: 32px;
     border-radius: 5px;

app/renderer/css/preference.css

@@ -7,23 +7,25 @@ body {
     font-family: menu, "Helvetica Neue", sans-serif;
     -webkit-font-smoothing: antialiased;
     font-size: 14px;
-    color: #333;
-    background: #efefef;
+    background: rgba(239, 239, 239, 1.000);
+    letter-spacing: -.08px;
+    line-height: 18px;
+    color: rgba(139, 142, 143, 1.000);
 }
 
 kbd {
     display: inline-block;
-    border: 1px solid #ccc;
-    border-radius: 3px;
+    border: 1px solid rgba(204, 204, 204, 1.000);
+    border-radius: 4px;
     font-size: 15px;
     font-family: Courier New, Courier, monospace;
     font-weight: bold;
     white-space: nowrap;
-    background-color: #f7f7f7;
-    color: #333;
+    background-color: rgba(247, 247, 247, 1.000);
+    color: rgba(51, 51, 51, 1.000);
     margin: 0 0.1em;
     padding: 0.3em 0.8em;
-    text-shadow: 0 1px 0 #fff;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 1.000);
     line-height: 1.4;
 }
 
@@ -31,7 +33,7 @@ table,
 th,
 td {
     border-collapse: collapse;
-    color: #383430;
+    color: rgba(56, 52, 48, 1.000);
 }
 
 table {
@@ -41,11 +43,11 @@ table {
 }
 
 table tr:nth-child(even) {
-    background-color: #fafafa;
+    background-color: rgba(250, 250, 250, 1.000);
 }
 
 table tr:nth-child(odd) {
-    background-color: #fff;
+    background-color: rgba(255, 255, 255, 1.000);
 }
 
 td {
@@ -101,7 +103,7 @@ td:nth-child(odd) {
     display: flex;
     flex-direction: column;
     font-size: 16px;
-    background: #f2f2f2;
+    background: rgba(242, 242, 242, 1.000);
 }
 
 #nav-container {
@@ -109,19 +111,19 @@ td:nth-child(odd) {
 }
 
 .nav {
-    padding: 5px 0;
-    color: #999;
+    padding: 7px 0;
+    color: rgba(153, 153, 153, 1.000);
     cursor: pointer;
 }
 
 .nav.active {
-    color: #4ebfac;
+    color: rgba(78, 191, 172, 1.000);
     cursor: default;
     position: relative;
 }
 
 .nav.active::before {
-    background: #464e5a;
+    background: rgba(70, 78, 90, 1.000);
     width: 3px;
     height: 18px;
     position: absolute;
@@ -129,7 +131,6 @@ td:nth-child(odd) {
     content: '';
 }
 
-
 /* We don't want to show this in nav item since we have the + button for adding an Organization */
 
 #nav-AddServer {
@@ -138,7 +139,7 @@ td:nth-child(odd) {
 
 #settings-header {
     font-size: 22px;
-    color: #222c31;
+    color: rgba(34, 44, 49, 1.000);
     font-weight: bold;
     text-transform: uppercase;
 }
@@ -158,11 +159,11 @@ td:nth-child(odd) {
 
 .title {
     font-weight: 500;
-    color: #222c31;
+    color: rgba(34, 44, 49, 1.000);
 }
 
 .page-title {
-    color: #222c31;
+    color: rgba(34, 44, 49, 1.000);
     font-size: 15px;
     font-weight: bold;
     padding: 4px 0 6px 0;
@@ -181,13 +182,13 @@ td:nth-child(odd) {
 .sub-title {
     padding: 4px 0 6px 0;
     font-weight: bold;
-    color: #616161;
+    color: rgba(97, 97, 97, 1.000);
 }
 
 img.server-info-icon {
     width: 36px;
     height: 36px;
-    padding: 4px;
+    padding: 4px 4px 4px 10px;
     cursor: pointer;
     vertical-align: middle;
 }
@@ -246,26 +247,26 @@ img.server-info-icon {
 .setting-input-value {
     flex-grow: 1;
     font-size: 14px;
-    border-radius: 3px;
+    border-radius: 4px;
     padding: 13px;
-    border: #ededed 2px solid;
+    border: rgba(237, 237, 237, 1.000) 2px solid;
     outline-width: 0;
     background: transparent;
     max-width: 450px;
 }
 
 .setting-input-value:focus {
-    border: #4EBFAC 2px solid;
+    border: rgba(78, 191, 172, 1.000) 2px solid;
 }
 
-.setting-block {
-    width: 100%;
+.manual-proxy-block {
+    width: 96%;
 }
 
 .actions-container {
     display: flex;
     font-size: 14px;
-    color: #235d3a;
+    color: rgba(35, 93, 58, 1.000);
     vertical-align: middle;
     margin: 10px 0;
     flex-wrap: wrap;
@@ -286,6 +287,7 @@ img.server-info-icon {
 
 .settings-pane {
     flex-grow: 1;
+    min-width: 550px;
 }
 
 .action:hover {
@@ -297,7 +299,7 @@ img.server-info-icon {
 }
 
 .action.disabled {
-    color: #999;
+    color: rgba(153, 153, 153, 1.000);
 }
 
 .settings-card {
@@ -305,8 +307,8 @@ img.server-info-icon {
     flex-wrap: wrap;
     padding: 12px 30px;
     margin: 10px 0 20px 0;
-    background: #fff;
-    width: 70%;
+    background: rgba(255, 255, 255, 1.000);
+    width: 80%;
     transition: all 0.2s;
 }
 
@@ -320,29 +322,59 @@ img.server-info-icon {
 }
 
 .red {
-    color: #ef5350;
-    padding: 8px;
-    border: rgba(239, 83, 80, 0.5) solid 1px;
+    color: rgb(240, 148, 148);
+    background: rgba(255, 255, 255, 1.000);
+    border-radius: 4px;
+    display: inline-block;
+    border: 2px solid rgb(240, 148, 148);
+    padding: 10px;
+    width: 100px;
+    cursor: pointer;
+    font-size: 1rem;
+    font-weight: bold;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
+    text-align: center;
 }
 
 .red:hover {
-    color: #e63431;
-    border: rgba(239, 83, 80, 0.7) solid 1px;
-    ;
+    background-color: rgb(240, 148, 148);
+    color: rgba(255, 255, 255, 1.000);
 }
 
-.blue {
-    color: #ffffff;
-    background: #4EBFAC;
-    padding: 3px;
-    padding-right: 10px;
-    padding-left: 10px;
+.green {
+    color: rgba(255, 255, 255, 1.000);
+    background: rgba(78, 191, 172, 1.000);
+    border-radius: 4px;
+    display: inline-block;
+    border: none;
+    padding: 10px;
+    width: 100px;
+    cursor: pointer;
+    font-size: 1rem;
+    font-weight: bold;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
+    text-align: center;
+}
+
+.green:hover {
+    background-color: rgba(60, 159, 141, 1.000);
+    color: rgba(255, 255, 255, 1.000);
+}
+
+.w-150 {
+    width: 150px;
+}
+
+.w-250 {
+    width: 250px;
 }
 
 .grey {
-    color: #9E9E9E;
-    background: #FAFAFA;
-    border: 1px solid #9E9E9E;
+    color: rgba(158, 158, 158, 1.000);
+    background: rgba(250, 250, 250, 1.000);
+    border: 1px solid rgba(158, 158, 158, 1.000);
 }
 
 .setting-row {
@@ -358,36 +390,19 @@ img.server-info-icon {
 }
 
 i.open-tab-button {
-    padding-left: 2px;
+    padding-left: 5px;
     font-size: 19px;
     cursor: pointer;
 }
 
-.reset-data-button,
-.custom-css-button {
-    display: inline-block;
-    border: none;
-    padding: 10px;
-    width: 120px;
-    cursor: pointer;
-    font-size: 13px;
-    transition: background-color 0.2s ease;
-    text-decoration: none;
-}
-
 .css-delete-action {
     margin-bottom: 10px;
 }
 
-.reset-data-button:hover {
-    background-color: #3c9f8d;
-    color: #fff;
-}
-
-.selected-css-path {
-    background: #eeeeee;
-    padding: 10px;
-    margin-top: 10px;
+.selected-css-path,
+.download-folder-path {
+    background: rgba(238, 238, 238, 1.000);
+    padding: 5px 10px;
     margin-right: 10px;
     display: flex;
     width: 90%;
@@ -399,7 +414,11 @@ i.open-tab-button {
 }
 
 #server-info-container {
-    min-height: calc(100% - 260px);
+    /* min-height: calc(100% - 260px); */
+}
+
+#new-org-button {
+    margin: 30px 0px 30px 0px;
 }
 
 #create-organization-container {
@@ -422,7 +441,7 @@ i.open-tab-button {
     visibility: hidden;
 }
 
-.toggle+label {
+.toggle + label {
     display: block;
     position: relative;
     cursor: pointer;
@@ -430,16 +449,16 @@ i.open-tab-button {
     user-select: none;
 }
 
-input.toggle-round+label {
+input.toggle-round + label {
     padding: 2px;
     width: 50px;
     height: 25px;
-    background-color: #dddddd;
+    background-color: rgba(221, 221, 221, 1.000);
     border-radius: 25px;
 }
 
-input.toggle-round+label:before,
-input.toggle-round+label:after {
+input.toggle-round + label::before,
+input.toggle-round + label::after {
     display: block;
     position: absolute;
     top: 2px;
@@ -448,28 +467,34 @@ input.toggle-round+label:after {
     content: "";
 }
 
-input.toggle-round+label:before {
-    right: 2px;
-    background-color: #f1f1f1;
+input.toggle-round + label::before {
+    background-color: rgba(241, 241, 241, 1.000);
     border-radius: 25px;
+    top: 0;
+    right: 0px;
+    left: 0px;
+    bottom: 0px;
 }
 
-input.toggle-round+label:after {
+input.toggle-round + label::after {
     width: 25px;
     height: 25px;
-    background-color: #fff;
+    background-color: rgba(255, 255, 255, 1.000);
     border-radius: 100%;
 }
 
-input.toggle-round:checked+label:before {
-    background-color: #4EBFAC;
+input.toggle-round:checked + label::before {
+    background-color: rgba(78, 191, 172, 1.000);
+    top: 0;
+    right: 0px;
+    left: 0px;
+    bottom: 0px;
 }
 
-input.toggle-round:checked+label:after {
+input.toggle-round:checked + label::after {
     margin-left: 25px;
 }
 
-
 /*  Add new server modal */
 
 .add-server-modal {
@@ -483,18 +508,17 @@ input.toggle-round:checked+label:after {
     width: 100%;
     height: 100%;
     /* background: rgba(61, 64, 67, 15); */
-    background: linear-gradient(35deg, #003b52, #45b59b);
+    background: linear-gradient(35deg, rgba(0, 59, 82, 1.000), rgba(69, 181, 155, 1.000));
     overflow: auto;
 }
 
-
 /* Modal Content */
 
 .modal-container {
-    background-color: #f4f7f8;
+    background-color: rgba(244, 247, 248, 1.000);
     margin: auto;
     padding: 57px;
-    border: #dae1e3 1px solid;
+    border: rgba(218, 225, 227, 1.000) 1px solid;
     width: 550px;
     height: 370px;
     border-radius: 4px;
@@ -508,7 +532,7 @@ input.toggle-round:checked+label:after {
 .divider {
     margin-bottom: 30px;
     margin-top: 30px;
-    color: #7d878a;
+    color: rgba(125, 135, 138, 1.000);
 }
 
 .divider hr {
@@ -539,29 +563,72 @@ input.toggle-round:checked+label:after {
     margin: auto;
     align-items: center;
     text-align: center;
-    color: #fff;
-    background: #4EBFAC;
+    color: rgba(255, 255, 255, 1.000);
+    background: rgba(78, 191, 172, 1.000);
     border-color: none;
     border: none;
     width: 98%;
     height: 46px;
-    border-radius: 3px;
+    border-radius: 4px;
     cursor: pointer;
 }
 
 .server-center button:hover {
-    background: #329588;
+    background: rgba(50, 149, 136, 1.000);
 }
 
 .server-center button:focus {
-    background: #329588;
+    background: rgba(50, 149, 136, 1.000);
 }
 
+.certificates-card {
+    width: 80%;
+}
+
+.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 {
+    margin: 10px 10px 10px 37px;
+}
+
+.tip {
+    background: none;
+    padding: 0;
+}
+
+.tip:hover {
+    box-shadow: none;
+}
+
+.md-14 {
+    font-size: 14px;
+    vertical-align: middle;
+    padding-right: 6px;
+}
+
+#open-hotkeys-link {
+    text-decoration: underline;
+    cursor: pointer;
+}
 
 /* responsive grid */
 
 @media (max-width: 650px) {
-    .selected-css-path {
+    .selected-css-path,
+    .download-folder-path {
         margin-right: 15px;
     }
     #css-delete-action {
@@ -611,12 +678,10 @@ input.toggle-round:checked+label:after {
         flex-direction: column;
         align-items: center;
     }
-
     .server-info-right {
         flex-direction: column;
         align-items: center;
     }
-
     .action {
         margin-top: 10px;
     }

app/renderer/css/preload.css

@@ -1,9 +1,9 @@
 /* Override css rules */
 
-.portico-wrap>.header {
+.portico-wrap > .header {
     display: none;
 }
 
-.portico-container>.footer {
+.portico-container > .footer {
     display: none;
 }

app/renderer/js/components/handle-external-link.js

@@ -1,30 +1,75 @@
-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')}`);
+	const shouldShowInFolder = ConfigUtil.getConfigItem('showDownloadFolder', false);
 
-  // Whitelist URLs which are allowed to be opened in the app
+	// Whitelist URLs which are allowed to be opened in the app
 	const {
-    isInternalUrl: isWhiteListURL,
-    isUploadsUrl: isUploadsURL
-  } = LinkUtil.isInternal(domainPrefix, url);
+		isInternalUrl: isWhiteListURL,
+		isUploadsUrl: isUploadsURL
+	} = LinkUtil.isInternal(domainPrefix, url);
 
 	if (isWhiteListURL) {
 		event.preventDefault();
 
-    // download txt, pdf, mp3, mp4 etc.. by using downloadURL in the
-    // main process which allows the user to save the files to their desktop
-    // and not trigger webview reload while image in webview will
-    // do nothing and will not save it
+		// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+		// Show pdf attachments in a new window
+		// if (LinkUtil.isPDF(url) && isUploadsURL) {
+		// 	ipcRenderer.send('pdf-view', url);
+		// 	return;
+		// }
+
+		// download txt, mp3, mp4 etc.. by using downloadURL in the
+		// main process which allows the user to save the files to their desktop
+		// and not trigger webview reload while image in webview will
+		// do nothing and will not save it
+
+			// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+		// if (!LinkUtil.isImage(url) && !LinkUtil.isPDF(url) && isUploadsURL) {
 		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: shouldShowInFolder ? `Click to show ${fileName} in folder` : `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 = () => {
+					if (shouldShowInFolder) {
+						// Reveal file in download folder
+						shell.showItemInFolder(filePath);
+					} else {
+						// Open file in the default native app
+						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;
 		}
 
-    // open internal urls inside the current webview.
+		// open internal urls inside the current webview.
 		this.$el.loadURL(url);
 	} else {
 		event.preventDefault();

app/renderer/js/components/server-tab.js

@@ -8,7 +8,7 @@ const {ipcRenderer} = require('electron');
 class ServerTab extends Tab {
 	template() {
 		return `<div class="tab" data-tab-id="${this.props.tabIndex}">
-					<div class="server-tooltip" style="display:none"></div>
+					<div class="server-tooltip" style="display:none">${this.props.name}</div>
 					<div class="server-tab-badge"></div>
 					<div class="server-tab">
 					<img class="server-icons" src='${this.props.icon}'/>

app/renderer/js/components/webview.js

@@ -33,6 +33,7 @@ class WebView extends BaseComponent {
 					disablewebsecurity
 					${this.props.preload ? 'preload="js/preload.js"' : ''}
 					partition="persist:webviewsession"
+					name="${this.props.name}"
 					webpreferences="allowRunningInsecureContent, javascript=yes">
 				</webview>`;
 	}
@@ -75,11 +76,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();
+				}
 			}
 		});
 
@@ -89,6 +95,11 @@ class WebView extends BaseComponent {
 			}
 			this.loading = false;
 			this.show();
+
+			// Refocus text boxes after reload
+			// Remove when upstream issue https://github.com/electron/electron/issues/14474 is fixed
+			this.$el.blur();
+			this.$el.focus();
 		});
 
 		this.$el.addEventListener('did-fail-load', event => {
@@ -159,7 +170,13 @@ class WebView extends BaseComponent {
 	focus() {
 		// focus Webview and it's contents when Window regain focus.
 		const webContents = this.$el.getWebContents();
-		if (webContents && !webContents.isFocused()) {
+		// HACK: webContents.isFocused() seems to be true even without the element
+		// being in focus. So, we check against `document.activeElement`.
+		if (webContents && this.$el !== document.activeElement) {
+			// HACK: Looks like blur needs to be called on the previously focused
+			// element to transfer focus correctly, in Electron v3.0.10
+			// See https://github.com/electron/electron/issues/15718
+			document.activeElement.blur();
 			this.$el.focus();
 			webContents.focus();
 		}
@@ -208,6 +225,7 @@ class WebView extends BaseComponent {
 	back() {
 		if (this.$el.canGoBack()) {
 			this.$el.goBack();
+			this.focus();
 		}
 	}
 

app/renderer/js/electron-bridge.js

@@ -0,0 +1,40 @@
+const events = require('events');
+const { ipcRenderer } = require('electron');
+
+// we have and will have some non camelcase stuff
+// while working with zulip so just turning the rule off
+// for the whole file.
+/* eslint-disable camelcase */
+class ElectronBridge extends events {
+	send_event(...args) {
+		this.emit(...args);
+	}
+
+	on_event(...args) {
+		this.on(...args);
+	}
+}
+
+const electron_bridge = new ElectronBridge();
+
+electron_bridge.on('total_unread_count', (...args) => {
+	ipcRenderer.send('unread-count', ...args);
+});
+
+electron_bridge.on('realm_name', realmName => {
+	const serverURL = location.origin;
+	ipcRenderer.send('realm-name-changed', serverURL, realmName);
+});
+
+electron_bridge.on('realm_icon_url', iconURL => {
+	const serverURL = location.origin;
+	iconURL = iconURL.includes('http') ? iconURL : `${serverURL}${iconURL}`;
+	ipcRenderer.send('realm-icon-changed', serverURL, iconURL);
+});
+
+// this follows node's idiomatic implementation of event
+// emitters to make event handling more simpler instead of using
+// functions zulip side will emit event using ElectronBrigde.send_event
+// which is alias of .emit and on this side we can handle the data by adding
+// a listener for the event.
+module.exports = electron_bridge;

app/renderer/js/main.js

@@ -1,9 +1,10 @@
 'use strict';
 
-const { ipcRenderer, remote } = require('electron');
+const { ipcRenderer, remote, clipboard } = require('electron');
 const isDev = require('electron-is-dev');
 
-const { session } = remote;
+const { session, app, Menu, dialog } = remote;
+const escape = require('escape-html');
 
 require(__dirname + '/js/tray.js');
 const DomainUtil = require(__dirname + '/js/utils/domain-util.js');
@@ -13,8 +14,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 CommonUtil = require(__dirname + '/js/utils/common-util.js');
+
 const { feedbackHolder } = require(__dirname + '/js/feedback.js');
 
+const logger = new Logger({
+	file: 'errors.log',
+	timestamp: true
+});
+
 class ServerManagerView {
 	constructor() {
 		this.$addServerButton = document.getElementById('add-tab');
@@ -58,7 +67,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,21 +101,27 @@ class ServerManagerView {
 		// Default settings which should be respected
 		const settingOptions = {
 			trayIcon: true,
-			useProxy: false,
+			useManualProxy: false,
+			useSystemProxy: false,
 			showSidebar: true,
 			badgeOption: true,
-			startAtLogin: false,
+			startAtLogin: true,
 			startMinimized: false,
 			enableSpellchecker: true,
 			showNotification: true,
+			autoUpdate: true,
 			betaUpdate: false,
+			errorReporting: true,
+			customCSS: false,
 			silent: false,
 			lastActiveTab: 0,
 			dnd: false,
 			dndPreviousSettings: {
 				showNotification: true,
 				silent: false
-			}
+			},
+			downloadsPath: `${app.getPath('downloads')}`,
+			showDownloadFolder: false
 		};
 
 		// Platform specific settings
@@ -107,6 +132,15 @@ class ServerManagerView {
 			settingOptions.dndPreviousSettings.flashTaskbarOnMessage = true;
 		}
 
+		if (process.platform === 'darwin') {
+			// Only available on macOS
+			settingOptions.dockBouncing = true;
+		}
+
+		if (process.platform !== 'darwin') {
+			settingOptions.autoHideMenubar = false;
+		}
+
 		for (const i in settingOptions) {
 			if (ConfigUtil.getConfigItem(i) === null) {
 				ConfigUtil.setConfigItem(i, settingOptions[i]);
@@ -141,18 +175,20 @@ class ServerManagerView {
 		this.tabs.push(new ServerTab({
 			role: 'server',
 			icon: server.icon,
+			name: server.alias,
 			$root: this.$tabsContainer,
 			onClick: this.activateLastTab.bind(this, index),
 			index,
 			tabIndex,
-			onHover: this.onHover.bind(this, index, server.alias),
+			onHover: this.onHover.bind(this, index),
 			onHoverOut: this.onHoverOut.bind(this, index),
 			webview: new WebView({
 				$root: this.$webviewsContainer,
 				index,
 				tabIndex,
 				url: server.url,
-				name: server.alias,
+				role: 'server',
+				name: CommonUtil.decodeString(server.alias),
 				isActive: () => {
 					return index === this.activeTabIndex;
 				},
@@ -166,6 +202,24 @@ class ServerManagerView {
 
 	initActions() {
 		this.initDNDButton();
+		this.initServerActions();
+		this.initLeftSidebarEvents();
+	}
+
+	initServerActions() {
+		const $serverImgs = document.querySelectorAll('.server-icons');
+		$serverImgs.forEach(($serverImg, index) => {
+			this.addContextMenu($serverImg, index);
+			if ($serverImg.src.includes('img/icon.png')) {
+				this.displayInitialCharLogo($serverImg, index);
+			}
+			$serverImg.addEventListener('error', () => {
+				this.displayInitialCharLogo($serverImg, index);
+			});
+		});
+	}
+
+	initLeftSidebarEvents() {
 		this.$dndButton.addEventListener('click', () => {
 			const dndUtil = DNDUtil.toggle();
 			ipcRenderer.send('forward-message', 'toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
@@ -183,13 +237,6 @@ class ServerManagerView {
 			this.tabs[this.activeTabIndex].webview.back();
 		});
 
-		const $serverImgs = document.querySelectorAll('.server-icons');
-		$serverImgs.forEach($serverImg => {
-			$serverImg.addEventListener('error', () => {
-				$serverImg.src = 'img/icon.png';
-			});
-		});
-
 		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip, true);
 		this.sidebarHoverEvent(this.$settingsButton, this.$settingsTooltip);
 		this.sidebarHoverEvent(this.$reloadButton, this.$reloadTooltip);
@@ -208,6 +255,34 @@ class ServerManagerView {
 		return currentIndex;
 	}
 
+	displayInitialCharLogo($img, index) {
+		/*
+			index parameter needed because webview[data-tab-id] can increment
+			beyond size of sidebar org array and throw error
+		*/
+
+		const $altIcon = document.createElement('div');
+		const $parent = $img.parentElement;
+		const $container = $parent.parentElement;
+		const webviewId = $container.dataset.tabId;
+		const $webview = document.querySelector(`webview[data-tab-id="${webviewId}"]`);
+		const realmName = $webview.getAttribute('name');
+
+		if (realmName === null) {
+			$img.src = '/img/icon.png';
+			return;
+		}
+
+		$altIcon.textContent = realmName.charAt(0) || 'Z';
+		$altIcon.classList.add('server-icon');
+		$altIcon.classList.add('alt-icon');
+
+		$parent.removeChild($img);
+		$parent.appendChild($altIcon);
+
+		this.addContextMenu($altIcon, index);
+	}
+
 	sidebarHoverEvent(SidebarButton, SidebarTooltip, addServer = false) {
 		SidebarButton.addEventListener('mouseover', () => {
 			SidebarTooltip.removeAttribute('style');
@@ -225,8 +300,9 @@ class ServerManagerView {
 		});
 	}
 
-	onHover(index, serverName) {
-		this.$serverIconTooltip[index].innerHTML = serverName;
+	onHover(index) {
+		// this.$serverIconTooltip[index].innerHTML already has realm name, so we are just
+		// removing the style.
 		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
@@ -248,6 +324,7 @@ class ServerManagerView {
 		this.functionalTabs[tabProps.name] = this.tabs.length;
 
 		const tabIndex = this.getTabIndex();
+
 		this.tabs.push(new FunctionalTab({
 			role: 'function',
 			materialIcon: tabProps.materialIcon,
@@ -262,6 +339,7 @@ class ServerManagerView {
 				index: this.functionalTabs[tabProps.name],
 				tabIndex,
 				url: tabProps.url,
+				role: 'function',
 				name: tabProps.name,
 				isActive: () => {
 					return this.functionalTabs[tabProps.name] === this.activeTabIndex;
@@ -272,9 +350,11 @@ class ServerManagerView {
 				preload: false
 			})
 		}));
+
 		// To show loading indicator the first time a functional tab is opened, indicator is
 		// closed when the functional tab DOM is ready, handled in webview.js
 		this.$webviewsContainer.classList.remove('loaded');
+
 		this.activateTab(this.functionalTabs[tabProps.name]);
 	}
 
@@ -311,6 +391,25 @@ class ServerManagerView {
 		ConfigUtil.setConfigItem('lastActiveTab', index);
 	}
 
+	// returns this.tabs in an way that does
+	// not crash app when this.tabs is passed into
+	// ipcRenderer. Something about webview, and props.webview
+	// properties in ServerTab causes the app to crash.
+	get tabsForIpc() {
+		const tabs = [];
+		this.tabs.forEach(tab => {
+			const proto = Object.create(Object.getPrototypeOf(tab));
+			const tabClone = Object.assign(proto, tab);
+
+			tabClone.webview = { props: {} };
+			tabClone.webview.props.name = tab.webview.props.name;
+			delete tabClone.props.webview;
+			tabs.push(tabClone);
+		});
+
+		return tabs;
+	}
+
 	activateTab(index, hideOldTab = true) {
 		if (!this.tabs[index]) {
 			return;
@@ -337,38 +436,12 @@ class ServerManagerView {
 		this.tabs[index].activate();
 
 		ipcRenderer.send('update-menu', {
-			tabs: this.tabs,
-			activeTabIndex: this.activeTabIndex
-		});
-
-		ipcRenderer.on('toggle-sidebar', (event, state) => {
-			const selector = 'webview:not([class*=disabled])';
-			const webview = document.querySelector(selector);
-			const webContents = webview.getWebContents();
-			webContents.send('toggle-sidebar', state);
-		});
-
-		ipcRenderer.on('toggle-silent', (event, state) => {
-			const webviews = document.querySelectorAll('webview');
-			webviews.forEach(webview => {
-				try {
-					webview.setAudioMuted(state);
-				} catch (err) {
-					// webview is not ready yet
-					webview.addEventListener('dom-ready', () => {
-						webview.isAudioMuted();
-					});
-				}
-			});
-		});
-
-		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
-			this.toggleDNDButton(state);
-			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
-			const selector = 'webview:not([class*=disabled])';
-			const webview = document.querySelector(selector);
-			const webContents = webview.getWebContents();
-			webContents.send('toggle-dnd', state, newSettings);
+			// JSON stringify this.tabs to avoid a crash
+			// util.inspect is being used to handle circular references
+			tabs: this.tabsForIpc,
+			activeTabIndex: this.activeTabIndex,
+			// Following flag controls whether a menu item should be enabled or not
+			enableMenu: this.tabs[index].props.role === 'server'
 		});
 	}
 
@@ -410,6 +483,7 @@ class ServerManagerView {
 		// Destroy the current view and re-initiate it
 		this.destroyView();
 		this.initTabs();
+		this.initServerActions();
 	}
 
 	// This will trigger when pressed CTRL/CMD + R [WIP]
@@ -441,10 +515,42 @@ class ServerManagerView {
 
 	// Toggles the dnd button icon.
 	toggleDNDButton(alert) {
-		this.$dndTooltip.textContent = (alert ? 'Turn Off' : 'Enable') + ' Do Not Disturb';
+		this.$dndTooltip.textContent = (alert ? 'Disable' : 'Enable') + ' Do Not Disturb';
 		this.$dndButton.querySelector('i').textContent = alert ? 'notifications_off' : 'notifications';
 	}
 
+	addContextMenu($serverImg, index) {
+		$serverImg.addEventListener('contextmenu', e => {
+			e.preventDefault();
+			const template = [
+				{
+					label: 'Disconnect organization',
+					click: () => {
+						dialog.showMessageBox({
+							type: 'warning',
+							buttons: ['YES', 'NO'],
+							defaultId: 0,
+							message: 'Are you sure you want to disconnect this organization?'
+						}, response => {
+							if (response === 0) {
+								DomainUtil.removeDomain(index);
+								ipcRenderer.send('reload-full-app');
+							}
+						});
+					}
+				},
+				{
+					label: 'Copy Zulip URL',
+					click: () => {
+						clipboard.writeText(DomainUtil.getDomain(index).url);
+					}
+				}
+			];
+			const contextMenu = Menu.buildFromTemplate(template);
+			contextMenu.popup({ window: remote.getCurrentWindow() });
+		});
+	}
+
 	registerIpcs() {
 		const webviewListeners = {
 			'webview-reload': 'reload',
@@ -490,16 +596,88 @@ class ServerManagerView {
 			this.activateLastTab(index);
 		});
 
+		ipcRenderer.on('open-org-tab', () => {
+			this.openSettings('AddServer');
+		});
+
 		ipcRenderer.on('reload-proxy', (event, showAlert) => {
 			this.loadProxy().then(() => {
 				if (showAlert) {
 					alert('Proxy settings saved!');
+					ipcRenderer.send('reload-full-app');
 				}
 			});
 		});
 
 		ipcRenderer.on('toggle-sidebar', (event, show) => {
+			// Toggle the left sidebar
 			this.toggleSidebar(show);
+
+			// Toggle sidebar switch in the general settings
+			const selector = 'webview:not([class*=disabled])';
+			const webview = document.querySelector(selector);
+			const webContents = webview.getWebContents();
+			webContents.send('toggle-sidebar-setting', show);
+		});
+
+		ipcRenderer.on('toggle-silent', (event, state) => {
+			const webviews = document.querySelectorAll('webview');
+			webviews.forEach(webview => {
+				try {
+					webview.setAudioMuted(state);
+				} catch (err) {
+					// webview is not ready yet
+					webview.addEventListener('dom-ready', () => {
+						webview.setAudioMuted(state);
+					});
+				}
+			});
+		});
+
+		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
+			this.toggleDNDButton(state);
+			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
+			const selector = 'webview:not([class*=disabled])';
+			const webview = document.querySelector(selector);
+			const webContents = webview.getWebContents();
+			webContents.send('toggle-dnd', state, newSettings);
+		});
+
+		ipcRenderer.on('update-realm-name', (event, serverURL, realmName) => {
+			DomainUtil.getDomains().forEach((domain, index) => {
+				if (domain.url.includes(serverURL)) {
+					const serverTooltipSelector = `.tab .server-tooltip`;
+					const serverTooltips = document.querySelectorAll(serverTooltipSelector);
+					serverTooltips[index].innerHTML = escape(realmName);
+					this.tabs[index].props.name = escape(realmName);
+					this.tabs[index].webview.props.name = realmName;
+
+					domain.alias = escape(realmName);
+					DomainUtil.db.push(`/domains[${index}]`, domain, true);
+					DomainUtil.reloadDB();
+					// Update the realm name also on the Window menu
+					ipcRenderer.send('update-menu', {
+						tabs: this.tabsForIpc,
+						activeTabIndex: this.activeTabIndex
+					});
+				}
+			});
+		});
+
+		ipcRenderer.on('update-realm-icon', (event, serverURL, iconURL) => {
+			DomainUtil.getDomains().forEach((domain, index) => {
+				if (domain.url.includes(serverURL)) {
+					DomainUtil.saveServerIcon(iconURL).then(localIconUrl => {
+						const serverImgsSelector = `.tab .server-icons`;
+						const serverImgs = document.querySelectorAll(serverImgsSelector);
+						serverImgs[index].src = localIconUrl;
+
+						domain.icon = localIconUrl;
+						DomainUtil.db.push(`/domains[${index}]`, domain, true);
+						DomainUtil.reloadDB();
+					});
+				}
+			});
 		});
 
 		ipcRenderer.on('enter-fullscreen', () => {
@@ -555,6 +733,14 @@ class ServerManagerView {
 		ipcRenderer.on('open-feedback-modal', () => {
 			feedbackHolder.classList.add('show');
 		});
+
+		ipcRenderer.on('copy-zulip-url', () => {
+			clipboard.writeText(DomainUtil.getDomain(this.activeTabIndex).url);
+		});
+
+		ipcRenderer.on('new-server', () => {
+			this.openSettings('AddServer');
+		});
 	}
 }
 
@@ -568,7 +754,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

app/renderer/js/notification/helpers.js

@@ -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});
@@ -135,7 +141,8 @@ function parseReply(reply) {
 
 function setupReply(id) {
 	const { narrow } = window;
-	narrow.by_subject(id, { trigger: 'notification' });
+	const narrowByTopic = narrow.by_topic || narrow.by_subject;
+	narrowByTopic(id, { trigger: 'notification' });
 }
 
 module.exports = {

app/renderer/js/notification/index.js

@@ -4,6 +4,7 @@ const {
   remote: { app }
 } = require('electron');
 
+const params = require('../utils/params-util.js');
 const DefaultNotification = require('./default-notification');
 const { appId, loadBots } = require('./helpers');
 
@@ -19,9 +20,8 @@ if (process.platform === 'darwin') {
 }
 
 window.addEventListener('load', () => {
-	// Call this function only when user is logged in
 	// eslint-disable-next-line no-undef, camelcase
-	if (page_params.realm_uri) {
+	if (params.isPageParams() && page_params.realm_uri) {
 		loadBots();
 	}
 });

app/renderer/js/pages/preference/add-certificate.js

@@ -0,0 +1,92 @@
+'use-strict';
+
+const { dialog } = require('electron').remote;
+const path = require('path');
+
+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 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>Certificate file</div>
+					<button class="green" id="add-certificate-button">Upload</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 = path.basename(certificate);
+			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;

app/renderer/js/pages/preference/connected-org-section.js

@@ -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 id="new-org-button"><button class="green sea w-250">Connect to another organization</button></div>
+				<div class="page-title">Add Custom Certificates</div>
+				<div id="add-certificate-container"></div>
 			</div>
 		`;
 	}
@@ -29,8 +33,11 @@ class ConnectedOrgSection extends BaseSection {
 
 		const servers = DomainUtil.getDomains();
 		this.props.$root.innerHTML = this.template();
+
 		this.$serverInfoContainer = document.getElementById('server-info-container');
 		this.$existingServers = document.getElementById('existing-servers');
+		this.$newOrgButton = document.getElementById('new-org-button');
+		this.$addCertificateContainer = document.getElementById('add-certificate-container');
 
 		const noServerText = 'All the connected orgnizations will appear here';
 		// Show noServerText if no servers are there otherwise hide it
@@ -44,6 +51,20 @@ class ConnectedOrgSection extends BaseSection {
 				onChange: this.reloadApp
 			}).init();
 		}
+
+		this.$newOrgButton.addEventListener('click', () => {
+			// We don't need to import this since it's already imported in other files
+			// eslint-disable-next-line no-undef
+			ipcRenderer.send('forward-message', 'open-org-tab');
+		});
+
+		this.initAddCertificate();
+	}
+
+	initAddCertificate() {
+		new AddCertificate({
+			$root: this.$addCertificateContainer
+		}).init();
 	}
 
 }

app/renderer/js/pages/preference/general-section.js

@@ -23,23 +23,31 @@ class GeneralSection extends BaseSection {
 						<div class="setting-description">Show app icon in system tray</div>
 						<div class="setting-control"></div>
 					</div>
+					<div class="setting-row" id="menubar-option" style= "display:${process.platform === 'darwin' ? 'none' : ''}">
+						<div class="setting-description">Auto hide menu bar (Press Alt key to display)</div>
+						<div class="setting-control"></div>
+					</div>
 					<div class="setting-row" id="sidebar-option">
-						<div class="setting-description">Show sidebar (<span class="code">Cmd Or Ctrl+S</span>)</div>
+						<div class="setting-description">Show sidebar (<span class="code">${process.platform === 'darwin' ? 'Cmd+Shift+S' : 'Ctrl+Shift+S'}</span>)</div>
 						<div class="setting-control"></div>
 					</div>
 					<div class="setting-row" id="badge-option">
 						<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>
 					</div>
 				</div>
-				<div class="title">Desktop Notification</div>
+				<div class="title">Desktop Notifications</div>
 				<div class="settings-card">
 					<div class="setting-row" id="show-notification-option">
-						<div class="setting-description">Show Desktop Notifications</div>
+						<div class="setting-description">Show desktop notifications</div>
 						<div class="setting-control"></div>
 					</div>
 					<div class="setting-row" id="silent-option">
@@ -48,7 +56,11 @@ class GeneralSection extends BaseSection {
 					</div>
 				</div>
 				<div class="title">App Updates</div>
-                <div class="settings-card">
+				<div class="settings-card">
+				<div class="setting-row" id="autoupdate-option">
+						<div class="setting-description">Enable auto updates</div>
+						<div class="setting-control"></div>
+					</div>
 					<div class="setting-row" id="betaupdate-option">
 						<div class="setting-description">Get beta updates</div>
 						<div class="setting-control"></div>
@@ -65,34 +77,54 @@ class GeneralSection extends BaseSection {
 						<div class="setting-control"></div>
 					</div>
 					<div class="setting-row" id="enable-spellchecker-option">
-						<div class="setting-description">Enable Spellchecker (requires restart)</div>
+						<div class="setting-description">Enable spellchecker (requires restart)</div>
 						<div class="setting-control"></div>
 					</div>
 				</div>
-				<div class="title">Add custom CSS</div>
+				<div class="title">Advanced</div>
 				<div class="settings-card">
-					<div class="setting-row" id="add-custom-css">
+				<div class="setting-row" id="enable-error-reporting">
+					<div class="setting-description">Enable error reporting (requires restart)</div>
+					<div class="setting-control"></div>
+				</div>
+				<div class="setting-row" id="show-download-folder">
+					<div class="setting-description">Show downloaded files in file manager</div>
+					<div class="setting-control"></div>
+				</div>
+				<div class="setting-row" id="add-custom-css">
+				<div class="setting-description">
+					Add custom CSS
+				</div>
+				<button class="custom-css-button green">Upload</button>
+			</div>
+			<div class="setting-row" id="remove-custom-css">
+				<div class="setting-description">
+					<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigItem('customCSS')}</div>
+				</div>
+				<div class="action red" id="css-delete-action">
+					<i class="material-icons">indeterminate_check_box</i>
+					<span>Delete</span>
+				</div>
+			</div>
+					<div class="setting-row" id="download-folder">
 						<div class="setting-description">
-							This will inject the selected css stylesheet in all the added accounts
+							Default download location
 						</div>
-						<button class="custom-css-button blue">Add</button>
+						<button class="download-folder-button green">Change</button>
 					</div>
-					<div class="setting-row" id="remove-custom-css">
+					<div class="setting-row">
 						<div class="setting-description">
-							<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigItem('customCSS')}</div>
-						</div>
-						<div class="action red" id="css-delete-action">
-							<i class="material-icons">indeterminate_check_box</i>
-							<span>Delete</span>
+							<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">
 						<div class="setting-description">This will delete all application data including all added accounts and preferences
 						</div>
-						<button class="reset-data-button blue">Reset App Data</button>
+						<button class="reset-data-button red w-150">Reset App Data</button>
 					</div>
 				</div>
             </div>
@@ -104,7 +136,8 @@ class GeneralSection extends BaseSection {
 		this.updateTrayOption();
 		this.updateBadgeOption();
 		this.updateSilentOption();
-		this.updateUpdateOption();
+		this.autoUpdateOption();
+		this.betaUpdateOption();
 		this.updateSidebarOption();
 		this.updateStartAtLoginOption();
 		this.updateResetDataOption();
@@ -114,12 +147,25 @@ class GeneralSection extends BaseSection {
 		this.addCustomCSS();
 		this.showCustomCSSPath();
 		this.removeCustomCSS();
+		this.downloadFolder();
+		this.showDownloadFolder();
+		this.enableErrorReporting();
 
 		// Platform specific settings
+
 		// Flashing taskbar on Windows
 		if (process.platform === 'win32') {
 			this.updateFlashTaskbar();
 		}
+		// Dock bounce on macOS
+		if (process.platform === 'darwin') {
+			this.updateDockBouncing();
+		}
+
+		// Auto hide menubar on Windows and Linux
+		if (process.platform !== 'darwin') {
+			this.updateMenubarOption();
+		}
 	}
 
 	updateTrayOption() {
@@ -135,6 +181,19 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
+	updateMenubarOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#menubar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('autoHideMenubar', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
+				ConfigUtil.setConfigItem('autoHideMenubar', newValue);
+				ipcRenderer.send('toggle-menubar', newValue);
+				this.updateMenubarOption();
+			}
+		});
+	}
+
 	updateBadgeOption() {
 		this.generateSettingOption({
 			$element: document.querySelector('#badge-option .setting-control'),
@@ -148,6 +207,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'),
@@ -160,14 +231,32 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
-	updateUpdateOption() {
+	autoUpdateOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#autoupdate-option .setting-control'),
+			value: ConfigUtil.getConfigItem('autoUpdate', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('autoUpdate');
+				ConfigUtil.setConfigItem('autoUpdate', newValue);
+				if (!newValue) {
+					ConfigUtil.setConfigItem('betaUpdate', false);
+					this.betaUpdateOption();
+				}
+				this.autoUpdateOption();
+			}
+		});
+	}
+
+	betaUpdateOption() {
 		this.generateSettingOption({
 			$element: document.querySelector('#betaupdate-option .setting-control'),
 			value: ConfigUtil.getConfigItem('betaUpdate', false),
 			clickHandler: () => {
 				const newValue = !ConfigUtil.getConfigItem('betaUpdate');
-				ConfigUtil.setConfigItem('betaUpdate', newValue);
-				this.updateUpdateOption();
+				if (ConfigUtil.getConfigItem('autoUpdate')) {
+					ConfigUtil.setConfigItem('betaUpdate', newValue);
+					this.betaUpdateOption();
+				}
 			}
 		});
 	}
@@ -235,6 +324,18 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
+	enableErrorReporting() {
+		this.generateSettingOption({
+			$element: document.querySelector('#enable-error-reporting .setting-control'),
+			value: ConfigUtil.getConfigItem('errorReporting', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('errorReporting');
+				ConfigUtil.setConfigItem('errorReporting', newValue);
+				this.enableErrorReporting();
+			}
+		});
+	}
+
 	clearAppDataDialog() {
 		const clearAppDataMessage = 'By clicking proceed you will be removing all added accounts and preferences from Zulip. When the application restarts, it will be as if you are starting Zulip for the first time.';
 		const getAppPath = path.join(app.getPath('appData'), app.getName());
@@ -310,6 +411,40 @@ 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();
+		});
+	}
+
+	showDownloadFolder() {
+		this.generateSettingOption({
+			$element: document.querySelector('#show-download-folder .setting-control'),
+			value: ConfigUtil.getConfigItem('showDownloadFolder', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('showDownloadFolder');
+				ConfigUtil.setConfigItem('showDownloadFolder', newValue);
+				this.showDownloadFolder();
+			}
+		});
+	}
+
 }
 
 module.exports = GeneralSection;

app/renderer/js/pages/preference/network-section.js

@@ -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"/>
@@ -34,8 +38,7 @@ class NetworkSection extends BaseSection {
 							<input class="setting-input-value" placeholder="e.g. foobar.com"/>
 						</div>
 						<div class="setting-row">
-							<div class="action blue" id="proxy-save-action">
-								<i class="material-icons">check_box</i>
+							<div class="action green" id="proxy-save-action">
 								<span>Save</span>
 							</div>
 						</div>
@@ -51,7 +54,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 +71,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);
+				const newValue = !ConfigUtil.getConfigItem('useSystemProxy');
+				const manualProxyValue = ConfigUtil.getConfigItem('useManualProxy');
+				if (manualProxyValue && newValue) {
+					ConfigUtil.setConfigItem('useManualProxy', !manualProxyValue);
+					this.toggleManualProxySettings(!manualProxyValue);
+				}
 				if (newValue === false) {
-					// Reload proxy if the proxy is turned off
+					// Remove proxy system proxy settings
+					ConfigUtil.setConfigItem('proxyRules', '');
 					ipcRenderer.send('forward-message', 'reload-proxy', false);
 				}
+				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();
 			}
 		});

app/renderer/js/pages/preference/preference.js

@@ -90,7 +90,7 @@ class PreferenceView extends BaseComponent {
 			this.handleNavigation(navItem);
 		});
 
-		ipcRenderer.on('toggle-sidebar', (event, state) => {
+		ipcRenderer.on('toggle-sidebar-setting', (event, state) => {
 			this.handleToggle('sidebar-option', state);
 		});
 

app/renderer/js/pages/preference/shortcuts-section.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const BaseSection = require(__dirname + '/base-section.js');
+const shell = require('electron').shell;
 
 class ShortcutsSection extends BaseSection {
 	constructor(props) {
@@ -13,6 +14,7 @@ class ShortcutsSection extends BaseSection {
 
 		return `
             <div class="settings-pane">
+            <div class="settings-card tip"><p><b><i class="material-icons md-14">settings</i>Tip:  </b>These desktop app shortcuts extend the Zulip webapp's <span id="open-hotkeys-link"> keyboard shortcuts</span>.</p></div>
               <div class="title">Application Shortcuts</div>
               <div class="settings-card">
                 <table>
@@ -128,6 +130,14 @@ class ShortcutsSection extends BaseSection {
                     <td><kbd>Option</kbd><kbd>${userOSKey}</kbd><kbd>U</kbd></td>
                     <td>Toggle DevTools for Active Tab</td>
                   </tr>
+                  <tr>
+                    <td><kbd>Ctrl</kbd> + <kbd>Tab</kbd></td>
+                    <td>Switch to Next Organization</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
+                    <td>Switch to Previous Organization</td>
+                  </tr>
                 </table>
                 <div class="setting-control"></div>
               </div>
@@ -168,6 +178,7 @@ class ShortcutsSection extends BaseSection {
 
 		return `
             <div class="settings-pane">
+            <div class="settings-card tip"><p><b><i class="material-icons md-14">settings</i>Tip:  </b>These desktop app shortcuts extend the Zulip webapp's <span id="open-hotkeys-link"> keyboard shortcuts</span>.</p></div>
               <div class="title">Application Shortcuts</div>
               <div class="settings-card">
                 <table>
@@ -267,6 +278,14 @@ class ShortcutsSection extends BaseSection {
                     <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>U</kbd></td>
                     <td>Toggle DevTools for Active Tab</td>
                   </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Tab</kbd></td>
+                    <td>Switch to Next Organization</td>
+                  </tr>
+                  <tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd></td>
+                    <td>Switch to Previous Organization</td>
+                  </tr>
                 </table>
                 <div class="setting-control"></div>
               </div>
@@ -302,9 +321,17 @@ class ShortcutsSection extends BaseSection {
 		`;
 	}
 
+	openHotkeysExternalLink() {
+		const link = 'https://zulipchat.com/help/keyboard-shortcuts';
+		const externalCreateNewOrgEl = document.getElementById('open-hotkeys-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
 	init() {
 		this.props.$root.innerHTML = (process.platform === 'darwin') ?
 			this.templateMac() : this.templateWinLin();
+		this.openHotkeysExternalLink();
 	}
 }
 

app/renderer/js/preload.js

@@ -1,10 +1,11 @@
 'use strict';
 
-const { ipcRenderer } = require('electron');
+const { ipcRenderer, shell } = require('electron');
 const SetupSpellChecker = require('./spellchecker');
 
 const ConfigUtil = require(__dirname + '/utils/config-util.js');
 const LinkUtil = require(__dirname + '/utils/link-util.js');
+const params = require(__dirname + '/utils/params-util.js');
 
 // eslint-disable-next-line import/no-unassigned-import
 require('./notification');
@@ -12,6 +13,9 @@ require('./notification');
 // Prevent drag and drop event in main process which prevents remote code executaion
 require(__dirname + '/shared/preventdrag.js');
 
+// eslint-disable-next-line camelcase
+window.electron_bridge = require('./electron-bridge');
+
 const logout = () => {
 	// Create the menu for the below
 	document.querySelector('.dropdown-toggle').click();
@@ -39,41 +43,44 @@ process.once('loaded', () => {
 
 // To prevent failing this script on linux we need to load it after the document loaded
 document.addEventListener('DOMContentLoaded', () => {
+	if (params.isPageParams()) {
 	// Get the default language of the server
-	const serverLanguage = page_params.default_language; // eslint-disable-line no-undef, camelcase
+		const serverLanguage = page_params.default_language; // eslint-disable-line no-undef, camelcase
+		if (serverLanguage) {
+			// Set spellcheker language
+			ConfigUtil.setConfigItem('spellcheckerLanguage', serverLanguage);
+			// Init spellchecker
+			SetupSpellChecker.init();
+		}
+		// redirect users to network troubleshooting page
+		const getRestartButton = document.querySelector('.restart_get_events_button');
+		if (getRestartButton) {
+			getRestartButton.addEventListener('click', () => {
+				ipcRenderer.send('forward-message', 'reload-viewer');
+			});
+		}
+		// Open image attachment link in the lightbox instead of opening in the default browser
+		const { $, lightbox } = window;
+		$('#main_div').on('click', '.message_content p a', function (e) {
+			const url = $(this).attr('href');
 
-	if (serverLanguage) {
-		// Set spellcheker language
-		ConfigUtil.setConfigItem('spellcheckerLanguage', serverLanguage);
-		// Init spellchecker
-		SetupSpellChecker.init();
-	}
+			if (LinkUtil.isImage(url)) {
+				const $img = $(this).parent().siblings('.message_inline_image').find('img');
 
-	// redirect users to network troubleshooting page
-	const getRestartButton = document.querySelector('.restart_get_events_button');
-	if (getRestartButton) {
-		getRestartButton.addEventListener('click', () => {
-			ipcRenderer.send('forward-message', 'reload-viewer');
+				// prevent the image link from opening in a new page.
+				e.preventDefault();
+				// 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);
+			}
 		});
 	}
-
-	// Open image attachment link in the lightbox instead of opening in the default browser
-	const { $, lightbox } = window;
-
-	$('#main_div').on('click', '.message_content p a', function (e) {
-		const url = $(this).attr('href');
-
-		if (LinkUtil.isImage(url)) {
-			const $img = $(this).parent().siblings('.message_inline_image').find('img');
-
-			// prevent the image link from opening in a new page.
-			e.preventDefault();
-			// prevent the message compose dialog from happening.
-			e.stopPropagation();
-
-			lightbox.open($img);
-		}
-	});
 });
 
 // Clean up spellchecker events after you navigate away from this page;
@@ -84,8 +91,15 @@ window.addEventListener('beforeunload', () => {
 
 // electron's globalShortcut can cause unexpected results
 // so adding the reload shortcut in the old-school way
+// Zoom from numpad keys is not supported by electron, so adding it through listeners.
 document.addEventListener('keydown', event => {
 	if (event.code === 'F5') {
 		ipcRenderer.send('forward-message', 'hard-reload');
+	} else if (event.ctrlKey && event.code === 'NumpadAdd') {
+		ipcRenderer.send('forward-message', 'zoomIn');
+	} else if (event.ctrlKey && event.code === 'NumpadSubtract') {
+		ipcRenderer.send('forward-message', 'zoomOut');
+	} else if (event.ctrlKey && event.code === 'Numpad0') {
+		ipcRenderer.send('forward-message', 'zoomActualSize');
 	}
 });

app/renderer/js/spellchecker.js

@@ -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);
 		}
 	}
 
@@ -26,14 +32,7 @@ class SetupSpellChecker {
 
 			const userLanguage = ConfigUtil.getConfigItem('spellcheckerLanguage');
 
-			// eslint-disable-next-line no-unused-expressions
-			process.platform === 'darwin' ?
-				// On macOS, spellchecker fails to auto-detect the lanugage user is typing in
-				// that's why we need to mention it explicitly
-				this.SpellCheckHandler.switchLanguage(userLanguage) :
-				// On Linux and Windows, spellchecker can automatically detects the language the user is typing in
-				// and silently switches on the fly; thus we can start off as US English
-				this.SpellCheckHandler.switchLanguage('en-US');
+			this.SpellCheckHandler.switchLanguage(userLanguage);
 		}
 
 		const contextMenuBuilder = new ContextMenuBuilder(this.SpellCheckHandler);

app/renderer/js/tray.js

@@ -3,9 +3,9 @@ const path = require('path');
 
 const electron = require('electron');
 
-const {ipcRenderer, remote} = electron;
+const { ipcRenderer, remote } = electron;
 
-const {Tray, Menu, nativeImage, BrowserWindow} = remote;
+const { Tray, Menu, nativeImage, BrowserWindow } = remote;
 
 const APP_ICON = path.join(__dirname, '../../resources/tray', 'tray');
 
@@ -99,7 +99,9 @@ const renderNativeImage = function (arg) {
 		.then(() => renderCanvas(arg))
 		.then(canvas => {
 			const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPNG();
-			return Promise.resolve(nativeImage.createFromBuffer(pngData, config.pixelRatio));
+			return Promise.resolve(nativeImage.createFromBuffer(pngData, {
+				scaleFactor: config.pixelRatio
+			}));
 		});
 };
 
@@ -115,50 +117,36 @@ function sendAction(action) {
 
 const createTray = function () {
 	window.tray = new Tray(iconPath());
-	const contextMenu = Menu.buildFromTemplate([{
-		label: 'About',
-		click() {
-			// We need to focus the main window first
-			ipcRenderer.send('focus-app');
-			sendAction('open-about');
+	const contextMenu = Menu.buildFromTemplate([
+		{
+			label: 'Zulip',
+			click() {
+				ipcRenderer.send('focus-app');
+			}
+		},
+		{
+			label: 'Settings',
+			click() {
+				ipcRenderer.send('focus-app');
+				sendAction('open-settings');
+			}
+		},
+		{
+			type: 'separator'
+		},
+		{
+			label: 'Quit',
+			click() {
+				ipcRenderer.send('quit-app');
+			}
 		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Focus',
-		click() {
-			ipcRenderer.send('focus-app');
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Settings',
-		click() {
-			ipcRenderer.send('focus-app');
-			sendAction('open-settings');
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Quit',
-		click() {
-			ipcRenderer.send('quit-app');
-		}
-	}
 	]);
 	window.tray.setContextMenu(contextMenu);
-	window.tray.on('click', () => {
-		// Click event only works on Windows
-		if (process.platform === 'win32') {
+	if (process.platform === 'linux' || process.platform === 'win32') {
+		window.tray.on('click', () => {
 			ipcRenderer.send('toggle-app');
-		}
-	});
+		});
+	}
 };
 
 ipcRenderer.on('destroytray', event => {

app/renderer/js/utils/certificate-util.js

@@ -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();

app/renderer/js/utils/common-util.js

@@ -0,0 +1,25 @@
+'use strict';
+
+let instance = null;
+
+class CommonUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+		return instance;
+	}
+
+	// unescape already encoded/escaped strings
+	decodeString(string) {
+		const parser = new DOMParser();
+		const dom = parser.parseFromString(
+			'<!doctype html><body>' + string,
+			'text/html');
+		return dom.body.textContent;
+	}
+}
+
+module.exports = new CommonUtil();

app/renderer/js/utils/config-util.js

@@ -39,7 +39,12 @@ class ConfigUtil {
 	}
 
 	getConfigItem(key, defaultValue = null) {
-		this.reloadDB();
+		try {
+			this.db.reload();
+		} catch (err) {
+			logger.error('Error while reloading settings.json: ');
+			logger.error(err);
+		}
 		const value = this.db.getData('/')[key];
 		if (value === undefined) {
 			this.setConfigItem(key, defaultValue);
@@ -48,19 +53,30 @@ class ConfigUtil {
 			return value;
 		}
 	}
+	// This function returns whether a key exists in the configuration file (settings.json)
+	isConfigItemExists(key) {
+		try {
+			this.db.reload();
+		} catch (err) {
+			logger.error('Error while reloading settings.json: ');
+			logger.error(err);
+		}
+		const value = this.db.getData('/')[key];
+		return (value !== undefined);
+	}
 
 	setConfigItem(key, value) {
 		this.db.push(`/${key}`, value, true);
-		this.reloadDB();
+		this.db.save();
 	}
 
 	removeConfigItem(key) {
 		this.db.delete(`/${key}`);
-		this.reloadDB();
+		this.db.save();
 	}
 
 	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 +85,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);

app/renderer/js/utils/default-util.js

@@ -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;
 	}
 };

app/renderer/js/utils/domain-util.js

@@ -5,8 +5,12 @@ const fs = require('fs');
 const path = require('path');
 const JsonDB = require('node-json-db');
 const request = require('request');
+const escape = require('escape-html');
+
 const Logger = require('./logger-util');
 
+const RequestUtil = require(__dirname + '/../utils/request-util.js');
+
 const logger = new Logger({
 	file: `domain-util.log`,
 	timestamp: true
@@ -57,9 +61,10 @@ class DomainUtil {
 	}
 
 	addDomain(server) {
+		const ignoreCerts = server.ignoreCerts;
 		return new Promise(resolve => {
 			if (server.icon) {
-				this.saveServerIcon(server.icon).then(localIconUrl => {
+				this.saveServerIcon(server, ignoreCerts).then(localIconUrl => {
 					server.icon = localIconUrl;
 					this.db.push('/domains[]', server, true);
 					this.reloadDB();
@@ -96,68 +101,74 @@ class DomainUtil {
 		return false;
 	}
 
-	checkDomain(domain, silent = false) {
+	// ignoreCerts parameter helps in fetching server icon and
+	// other server details when user chooses to ignore certificate warnings
+	checkDomain(domain, ignoreCerts = false, silent = false) {
 		if (!silent && this.duplicateDomain(domain)) {
 			// Do not check duplicate in silent mode
 			return Promise.reject('This server has been added.');
 		}
 
 		domain = this.formatUrl(domain);
-
-		const checkDomain = domain + '/static/audio/zulip.ogg';
+		const checkDomain = {
+			url: domain + '/static/audio/zulip.ogg',
+			...RequestUtil.requestOptions(domain, ignoreCerts)
+		};
 
 		const serverConf = {
 			icon: defaultIconUrl,
 			url: domain,
-			alias: domain
+			alias: domain,
+			ignoreCerts
 		};
 
 		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 => {
+					this.getServerSettings(domain, serverConf.ignoreCerts).then(serverSettings => {
 						resolve(serverSettings);
 					}, () => {
 						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 => {
+						this.getServerSettings(domain, serverConf.ignoreCerts).then(serverSettings => {
 							resolve(serverSettings);
 						}, () => {
 							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 => {
 							if (response === 0) {
-								this.getServerSettings(domain).then(serverSettings => {
+								// set ignoreCerts parameter to true in case user responds with yes
+								serverConf.ignoreCerts = true;
+								this.getServerSettings(domain, serverConf.ignoreCerts).then(serverSettings => {
 									resolve(serverSettings);
 								}, () => {
 									resolve(serverConf);
@@ -169,17 +180,22 @@ 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);
 				}
 			});
 		});
 	}
 
-	getServerSettings(domain) {
-		const serverSettingsUrl = domain + '/api/v1/server_settings';
+	getServerSettings(domain, ignoreCerts = false) {
+		const serverSettingsOptions = {
+			url: domain + '/api/v1/server_settings',
+			...RequestUtil.requestOptions(domain, ignoreCerts)
+		};
+
 		return new Promise((resolve, reject) => {
-			request(serverSettingsUrl, (error, response) => {
+			request(serverSettingsOptions, (error, response) => {
 				if (!error && response.statusCode === 200) {
 					const data = JSON.parse(response.body);
 					if (data.hasOwnProperty('realm_icon') && data.realm_icon) {
@@ -188,7 +204,8 @@ class DomainUtil {
 							// Following check handles both the cases
 							icon: data.realm_icon.startsWith('/') ? data.realm_uri + data.realm_icon : data.realm_icon,
 							url: data.realm_uri,
-							alias: data.realm_name
+							alias: escape(data.realm_name),
+							ignoreCerts
 						});
 					}
 				} else {
@@ -198,26 +215,40 @@ class DomainUtil {
 		});
 	}
 
-	saveServerIcon(url) {
+	saveServerIcon(server, ignoreCerts = false) {
+		const url = server.icon;
+		const domain = server.url;
+
+		const serverIconOptions = {
+			url,
+			...RequestUtil.requestOptions(domain, ignoreCerts)
+		};
+
 		// The save will always succeed. If url is invalid, downgrade to default icon.
 		return new Promise(resolve => {
 			const filePath = this.generateFilePath(url);
 			const file = fs.createWriteStream(filePath);
 			try {
-				request(url).on('response', response => {
+				request(serverIconOptions).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);
 			}
 		});
@@ -225,8 +256,9 @@ class DomainUtil {
 
 	updateSavedServer(url, index) {
 		// Does not promise successful update
-		this.checkDomain(url, true).then(newServerConf => {
-			this.saveServerIcon(newServerConf.icon).then(localIconUrl => {
+		const ignoreCerts = this.getDomain(index).ignoreCerts;
+		this.checkDomain(url, ignoreCerts, true).then(newServerConf => {
+			this.saveServerIcon(newServerConf, ignoreCerts).then(localIconUrl => {
 				newServerConf.icon = localIconUrl;
 				this.updateDomain(index, newServerConf);
 				this.reloadDB();
@@ -235,7 +267,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);
@@ -249,6 +281,7 @@ class DomainUtil {
 				);
 				logger.error('Error while JSON parsing domain.json: ');
 				logger.error(err);
+				logger.reportSentry(err);
 			}
 		}
 		this.db = new JsonDB(domainJsonPath, true, true);

app/renderer/js/utils/link-util.js

@@ -34,6 +34,12 @@ class LinkUtil {
 		const isImageUrl = /\.(bmp|gif|jpg|jpeg|png|webp)\?*.*$/i;
 		return isImageUrl.test(url);
 	}
+
+	isPDF(url) {
+		// test for pdf extension
+		const isPDFUrl = /\.(pdf)\?*.*$/i;
+		return isPDFUrl.test(url);
+	}
 }
 
 module.exports = new LinkUtil();

app/renderer/js/utils/linux-update-util.js

@@ -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);

app/renderer/js/utils/logger-util.js

@@ -1,12 +1,28 @@
 const NodeConsole = require('console').Console;
 const fs = require('fs');
+const os = require('os');
 const isDev = require('electron-is-dev');
 const { initSetUp } = require('./default-util');
+const { sentryInit, captureException } = require('./sentry-util');
 
 initSetUp();
+
 let app = null;
+let reportErrors = true;
 if (process.type === 'renderer') {
 	app = require('electron').remote.app;
+
+	// Report Errors to Sentry only if it is enabled in settings
+	// Gets the value of reportErrors from config-util for renderer process
+	// For main process, sentryInit() is handled in index.js
+	const { ipcRenderer } = require('electron');
+	ipcRenderer.send('error-reporting');
+	ipcRenderer.on('error-reporting-val', (event, errorReporting) => {
+		reportErrors = errorReporting;
+		if (reportErrors) {
+			sentryInit();
+		}
+	});
 } else {
 	app = require('electron').app;
 }
@@ -28,6 +44,13 @@ class Logger {
 			timestamp = this.getTimestamp;
 		}
 
+		// Trim log according to type of process
+		if (process.type === 'renderer') {
+			requestIdleCallback(() => this.trimLog(file));
+		} else {
+			process.nextTick(() => this.trimLog(file));
+		}
+
 		const fileStream = fs.createWriteStream(file, { flags: 'a' });
 		const nodeConsole = new NodeConsole(fileStream);
 
@@ -82,6 +105,30 @@ class Logger {
 			`${date.getMinutes()}:${date.getSeconds()}`;
 		return timestamp;
 	}
+
+	reportSentry(err) {
+		if (reportErrors) {
+			captureException(err);
+		}
+	}
+
+	trimLog(file) {
+		fs.readFile(file, 'utf8', (err, data) => {
+			if (err) {
+				throw err;
+			}
+			const MAX_LOG_FILE_LINES = 500;
+			const logs = data.split(os.EOL);
+			const logLength = logs.length - 1;
+
+			// Keep bottom MAX_LOG_FILE_LINES of each log instance
+			if (logLength > MAX_LOG_FILE_LINES) {
+				const trimmedLogs = logs.slice(logLength - MAX_LOG_FILE_LINES);
+				const toWrite = trimmedLogs.join(os.EOL);
+				fs.writeFileSync(file, toWrite);
+			}
+		});
+	}
 }
 
 module.exports = Logger;

app/renderer/js/utils/params-util.js

@@ -0,0 +1,15 @@
+// This util function returns the page params if they're present else returns null
+function isPageParams() {
+	let webpageParams = null;
+	try {
+		// eslint-disable-next-line no-undef, camelcase
+		webpageParams = page_params;
+	} catch (err) {
+		webpageParams = null;
+	}
+	return webpageParams;
+}
+
+module.exports = {
+	isPageParams
+};

app/renderer/js/utils/proxy-util.js

@@ -0,0 +1,130 @@
+'use strict';
+
+const url = require('url');
+const ConfigUtil = require('./config-util.js');
+
+let instance = null;
+
+class ProxyUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		return instance;
+	}
+
+	// Return proxy to be used for a particular uri, to be used for request
+	getProxy(uri) {
+		uri = url.parse(uri);
+		const proxyRules = ConfigUtil.getConfigItem('proxyRules', '').split(';');
+		// If SPS is on and system uses no proxy then request should not try to use proxy from
+		// environment. NO_PROXY = '*' makes request ignore all environment proxy variables.
+		if (proxyRules[0] === '') {
+			process.env.NO_PROXY = '*';
+			return;
+		}
+
+		const proxyRule = {};
+		if (uri.protocol === 'http:') {
+			proxyRules.forEach(proxy => {
+				if (proxy.includes('http=')) {
+					proxyRule.hostname = proxy.split('http=')[1].trim().split(':')[0];
+					proxyRule.port = proxy.split('http=')[1].trim().split(':')[1];
+				}
+			});
+			return proxyRule;
+		}
+
+		if (uri.protocol === 'https:') {
+			proxyRules.forEach(proxy => {
+				if (proxy.includes('https=')) {
+					proxyRule.hostname = proxy.split('https=')[1].trim().split(':')[0];
+					proxyRule.port = proxy.split('https=')[1].trim().split(':')[1];
+				}
+			});
+			return proxyRule;
+		}
+	}
+
+	resolveSystemProxy(mainWindow) {
+		const page = mainWindow.webContents;
+		const ses = page.session;
+		const resolveProxyUrl = 'www.example.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();

app/renderer/js/utils/reconnect-util.js

@@ -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,16 +37,16 @@ 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 = `
-										<div>You internet connection does't seem to work properly!</div>
-										</div>Verify that it works and then click try again.</div>`;
+										<div>Your internet connection doesn't seem to work properly!</div>
+										<div>Verify that it works and then click try again.</div>`;
 						}
 						return resolve(false);
 					});

app/renderer/js/utils/request-util.js

@@ -0,0 +1,62 @@
+const fs = require('fs');
+const Logger = require('./logger-util');
+
+const CertificateUtil = require(__dirname + '/certificate-util.js');
+const ProxyUtil = require(__dirname + '/proxy-util.js');
+const ConfigUtil = require(__dirname + '/config-util.js');
+const SystemUtil = require(__dirname + '/../utils/system-util.js');
+
+const logger = new Logger({
+	file: `request-util.log`,
+	timestamp: true
+});
+
+let instance = null;
+
+class RequestUtil {
+	constructor() {
+		if (!instance) {
+			instance = this;
+		}
+		return instance;
+	}
+
+	// ignoreCerts parameter helps in fetching server icon and
+	// other server details when user chooses to ignore certificate warnings
+	requestOptions(domain, ignoreCerts) {
+		domain = this.formatUrl(domain);
+		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);
+			}
+		}
+		const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
+		// 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
+		// Add proxy as a parameter if it is being used.
+		return {
+			ca: certificateLocation ? certificateLocation : '',
+			proxy: proxyEnabled ? ProxyUtil.getProxy(domain) : '',
+			ecdhCurve: 'auto',
+			headers: { 'User-Agent': SystemUtil.getUserAgent() },
+			rejectUnauthorized: !ignoreCerts
+		};
+	}
+
+	formatUrl(domain) {
+		const hasPrefix = (domain.indexOf('http') === 0);
+		if (hasPrefix) {
+			return domain;
+		} else {
+			return (domain.indexOf('localhost:') >= 0) ? `http://${domain}` : `https://${domain}`;
+		}
+	}
+}
+
+module.exports = new RequestUtil();

app/renderer/js/utils/sentry-util.js

@@ -0,0 +1,20 @@
+const { init, captureException } = require('@sentry/electron');
+const isDev = require('electron-is-dev');
+
+const sentryInit = () => {
+	if (!isDev) {
+		init({
+			dsn: 'SENTRY_DSN',
+			// We should ignore this error since it's harmless and we know the reason behind this
+			// This error mainly comes from the console logs.
+			// This is a temp solution until Sentry supports disabling the console logs
+			ignoreErrors: ['does not appear to be a valid Zulip server'],
+			sendTimeout: 30 // wait 30 seconds before considering the sending capture to have failed, default is 1 second
+		});
+	}
+};
+
+module.exports = {
+	sentryInit,
+	captureException
+};

app/renderer/main.html

@@ -1,56 +1,56 @@
 <!DOCTYPE html>
 <html lang="en" class="responsive desktop">
 
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width">
-  <title>Zulip</title>
-  <link rel="stylesheet" href="css/main.css" type="text/css" media="screen">
-</head>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+        <title>Zulip</title>
+        <link rel="stylesheet" href="css/main.css" type="text/css" media="screen">
+    </head>
 
-<body>
-  <div id="content">
-    <div class="popup">
-      <span class="popuptext hidden" id="fullscreen-popup"></span>
-  </div>
-  <div id="sidebar" class="toggle-sidebar">
-    <div id="view-controls-container">
-      <div id="tabs-container"></div>
-      <div id="add-tab" class="tab functional-tab">
-        <div class="server-tab" id="add-action">
-          <i class="material-icons">add</i>
+    <body>
+        <div id="content">
+            <div class="popup">
+                <span class="popuptext hidden" id="fullscreen-popup"></span>
+            </div>
+            <div id="sidebar" class="toggle-sidebar">
+                <div id="view-controls-container">
+                    <div id="tabs-container"></div>
+                    <div id="add-tab" class="tab functional-tab">
+                        <div class="server-tab" id="add-action">
+                        <i class="material-icons">add</i>
+                        </div>
+                        <span id="add-server-tooltip" style="display:none">Add organization</span>
+                    </div>
+                </div>
+                <div id="actions-container">
+                    <div class="action-button" id="dnd-action">
+                        <i class="material-icons md-48">notifications</i>
+                        <span id="dnd-tooltip" style="display:none">Do Not Disturb</span>
+                    </div>
+                    <div class="action-button" id="reload-action">
+                        <i class="material-icons md-48">refresh</i>
+                        <span id="reload-tooltip" style="display:none">Reload</span>
+                    </div>
+                    <div class="action-button disable" id="back-action">
+                        <i class="material-icons md-48">arrow_back</i>
+                        <span id="back-tooltip" style="display:none">Go Back</span>
+                    </div>
+                    <div class="action-button" id="settings-action">
+                        <i class="material-icons md-48">settings</i>
+                        <span id="setting-tooltip" style="display:none">Settings</span>
+                    </div>
+                </div>
+            </div>
+            <div id="main-container">
+                <div id="webviews-container"></div>
+            </div>
         </div>
-        <span id="add-server-tooltip" style="display:none">Add organization</span>
-      </div>
-    </div>
-    <div id="actions-container">
-      <div class="action-button" id="dnd-action">
-        <i class="material-icons md-48">notifications</i>
-        <span id="dnd-tooltip" style="display:none">Do Not Disturb</span>
-      </div>
-      <div class="action-button" id="reload-action">
-        <i class="material-icons md-48">refresh</i>
-        <span id="reload-tooltip" style="display:none">Reload</span>
-      </div>
-      <div class="action-button disable" id="back-action">
-        <i class="material-icons md-48">arrow_back</i>
-        <span id="back-tooltip" style="display:none">Go Back</span>
-      </div>
-      <div class="action-button" id="settings-action">
-        <i class="material-icons md-48">settings</i>
-        <span id="setting-tooltip" style="display:none">Settings</span>
-      </div>
-    </div>
-  </div>
-  <div id="main-container">
-    <div id="webviews-container"></div>
-  </div>
-  </div>
 
-  <div id="feedback-modal">
-    <send-feedback></send-feedback>
-  </div>
-</body>
-<script src="js/main.js"></script>
-<script>require('./js/shared/preventdrag.js')</script>
+        <div id="feedback-modal">
+            <send-feedback></send-feedback>
+        </div>
+    </body>
+    <script src="js/main.js"></script>
+    <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/renderer/network.html

@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html lang="en" class="responsive desktop">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width">
-    <title>Zulip - Network Troubleshooting</title>
-    <link rel="stylesheet" href="css/network.css" type="text/css" media="screen">
-  </head>
-  <body>
-    <div id="content">
-      <div id="picture"><img src="img/zulip_network.png"></div>
-      <div id="title">Zulip can't connect</div>
-      <div id="description">
-        <div>Your computer seems to be offline.</div>
-        <div>We will keep trying to reconnect, or you can try now.</div>
-      </div>
-      <div id="reconnect">Try now</div>
-    </div>
-  </body>
-  <script src="js/pages/network.js"></script>
-  <script>require('./js/shared/preventdrag.js')</script>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+        <title>Zulip - Network Troubleshooting</title>
+        <link rel="stylesheet" href="css/network.css" type="text/css" media="screen">
+    </head>
+    <body>
+        <div id="content">
+            <div id="picture"><img src="img/zulip_network.png"></div>
+            <div id="title">Zulip can't connect</div>
+            <div id="description">
+                <div>Your computer seems to be offline.</div>
+                <div>We will keep trying to reconnect, or you can try now.</div>
+            </div>
+            <div id="reconnect">Try now</div>
+        </div>
+    </body>
+    <script src="js/pages/network.js"></script>
+    <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/renderer/preference.html

@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html lang="en" class="responsive desktop">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width">
-    <title>Zulip - Settings</title>
-    <link rel="stylesheet" href="css/preference.css" type="text/css" media="screen">
-  </head>
-  <body>
-    <div id="content">
-      <div id="sidebar"></div>
-      <div id="settings-container"></div>
-    </div>
-  </body>
-  <script src="js/pages/preference/preference.js"></script>
-  <script>require('./js/shared/preventdrag.js')</script>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width">
+        <title>Zulip - Settings</title>
+        <link rel="stylesheet" href="css/preference.css" type="text/css" media="screen">
+    </head>
+    <body>
+        <div id="content">
+            <div id="sidebar"></div>
+            <div id="settings-container"></div>
+        </div>
+    </body>
+    <script src="js/pages/preference/preference.js"></script>
+    <script>require('./js/shared/preventdrag.js')</script>
 </html>

appveyor.yml

@@ -6,9 +6,9 @@ os: Previous Visual Studio 2015
 
 cache:
   - node_modules
-  
+
 install:
-  - ps: Install-Product node 6 x64
+  - ps: Install-Product node 8 x64
   - git reset --hard HEAD
   - npm install npm -g
   - node --version
@@ -21,4 +21,4 @@ build: off
 
 test_script:
   - npm run test
-  - npm run test-e2e
+  # - npm run test-e2e

changelog.md

@@ -0,0 +1,764 @@
+# Version History
+
+All notable changes to the Zulip desktop app are documented in this file.
+
+### v2.3.82 --2018-09-25
+
+**New features**:
+* UI enhancements.
+* Updated some menu items.
+
+**Fixes**:
+* Fix about page not opening up.
+
+<hr>
+
+### v2.3.8 --2018-09-25
+
+**New features**:
+* Auto hide menubar on Windows/Linux. Add a setting option for the same.
+* Improve design of setting page.
+* Toggle app on clicking the tray icon (Linux).
+* Update sidebar realm name when it's changed in webapp.
+* left-sidebar: Add initial character of realm name instead of default icon.
+
+**Fixes**:
+* linux: Fix ALT+SHIFT opening menu items on Linux.
+* sentry: Add ignore errors to sentry configuration.
+* Linux: Add label for help menu item.
+* file-attachments: Allow multiple downloads of same file name.
+
+**Module Updates**
+* electron: Update electron to v2.0.9.
+
+
+<hr>
+
+
+### v2.3.7-beta --2018-09-03
+
+**New features**:
+* Add a feature to show and view pdf file in the app.
+
+**Fixes**:
+* Use package reload instead of custom reload. This is an experimental fix for setting files getting corrupted issue.
+* Unescape server name in window menu item.
+
+<hr>
+
+### v2.3.6 --2018-08-27
+
+**New features**:
+* Add proxy details while validating a server. This fixes the server validating issue for users who are using the proxy settings. 
+
+
+**Fixes**:
+
+* Fix youtube video not playing in lightbox. 
+* Fix realm name not escaped properly.
+
+<hr>
+
+### v2.3.5 --2018-08-03
+
+**New features**:
+* Add a setting option to show downloaded file in file manager.
+* Added electron bridge to communicate with webapp in real time.
+
+**Fixes**:
+
+* Fix failing attached file downloads.
+* Fix page_params error.
+* gulpfile: Update syntax and methods for gulp v4.x.
+
+<hr>
+
+### v2.3.4-beta --2018-07-24
+
+**Fixes**:
+* Fix downloading functionality of file attachments.
+* Fix null of downloadPath when settings.json fails.
+
+<hr>
+
+### 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
+
+<hr>
+
+### 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 improvements
+
+
+
+
+**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 depend 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 connection
+
+
+
+**Fixes**:
+
+* Fixed permission issue on windows
+* Fixed wrong keyboard shortcuts
+
+
+<hr>
+
+### v0.5.8 --2017-02-13
+
+**Enhancements**:
+Smaller Windows installer size
+
+<hr>
+
+### v0.5.7 --2017-02-08
+
+Minor improvements
+
+
+
+<hr>
+
+### v0.5.6 --2017-02-07
+
+
+**Enhancement**:
+
+- 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
+
+**Enhancement**:
+
+- 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
+
+**Enhancement**:
+
+* Added DMG installer for macOS

development.md

@@ -1,85 +1,152 @@
+# Improve development guide
+
 # Development setup
 
-This is a guide to running the Zulip desktop app from a source tree,
-in order to contribute to developing it.
+This is a guide to running the Zulip desktop app from a source tree, in order to contribute to developing it. The Zulip electron development environment can be installed on **macOS, Windows, and Linux** (Debian or Ubuntu recommended). You’ll need at least **2GB of available RAM**. Installing the Zulip electron development environment requires downloading several hundred megabytes of dependencies, so you will need an **active, reasonably fast, internet connection throughout the entire installation processes.**
 
-## Prerequisites
+# Set up Git & GitHub
 
-To build and run the app from source, you'll need the following:
+You can skip this step if you already have Git, GitHub.
 
-* [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
-* [Node.js](https://nodejs.org) >= v6.9.0
-  * [NPM](https://www.npmjs.com/get-npm) and
-    [node-gyp](https://github.com/nodejs/node-gyp#installation),
-    if they don't come bundled with your Node.js installation
-* [Python](https://www.python.org/downloads/release/python-2713/)
-  (v2.7.x recommended)
-* A C++ compiler compatible with C++11
-* Linux users also need [Snapcraft](https://snapcraft.io/)
-* Development headers for the libXext, libXtst, and libxkbfile libraries
+Follow our [Git Guide](https://zulip.readthedocs.io/en/latest/git/setup.html) in order to install Git, set up a GitHub account
 
-### Debian/Ubuntu and friends
 
-On a system running Debian, Ubuntu, or another Debian-based Linux
-distribution, you can install all dependencies through the package
-manager (see [here][nodesource-install] for more on the first command):
+# Install Prerequisites
 
-```sh
-$ curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
-$ sudo apt install git nodejs python build-essential snapcraft libxext-dev libxtst-dev libxkbfile-dev libgconf-2-4
-```
+Jump to:
 
-[nodesource-install]: https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions
+- [MacOS](https://github.com/zulip/zulip-desktop/blob/master/development.md#macos)
+- [Ubuntu/Debian](https://github.com/zulip/zulip-desktop/blob/master/development.md#ubuntudebian)
+- [Windows](https://github.com/zulip/zulip-desktop/blob/master/development.md#windows)
 
-### Other OSes
 
-Other developers run the app on Windows, macOS, and possibly other OSes.
-PRs to add specific instructions to this doc are welcome!
+## MacOS
 
-On Windows, your C++ compiler should be Visual Studio 2015 or later.
 
-## Download, build, and run
+  **Node JS**
+  Go to the [Node.js Downloads page](https://nodejs.org/en/download/). Download Node.js for MacOS (`v6.9.0` or above recommended). Run the downloaded Node.js `.pkg` Installer. You're finished! To ensure Node.js has been installed, run `node -v` in your terminal - you should get something like `v6.9.0` or above
 
-Clone the source locally:
-```sh
-$ git clone https://github.com/zulip/zulip-electron
-$ cd zulip-electron
-```
 
-Install project dependencies:
-```sh
-$ npm install
-```
+  **if** [**NPM**](https://www.npmjs.com/get-npm) **and** [**node-gyp**](https://github.com/nodejs/node-gyp#installation) **don't come bundled with your Node.js installation, Download manually**
 
-Start the app:
-```sh
-$ npm start
-```
 
-Start and watch changes:
-```sh
-$ npm run dev
-```
+  Now you are ready for next step [: Get Zulip Desktop Code.](https://github.com/zulip/zulip-desktop/blob/master/development.md#get-zulip-desktop-code)
 
-## Troubleshooting
 
-If you have any problems running the app, see the [most common
-issues](./troubleshooting.md).
+## Ubuntu/Debian
 
-## Making a release
 
-To package the app into an installer:
-```
-npm run dist
-```
+If you’re in a hurry, you can copy and paste the following into your terminal
 
-This command will produce distributable packages or installers for the
-operating system you're running on:
-* on Windows, a Windows installer file
-* on macOS, a `.dmg` file
-* on Linux, a plain `.zip` file as well as a `.deb` file, `.snap` file and an
-  `AppImage` file.
-To generate all three types, you will need all three operating
-systems.
+    sudo apt install git nodejs node-gyp python build-essential snapcraft libxext-dev libxtst-dev lib   xkbfile-dev libgconf-2-4
 
-The output files appear in the `dist/` directory.
+after pasting you can jump to next step [: Get Zulip Desktop Code](https://github.com/zulip/zulip-desktop/blob/master/development.md#get-zulip-desktop-code).
+
+
+**For a step-by-step explanation, read on.**
+
+1. **Node JS**
+
+	`$ sudo apt-get install nodejs`
+
+2. **Install** [**Node-gyp**](https://github.com/nodejs/node-gyp#installation)
+
+3. **Python (v2.7.x recommended)**
+
+	`$ sudo apt install python2.7`
+
+4. **C++ compiler compatible with C++11**
+
+	`$ sudo apt install build-essential`
+
+5. **Snapcraft**
+
+	`$ sudo apt install snapcraft`
+
+6. **Development** **headers**
+
+	`$ sudo apt install libxext-dev libxtst-dev libxkbfile-dev libgconf-2-4`
+
+
+**if** [**NPM**](https://www.npmjs.com/get-npm) **don't come bundled with your Node.js installation, Download manually**
+
+
+Now you are ready for next step [: Get Zulip Desktop Code.](https://github.com/zulip/zulip-desktop/blob/master/development.md#get-zulip-desktop-code)
+
+
+## Windows
+
+  **Node JS**
+  Go to the [Node.js Downloads page](https://nodejs.org/en/download/). Download Node.js for windows (`v6.9.0` or above recommended). Run the downloaded Node.js `.msi` Installer. You're finished! To ensure Node.js has been installed, run `node -v` in your terminal - you should get something like `v6.9.0` or above
+
+
+**Followings are optional yet recommended prerequisites -**
+
+  **Cmder**
+  1. Download the [latest release](https://github.com/cmderdev/cmder/releases/)
+  2. Extract the archive. *Note: This path should not be* `C:\Program Files` *or anywhere else that would require Administrator access for modifying configuration files*
+  3. (optional) Place your own executable files into the `%cmder_root%\bin` folder to be injected into your PATH.
+  4. Run `Cmder.exe`
+
+  **Chocolatey**
+  You can download chocolatey from here https://chocolatey.org/ and for Installing Chocolatey on your machine follow this steps
+  1. First, ensure that you are using an administrative shell.
+  2. Copy the text specific to your command shell - [cmd.exe](https://chocolatey.org/install#install-with-cmdexe) or [powershell.exe](https://chocolatey.org/install#install-with-powershellexe).
+  3. Paste the copied text into your shell and press Enter.
+  4. Wait a few seconds for the command to complete.
+  5. If you don't see any errors, you are ready to use Chocolatey! Type `choco` or `choco -?`
+
+
+**System specific dependencies**
+
+- use only 32bit or 64bit for all of the installers, do not mix architectures
+- install using default settings
+- open Windows Powershell as Admin and paste this
+    C:\Windows\system32> npm install --global --production windows-build-tools
+
+
+**if** [**NPM**](https://www.npmjs.com/get-npm) **and** [**node-gyp**](https://github.com/nodejs/node-gyp#installation) **don't come bundled with your Node.js installation, Download manually**
+
+Now you are ready for next step [: Get Zulip Desktop Code.](https://github.com/zulip/zulip-desktop/blob/master/development.md#get-zulip-desktop-code)
+
+
+# Get Zulip Desktop Code
+
+1. In your browser, visit https://github.com/zulip/zulip-desktop and click the `fork` button. You will need to be logged in to GitHub to do this.
+2. Open Terminal (macOS/Ubuntu) or Git BASH (Windows; must **run as an Administrator**).
+3. In Terminal/Git BASH, [clone your fork of the zulip-desktop repository](https://github.com/zulip/zulip-desktop/blob/master/development.md#clone-to-your-machine) and [connect the zulip-desktop upstream repository](https://github.com/zulip/zulip-desktop/blob/master/development.md#connect-your-fork-to-zulip-desktop-upstream)
+
+
+## Clone to your machine
+  1. On GitHub, navigate to the main page of your fork repository.
+  2. Under the repository name, click **Clone or download**.
+  3. In the Clone with HTTPs section, click to copy the clone URL for the repository.
+  4. Open Terminal, Change the current working directory to the location where you want the cloned directory to be made.
+
+          git clone https://github.com/YOURUSERNAME/zulip-desktop.git
+
+Don’t forget to replace YOURUSERNAME with your git username
+
+
+## Connect your fork to zulip-desktop upstream
+
+    cd zulip-desktop
+    git remote add -f upstream https://github.com/zulip/zulip-desktop.git
+
+
+# build and run
+
+
+## Install project dependencies:
+    $ npm install
+
+
+## There two ways to start the app:
+
+**vanilla method**
+
+     $ npm start
+
+**start and watch changes recommended for dev’s**
+
+      $ npm run dev

docs/Windows.md

@@ -21,8 +21,8 @@ C:\Windows\system32> npm install --global --production windows-build-tools
 Clone the source locally:
 
 ```sh
-$ git clone https://github.com/zulip/zulip-electron
-$ cd zulip-electron
+$ git clone https://github.com/zulip/zulip-desktop
+$ cd zulip-desktop
 ```
 
 Install project dependencies:

docs/_Footer.md

@@ -1,3 +1,3 @@
 ### Want to contribute to this Wiki?
 
-[Edit `/docs` files and send a pull request.](https://github.com/zulip/zulip-electron/tree/master/docs)
+[Edit `/docs` files and send a pull request.](https://github.com/zulip/zulip-desktop/tree/master/docs)

gulpfile.js

@@ -10,11 +10,11 @@ gulp.task('dev', () => {
   // Start browser process
 	electron.start();
   // Restart browser process
-	gulp.watch('app/main/*.js', ['restart:browser']);
+	gulp.watch('app/main/*.js', gulp.series('restart:browser'));
   // Reload renderer process
-	gulp.watch('app/renderer/css/*.css', ['reload:renderer']);
-	gulp.watch('app/renderer/*.html', ['reload:renderer']);
-	gulp.watch('app/renderer/js/**/*.js', ['reload:renderer']);
+	gulp.watch('app/renderer/css/*.css', gulp.series('reload:renderer'));
+	gulp.watch('app/renderer/*.html', gulp.series('reload:renderer'));
+	gulp.watch('app/renderer/js/**/*.js', gulp.series('reload:renderer'));
 });
 
 gulp.task('restart:browser', done => {
@@ -36,4 +36,4 @@ gulp.task('test-e2e', () => {
 	}));
 });
 
-gulp.task('default', ['dev', 'test-e2e']);
+gulp.task('default', gulp.parallel('dev', 'test-e2e'));

help.md

@@ -1,105 +0,0 @@
-# User Guide
-
-> Welcome! This guide will walk you through the basics of using Zulip Desktop.
-
-
-## Get Zulip Desktop
-
-
-
-## Connect to a Server
-
-### Connect through a proxy
-
-It's possible to connect to your server through a proxy. 
-You can enter the proxy settings in the `Network` section of App Settings. 
-There are three fields provided:
-* `PAC script` - The URL associated with the PAC file.
-* `Proxy rules` - Rules indicating which proxies to use.
-* `Proxy bypass rules` - Rules indicating which URLs should
-    bypass the proxy settings.
-	
-For a typical setup where internet access is required to use an HTTP proxy,
-but URLs on the local network should be accessed directly, configure as follows:
-
-`Proxy rules = proxy.example.com`
-
-Your HTTP proxy server
-`Proxy bypass rules = *.example.com;10.0.0.0/8`
-
-Directly connect to your own domain and private IP subnet
-for more complex setups, read below to configure complex proxy rules and proxy bypass rules.
-
-### Sets the proxy settings.
-
-When `PAC script` and `Proxy rules` are provided together, the `Proxy rules`
-option is ignored and `PAC script` configuration is applied.
-
-The `Proxy rules` has to follow the rules below:
-
-```
-proxyRules = schemeProxies[";"<schemeProxies>]
-schemeProxies = [<urlScheme>"="]<proxyURIList>
-urlScheme = "http" | "https" | "ftp" | "socks"
-proxyURIList = <proxyURL>[","<proxyURIList>]
-proxyURL = [<proxyScheme>"://"]<proxyHost>[":"<proxyPort>]
-```
-
-For example:
-
-* `http=foopy:80;ftp=foopy2` - Use HTTP proxy `foopy:80` for `http://` URLs, and
-  HTTP proxy `foopy2:80` for `ftp://` URLs.
-* `foopy:80` - Use HTTP proxy `foopy:80` for all URLs.
-* `foopy:80,bar,direct://` - Use HTTP proxy `foopy:80` for all URLs, failing
-  over to `bar` if `foopy:80` is unavailable, and after that using no proxy.
-* `socks4://foopy` - Use SOCKS v4 proxy `foopy:1080` for all URLs.
-* `http=foopy,socks5://bar.com` - Use HTTP proxy `foopy` for http URLs, and fail
-  over to the SOCKS5 proxy `bar.com` if `foopy` is unavailable.
-* `http=foopy,direct://` - Use HTTP proxy `foopy` for http URLs, and use no
-  proxy if `foopy` is unavailable.
-* `http=foopy;socks=foopy2` -  Use HTTP proxy `foopy` for http URLs, and use
-  `socks4://foopy2` for all other URLs.
-
-The `Proxy bypass rules` is a comma separated list of rules described below:
-
-* `[ URL_SCHEME "://" ] HOSTNAME_PATTERN [ ":" <port> ]`
-
-   Match all hostnames that match the pattern HOSTNAME_PATTERN.
-
-   Examples:
-     "foobar.com", "*foobar.com", "*.foobar.com", "*foobar.com:99",
-     "https://x.*.y.com:99"
-
- * `"." HOSTNAME_SUFFIX_PATTERN [ ":" PORT ]`
-
-   Match a particular domain suffix.
-
-   Examples:
-     ".google.com", ".com", "http://.google.com"
-
-* `[ SCHEME "://" ] IP_LITERAL [ ":" PORT ]`
-
-   Match URLs which are IP address literals.
-
-   Examples:
-     "127.0.1", "[0:0::1]", "[::1]", "http://[::1]:99"
-
-*  `IP_LITERAL "/" PREFIX_LENGHT_IN_BITS`
-
-   Match any URL that is to an IP literal that falls between the
-   given range. IP range is specified using CIDR notation.
-
-   Examples:
-     "192.168.1.1/16", "fefe:13::abc/33".
-
-*  `<local>`
-
-   Match local addresses. The meaning of `<local>` is whether the
-   host matches one of: "127.0.0.1", "::1", "localhost".
-
-
-## Change App Preferences
-
-
-
-## Reporting an Issue

how-to-install.md

@@ -1,10 +1,10 @@
 # How to install
 
-**Note:** If you download from the [releases page](https://github.com/zulip/zulip-electron/releases), be careful what version you pick. Releases that end with `-beta` are beta releases and the rest are stable.
+**Note:** If you download from the [releases page](https://github.com/zulip/zulip-desktop/releases), be careful what version you pick. Releases that end with `-beta` are beta releases and the rest are stable.
 - **beta:** these releases are the right balance between getting new features early while staying away from nasty bugs.
 - **stable:** these releases are more thoroughly tested; they receive new features later, but there's a lower chance that things will go wrong.
 
-[LR]: https://github.com/zulip/zulip-electron/releases
+[LR]: https://github.com/zulip/zulip-desktop/releases
 
 ## OS X
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "2.2.0-beta",
+  "version": "2.5.0-beta",
   "main": "./app/main",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
@@ -12,10 +12,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/zulip/zulip-electron.git"
+    "url": "https://github.com/zulip/zulip-desktop.git"
   },
   "bugs": {
-    "url": "https://github.com/zulip/zulip-electron/issues"
+    "url": "https://github.com/zulip/zulip-desktop/issues"
   },
   "engines": {
     "node": ">=6.0.0"
@@ -24,7 +24,10 @@
     "start": "electron app --disable-http-cache --no-electron-connect",
     "reinstall": "node ./tools/reinstall-node-modules.js",
     "postinstall": "electron-builder install-app-deps",
-    "test": "xo",
+    "lint-css": "stylelint app/renderer/css/*.css",
+    "lint-html": "./node_modules/.bin/htmlhint \"app/renderer/*.html\" ",
+    "lint-js": "xo",
+    "test": "npm run lint-html && npm run lint-css && npm run lint-js",
     "test-e2e": "gulp test-e2e",
     "dev": "gulp dev & nodemon --watch app/main --watch app/renderer --exec 'npm test' -e html,css,js",
     "pack": "electron-builder --dir",
@@ -44,7 +47,7 @@
       "!docs${/*}",
       "!node_modules/@paulcbetts/cld/deps/cld${/*}"
     ],
-    "copyright": "©2017 Kandra Labs, Inc.",
+    "copyright": "©2019 Kandra Labs, Inc.",
     "mac": {
       "category": "public.app-category.productivity",
       "artifactName": "${productName}-${version}-${arch}.${ext}"
@@ -59,7 +62,7 @@
         "AppImage",
         "snap"
       ],
-      "maintainer": "Akash Nimare <svnitakash@gmail.com>",
+      "maintainer": "Akash Nimare <akash@zulipchat.com>",
       "artifactName": "${productName}-${version}-${arch}.${ext}"
     },
     "deb": {
@@ -88,8 +91,8 @@
         }
       ],
       "window": {
-          "width": 500,
-          "height": 500
+        "width": 500,
+        "height": 500
       }
     },
     "win": {
@@ -103,12 +106,13 @@
         }
       ],
       "icon": "build/icon.ico",
+      "artifactName": "${productName}-Web-Setup-${version}.${ext}",
       "publisherName": "Kandra Labs, Inc."
     },
     "nsis": {
-      "perMachine": true,
+      "allowToChangeInstallationDirectory": true,
       "oneClick": false,
-      "allowToChangeInstallationDirectory": true
+      "perMachine": false
     }
   },
   "keywords": [
@@ -121,21 +125,23 @@
   ],
   "devDependencies": {
     "assert": "1.4.1",
-    "cp-file": "^5.0.0",
+    "cp-file": "5.0.0",
     "devtron": "1.4.0",
-    "electron": "2.0.0",
-    "electron-builder": "20.13.4",
+    "electron": "3.0.10",
+    "electron-builder": "20.40.2",
     "electron-connect": "0.6.2",
     "electron-debug": "1.4.0",
     "google-translate-api": "2.3.0",
-    "gulp": "3.9.1",
+    "gulp": "4.0.0",
     "gulp-tape": "0.0.9",
-    "is-ci": "^1.0.10",
-    "nodemon": "^1.14.11",
+    "htmlhint": "0.11.0",
+    "is-ci": "1.0.10",
+    "nodemon": "1.14.11",
     "pre-commit": "1.2.2",
-    "spectron": "3.8.0",
-    "tap-colorize": "^1.2.0",
-    "tape": "^4.8.0",
+    "spectron": "5.0.0",
+    "stylelint": "9.10.1",
+    "tap-colorize": "1.2.0",
+    "tape": "4.8.0",
     "xo": "0.18.2"
   },
   "xo": {
@@ -153,7 +159,7 @@
           "max-lines": [
             "warn",
             {
-              "max": 500,
+              "max": 700,
               "skipBlankLines": true,
               "skipComments": true
             }
@@ -182,4 +188,4 @@
       "mocha"
     ]
   }
-}
+}

scripts/travis-build-test.sh

@@ -15,6 +15,6 @@ fi
 
 npm run test
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    npm run test-e2e
-fi
+# if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+#     npm run test-e2e
+# fi

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: zulip
-version: 2.0.0
+version: 2.3.82
 summary: Zulip Desktop Client for Linux
 description: Zulip combines the immediacy of Slack with an email threading model. With Zulip, you can catch up on important conversations while ignoring irrelevant ones.
 confinement: strict
@@ -34,4 +34,4 @@ parts:
       - libxtst6
     source: dist/linux-unpacked
     after:
-      - desktop-gtk2
+      - desktop-gtk3

tests/e2e/package.json

@@ -0,0 +1,183 @@
+{
+    "name": "zulip",
+    "productName": "Zulip",
+    "version": "2.4.0",
+    "main": "../../app/main",
+    "description": "Zulip Desktop App",
+    "license": "Apache-2.0",
+    "copyright": "Kandra Labs, Inc.",
+    "author": {
+      "name": "Kandra Labs, Inc.",
+      "email": "support@zulipchat.com"
+    },
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/zulip/zulip-electron.git"
+    },
+    "bugs": {
+      "url": "https://github.com/zulip/zulip-electron/issues"
+    },
+    "engines": {
+      "node": ">=6.0.0"
+    },
+    "scripts": {
+      "start": "electron app --disable-http-cache --no-electron-connect",
+      "reinstall": "node ./tools/reinstall-node-modules.js",
+      "postinstall": "electron-builder install-app-deps",
+      "test": "xo",
+      "test-e2e": "gulp test-e2e",
+      "dev": "gulp dev & nodemon --watch app/main --watch app/renderer --exec 'npm test' -e html,css,js",
+      "pack": "electron-builder --dir",
+      "dist": "electron-builder",
+      "mas": "electron-builder --mac mas",
+      "travis": "cd ./scripts && ./travis-build-test.sh",
+      "build-locales": "node tools/locale-helper"
+    },
+    "pre-commit": [
+      "test"
+    ],
+    "build": {
+      "appId": "org.zulip.zulip-electron",
+      "asar": true,
+      "files": [
+        "**/*",
+        "!docs${/*}",
+        "!node_modules/@paulcbetts/cld/deps/cld${/*}"
+      ],
+      "copyright": "©2017 Kandra Labs, Inc.",
+      "mac": {
+        "category": "public.app-category.productivity",
+        "artifactName": "${productName}-${version}-${arch}.${ext}"
+      },
+      "linux": {
+        "category": "Chat;GNOME;GTK;Network;InstantMessaging",
+        "packageCategory": "GNOME;GTK;Network;InstantMessaging",
+        "description": "Zulip Desktop Client for Linux",
+        "target": [
+          "deb",
+          "zip",
+          "AppImage",
+          "snap"
+        ],
+        "maintainer": "Akash Nimare <svnitakash@gmail.com>",
+        "artifactName": "${productName}-${version}-${arch}.${ext}"
+      },
+      "deb": {
+        "synopsis": "Zulip Desktop App",
+        "afterInstall": "./scripts/debian-add-repo.sh",
+        "afterRemove": "./scripts/debian-uninstaller.sh"
+      },
+      "snap": {
+        "synopsis": "Zulip Desktop App"
+      },
+      "dmg": {
+        "background": "build/appdmg.png",
+        "icon": "build/icon.icns",
+        "iconSize": 100,
+        "contents": [
+          {
+            "x": 380,
+            "y": 280,
+            "type": "link",
+            "path": "/Applications"
+          },
+          {
+            "x": 110,
+            "y": 280,
+            "type": "file"
+          }
+        ],
+        "window": {
+          "width": 500,
+          "height": 500
+        }
+      },
+      "win": {
+        "target": [
+          {
+            "target": "nsis-web",
+            "arch": [
+              "x64",
+              "ia32"
+            ]
+          }
+        ],
+        "icon": "build/icon.ico",
+        "publisherName": "Kandra Labs, Inc."
+      },
+      "nsis": {
+        "allowToChangeInstallationDirectory": true
+      }
+    },
+    "keywords": [
+      "Zulip",
+      "Group Chat app",
+      "electron-app",
+      "electron",
+      "Desktop app",
+      "InstantMessaging"
+    ],
+    "devDependencies": {
+      "assert": "1.4.1",
+      "cp-file": "^5.0.0",
+      "devtron": "1.4.0",
+      "electron": "3.0.10",
+      "electron-builder": "20.38.4",
+      "electron-connect": "0.6.2",
+      "electron-debug": "1.4.0",
+      "google-translate-api": "2.3.0",
+      "gulp": "^4.0.0",
+      "gulp-tape": "0.0.9",
+      "is-ci": "^1.0.10",
+      "nodemon": "^1.14.11",
+      "pre-commit": "1.2.2",
+      "spectron": "3.8.0",
+      "tap-colorize": "^1.2.0",
+      "tape": "^4.8.0",
+      "xo": "0.18.2"
+    },
+    "xo": {
+      "parserOptions": {
+        "sourceType": "script",
+        "ecmaFeatures": {
+          "globalReturn": true
+        }
+      },
+      "esnext": true,
+      "overrides": [
+        {
+          "files": "app*/**/*.js",
+          "rules": {
+            "max-lines": [
+              "warn",
+              {
+                "max": 600,
+                "skipBlankLines": true,
+                "skipComments": true
+              }
+            ],
+            "no-warning-comments": 0,
+            "object-curly-spacing": 0,
+            "capitalized-comments": 0,
+            "no-else-return": 0,
+            "no-path-concat": 0,
+            "no-alert": 0,
+            "guard-for-in": 0,
+            "prefer-promise-reject-errors": 0,
+            "import/no-unresolved": 0,
+            "import/no-extraneous-dependencies": 0,
+            "no-prototype-builtins": 0
+          }
+        }
+      ],
+      "ignore": [
+        "tests/*.js",
+        "tools/locale-helper/*.js"
+      ],
+      "envs": [
+        "node",
+        "browser",
+        "mocha"
+      ]
+    }
+  }

tools/push-to-pull-request

@@ -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"

tools/reset-to-pull-request

@@ -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

zulip-electron-launcher.sh

@@ -48,10 +48,10 @@ envSetup()
 
 	# Set name of upstreamRemote
 	cd $workingDir
-	git remote -v | grep "github\.com.zulip.zulip-electron.git (fetch)" > /dev/null 2>&1
+	git remote -v | grep "github\.com.zulip.zulip-desktop.git (fetch)" > /dev/null 2>&1
 	if [ $? -eq 0 ]
 	then
-		upstreamRemote=`git remote -v | grep "github\.com.zulip.zulip-electron.git (fetch)" | awk '{ print $1 }'`
+		upstreamRemote=`git remote -v | grep "github\.com.zulip.zulip-desktop.git (fetch)" | awk '{ print $1 }'`
 	else
 		upstreamRemote="origin"
 	fi