release: 🎉 v2.3.3.

captureExceptions are used to report expected exceptions from domain-util.js and
config-util.js.
All files that include logger-util automatically includes sentry for those files
and report unexpected exceptions to sentry.

.gitignore

@@ -7,6 +7,13 @@ node_modules/
 # Compiled binary build directory
 dist/
 
+#snap generated files
+snap/parts
+snap/prime
+snap/snap
+snap/stage
+snap/*.snap
+
 # Logs
 logs
 *.log

.travis.yml

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

CONTRIBUTING.md

@@ -12,7 +12,7 @@ Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If yo
 
 * 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-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/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).

app/main/autoupdater.js

@@ -1,16 +1,24 @@
 'use strict';
-const { app, dialog } = require('electron');
+const { app, dialog, shell } = require('electron');
 const { autoUpdater } = require('electron-updater');
 const isDev = require('electron-is-dev');
 
 const ConfigUtil = require('./../renderer/js/utils/config-util.js');
 
-function appUpdater() {
+function appUpdater(updateFromMenu = false) {
 	// Don't initiate auto-updates in development
 	if (isDev) {
 		return;
 	}
 
+	if (process.platform === 'linux' && !process.env.APPIMAGE) {
+		const { linuxUpdateNotification } = require('./linuxupdater');
+		linuxUpdateNotification();
+		return;
+	}
+
+	let updateAvailable = false;
+
 	// Create Logs directory
 	const LogsDir = `${app.getPath('userData')}/Logs`;
 
@@ -22,7 +30,58 @@ function appUpdater() {
 	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 => {
+		if (updateFromMenu) {
+			dialog.showMessageBox({
+				message: `A new version ${info.version}, of Zulip Desktop is available`,
+				detail: 'The update will be downloaded in the background. You will be notified when it is ready to be installed.'
+			});
+
+			updateAvailable = true;
+
+			// This is to prevent removal of 'update-downloaded' and 'error' event listener.
+			eventsListenerRemove.forEach(event => {
+				autoUpdater.removeAllListeners(event);
+			});
+		}
+	});
+
+	autoUpdater.on('update-not-available', () => {
+		if (updateFromMenu) {
+			dialog.showMessageBox({
+				message: 'No updates available',
+				detail: `You are running the latest version of Zulip Desktop.\nVersion: ${app.getVersion()}`
+			});
+			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
+			// listeners don't trigger multiple times.
+			autoUpdater.removeAllListeners();
+		}
+	});
+
+	autoUpdater.on('error', error => {
+		if (updateFromMenu) {
+			const messageText = (updateAvailable) ? ('Unable to download the updates') : ('Unable to check for updates');
+			dialog.showMessageBox({
+				type: 'error',
+				buttons: ['Manual Download', 'Cancel'],
+				message: messageText,
+				detail: (error).toString() + `\n\nThe latest version of Zulip Desktop is available at -\nhttps://zulipchat.com/apps/.\n
+Current Version: ${app.getVersion()}`
+			}, response => {
+				if (response === 0) {
+					shell.openExternal('https://zulipchat.com/apps/');
+				}
+			});
+			// Remove all autoUpdator listeners so that next time autoUpdator is manually called these
+			// listeners don't trigger multiple times.
+			autoUpdater.removeAllListeners();
+		}
+	});
 
 	// Ask the user if update is available
 	// eslint-disable-next-line no-unused-vars

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',
-		autoSubmit: true
-	});
-};
-
-module.exports = {
-	crashHandler
-};

app/main/index.js

@@ -5,7 +5,6 @@ const windowStateKeeper = require('electron-window-state');
 const isDev = require('electron-is-dev');
 const appMenu = require('./menu');
 const { appUpdater } = require('./autoupdater');
-const { crashHandler } = require('./crash-reporter');
 
 const { setAutoLaunch } = require('./startup');
 
@@ -13,6 +12,8 @@ const { app, ipcMain } = electron;
 
 const BadgeSettings = require('./../renderer/js/pages/preference/badge-settings.js');
 const ConfigUtil = require('./../renderer/js/utils/config-util.js');
+const ProxyUtil = require('./../renderer/js/utils/proxy-util.js');
+const { sentryInit } = require('./../renderer/js/utils/sentry-util.js');
 
 // Adds debug features like hotkeys for triggering dev tools and reload
 // in development mode
@@ -52,8 +53,9 @@ const iconPath = () => {
 function createMainWindow() {
 	// Load the previous state with fallback to defaults
 	const mainWindowState = windowStateKeeper({
-		defaultWidth: 1000,
+		defaultWidth: 1100,
-		defaultHeight: 600
+		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 +73,6 @@ function createMainWindow() {
 		minHeight: 400,
 		webPreferences: {
 			plugins: true,
-			allowDisplayingInsecureContent: true,
 			nodeIntegration: true
 		},
 		show: false
@@ -132,6 +133,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();
@@ -150,6 +155,15 @@ app.on('ready', () => {
 	});
 	mainWindow = createMainWindow();
 
+	// Initialize sentry for main process
+	sentryInit();
+
+	const isSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
+
+	if (isSystemProxy) {
+		ProxyUtil.resolveSystemProxy(mainWindow);
+	}
+
 	const page = mainWindow.webContents;
 
 	page.on('dom-ready', () => {
@@ -162,14 +176,16 @@ app.on('ready', () => {
 
 	page.once('did-frame-finish-load', () => {
 		// Initate auto-updates on MacOS and Windows
+		if (ConfigUtil.getConfigItem('autoUpdate')) {
 			appUpdater();
-		crashHandler();
+		}
 	});
 
-	electron.powerMonitor.on('resume', () => {
+	// Temporarily remove this event
-		mainWindow.reload();
+	// electron.powerMonitor.on('resume', () => {
-		page.send('destroytray');
+	// 	mainWindow.reload();
-	});
+	// 	page.send('destroytray');
+	// });
 
 	ipcMain.on('focus-app', () => {
 		mainWindow.show();
@@ -221,14 +237,20 @@ app.on('ready', () => {
 		appMenu.setMenu(props);
 	});
 
-	ipcMain.on('register-server-tab-shortcut', (event, index) => {
-		// Array index == Shown index - 1
-		page.send('switch-server-tab', index - 1);
-	});
-
 	ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
 		setAutoLaunch(AutoLaunchValue);
 	});
+
+	ipcMain.on('downloadFile', (event, url, downloadPath) => {
+		page.downloadURL(url);
+		page.session.once('will-download', (event, item) => {
+			const filePath = path.join(downloadPath, item.getFilename());
+			item.setSavePath(filePath);
+			item.once('done', () => {
+				page.send('downloadFileCompleted', filePath, item.getFilename());
+			});
+		});
+	});
 });
 
 app.on('before-quit', () => {

app/main/linuxupdater.js

@@ -0,0 +1,49 @@
+const { app } = require('electron');
+const { Notification } = require('electron');
+
+const request = require('request');
+const semver = require('semver');
+const ConfigUtil = require('../renderer/js/utils/config-util');
+const LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
+const Logger = require('../renderer/js/utils/logger-util');
+
+const logger = new Logger({
+	file: 'linux-update-util.log',
+	timestamp: true
+});
+
+function linuxUpdateNotification() {
+	let	url = 'https://api.github.com/repos/zulip/zulip-electron/releases';
+	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
+
+	const options = {
+		url,
+		headers: {'User-Agent': 'request'}
+	};
+
+	request(options, (error, response, body) => {
+		if (error) {
+			logger.error('Linux update error.');
+			logger.error(error);
+			return;
+		}
+		if (response.statusCode < 400) {
+			const data = JSON.parse(body);
+			const latestVersion = ConfigUtil.getConfigItem('betaUpdate') ? data[0].tag_name : data.tag_name;
+
+			if (semver.gt(latestVersion, app.getVersion())) {
+				const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
+				if (notified === null) {
+					new Notification({title: 'Zulip Update', body: 'A new version ' + latestVersion + ' is available. Please update using your package manager.'}).show();
+					LinuxUpdateUtil.setUpdateItem(latestVersion, true);
+				}
+			}
+		} else {
+			logger.log('Linux update response status: ', response.statusCode);
+		}
+	});
+}
+
+module.exports = {
+	linuxUpdateNotification
+};

app/main/menu.js

@@ -1,15 +1,23 @@
 'use strict';
-const os = require('os');
 const path = require('path');
 
-const { app, shell, BrowserWindow, Menu } = require('electron');
+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 [{
@@ -54,7 +62,7 @@ class AppMenu {
 			role: 'togglefullscreen'
 		}, {
 			label: 'Zoom In',
-			accelerator: 'CommandOrControl+Plus',
+			accelerator: process.platform === 'darwin' ? 'Command+Plus' : 'Control+=',
 			click(item, focusedWindow) {
 				if (focusedWindow) {
 					AppMenu.sendAction('zoomIn');
@@ -87,7 +95,7 @@ class AppMenu {
 			}
 		}, {
 			label: 'Toggle Sidebar',
-			accelerator: 'CommandOrControl+S',
+			accelerator: 'CommandOrControl+Shift+S',
 			click(item, focusedWindow) {
 				if (focusedWindow) {
 					const newValue = !ConfigUtil.getConfigItem('showSidebar');
@@ -115,24 +123,48 @@ class AppMenu {
 	}
 
 	getHelpSubmenu() {
-		return [{
+		return [
-			label: `${appName} Website`,
+			{
+				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: `${appName} Help`,
 				click() {
 					shell.openExternal('https://zulipchat.com/help/');
 				}
 			}, {
-			label: `${appName + ' Desktop'} - ${app.getVersion()}`,
+				label: 'Show App Logs',
-			enabled: false
+				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);
+				}
 			}, {
 				label: 'Report an Issue...',
 				click() {
-				const body = `
+					// the goal is to notify the main.html BrowserWindow
-					<!-- Please succinctly describe your issue and steps to reproduce it. -->
+					// which may not be the focused window.
-					-
+					BrowserWindow.getAllWindows().forEach(window => {
-					${app.getName()} ${app.getVersion()}
+						window.webContents.send('open-feedback-modal');
-					Electron ${process.versions.electron}
+					});
-					${process.platform} ${process.arch} ${os.release()}`;
-				shell.openExternal(`https://github.com/zulip/zulip-electron/issues/new?body=${encodeURIComponent(body)}`);
 				}
 			}];
 	}
@@ -150,6 +182,11 @@ class AppMenu {
 				type: 'separator'
 			});
 			for (let i = 0; i < tabs.length; i++) {
+				// Do not add functional tab settings to list of windows in menu bar
+				if (tabs[i].props.role === 'function' && tabs[i].webview.props.name === 'Settings') {
+					continue;
+				}
+
 				initialSubmenu.push({
 					label: tabs[i].webview.props.name,
 					accelerator: tabs[i].props.role === 'function' ? '' : `${ShortcutKey} + ${tabs[i].props.index + 1}`,
@@ -159,7 +196,7 @@ class AppMenu {
 							AppMenu.sendAction('switch-server-tab', tabs[i].props.index);
 						}
 					},
-					type: 'radio'
+					type: 'checkbox'
 				});
 			}
 		}
@@ -179,10 +216,15 @@ class AppMenu {
 						AppMenu.sendAction('open-about');
 					}
 				}
+			}, {
+				label: `Check for Update`,
+				click() {
+					AppMenu.checkForUpdate();
+				}
 			}, {
 				type: 'separator'
 			}, {
-				label: 'Settings',
+				label: 'Desktop App Settings',
 				accelerator: 'Cmd+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -191,7 +233,7 @@ class AppMenu {
 				}
 			}, {
 				label: 'Keyboard Shortcuts',
-				accelerator: 'Cmd+K',
+				accelerator: 'Cmd+Shift+K',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -199,6 +241,13 @@ 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: 'Reset App Settings',
 				accelerator: 'Command+Shift+D',
@@ -279,10 +328,15 @@ class AppMenu {
 						AppMenu.sendAction('open-about');
 					}
 				}
+			}, {
+				label: `Check for Update`,
+				click() {
+					AppMenu.checkForUpdate();
+				}
 			}, {
 				type: 'separator'
 			}, {
-				label: 'Settings',
+				label: 'Desktop App Settings',
 				accelerator: 'Ctrl+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -293,7 +347,7 @@ class AppMenu {
 				type: 'separator'
 			}, {
 				label: 'Keyboard Shortcuts',
-				accelerator: 'Ctrl+K',
+				accelerator: 'Ctrl+Shift+K',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -301,6 +355,13 @@ class AppMenu {
 				}
 			}, {
 				type: 'separator'
+			}, {
+				label: 'Toggle Do Not Disturb',
+				accelerator: 'Ctrl+Shift+M',
+				click() {
+					const dndUtil = DNDUtil.toggle();
+					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+				}
 			}, {
 				label: 'Reset App Settings',
 				accelerator: 'Ctrl+Shift+D',
@@ -369,15 +430,29 @@ class AppMenu {
 		win.webContents.send(action, ...params);
 	}
 
+	static checkForUpdate() {
+		appUpdater(true);
+	}
 	static resetAppSettings() {
-		// We save App's settings/configurations in following files
+		const resetAppSettingsMessage = 'By proceeding you will be removing all connected organizations and preferences from Zulip.';
-		const settingFiles = ['window-state.json', 'domain.json', 'settings.json'];
 
+		// We save App's settings/configurations in following files
+		const settingFiles = ['config/window-state.json', 'config/domain.json', 'config/settings.json', 'config/certificates.json'];
+
+		dialog.showMessageBox({
+			type: 'warning',
+			buttons: ['YES', 'NO'],
+			defaultId: 0,
+			message: 'Are you sure?',
+			detail: resetAppSettingsMessage
+		}, response => {
+			if (response === 0) {
 				settingFiles.forEach(settingFileName => {
 					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');
@@ -386,6 +461,8 @@ class AppMenu {
 					});
 				});
 			}
+		});
+	}
 
 	setMenu(props) {
 		const tpl = process.platform === 'darwin' ? this.getDarwinTpl(props) : this.getOtherTpl(props);

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "1.8.1",
+  "version": "2.3.3",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
   "copyright": "Kandra Labs, Inc.",
@@ -26,17 +26,23 @@
     "InstantMessaging"
   ],
   "dependencies": {
-    "auto-launch": "5.0.1",
+    "@electron-elements/send-feedback": "1.0.7",
+    "@sentry/electron": "0.5.5",
+    "adm-zip": "0.4.11",
+    "auto-launch": "5.0.5",
     "electron-is-dev": "0.3.0",
-    "electron-log": "2.2.7",
+    "electron-log": "2.2.14",
     "electron-spellchecker": "1.1.2",
-    "electron-updater": "2.18.2",
+    "electron-updater": "2.23.3",
     "electron-window-state": "4.1.1",
+    "escape-html": "1.0.3",
+    "is-online": "7.0.0",
     "node-json-db": "0.7.3",
-    "request": "2.81.0",
+    "request": "2.85.0",
+    "semver": "5.4.1",
     "wurl": "2.5.0"
   },
   "optionalDependencies": {
-    "node-mac-notifier": "0.0.13"
+    "node-mac-notifier": "0.1.0"
   }
 }

app/renderer/about.html

@@ -1,19 +1,23 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
+
+<head>
 	<meta charset="UTF-8">
 	<link rel="stylesheet" href="css/about.css">
-	</head>
+</head>
-	<body>
+
+<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>
+				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>
+				Available under the
+				<a onclick="linkInBrowser('license')">Apache 2.0 License</a>
 			</p>
 			<a class="bug" onclick="linkInBrowser('bug')" href="#">Found bug?</a>
 		</div>
@@ -41,5 +45,6 @@
 			shell.openExternal(url);
 		}
 	</script>
-	</body>
+	<script>require('./js/shared/preventdrag.js')</script>
+</body>
 </html>

app/renderer/css/main.css

@@ -13,9 +13,6 @@ body {
 #content {
     display: flex;
     height: 100%;
-    background: #eee url(../img/ic_loading.gif) no-repeat;
-    background-size: 60px 60px;
-    background-position: center;
 }
 
 .toggle-sidebar {
@@ -28,6 +25,7 @@ body {
     -webkit-app-region: drag;
     overflow: hidden;
     transition: all 0.5s ease;
+    z-index: 2;
 }
 
 .toggle-sidebar div {
@@ -44,6 +42,28 @@ body {
     transition: all 0.6s ease-out;
 }
 
+#view-controls-container {
+	height: calc(100% - 208px);
+	overflow-y: hidden;
+}
+
+#view-controls-container:hover {
+	overflow-y: overlay;
+}
+
+#view-controls-container::-webkit-scrollbar {
+	width: 4px;
+}
+
+#view-controls-container::-webkit-scrollbar-track {
+    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;
+}
+
 @font-face {
     font-family: 'Material Icons';
     font-style: normal;
@@ -81,11 +101,17 @@ body {
     text-rendering: optimizeLegibility;
 }
 
+#actions-container {
+    display: flex;
+    flex-direction: column;
+    position: fixed;
+    bottom: 0;
+}
+
 .action-button {
     display: flex;
     flex-direction: column;
-    align-items: center;
+    padding: 12px;
-    padding: 10px;
 }
 
 .action-button:hover {
@@ -101,6 +127,29 @@ body {
     color: #98a9b3;
 }
 
+.action-button.disable {
+    opacity: 0.6;
+}
+
+.action-button.disable:hover {
+    cursor: not-allowed;
+}
+
+.action-button.disable:hover i {
+    color: #6c8592;
+}
+
+.action-button.active {
+    /* background-color: rgba(255, 255, 255, 0.25); */
+    background-color: #efefef;
+    opacity: 0.9;
+    padding-right: 14px;
+}
+
+.action-button.active i {
+    color: #1c262b;
+}
+
 .tab:first-child {
     margin-top: 8px;
 }
@@ -221,36 +270,63 @@ body {
     width: 100%;
 }
 
+/*Pseudo element for loading indicator*/
+#webviews-container::before {
+    content: "";
+    position: absolute;
+    z-index: 1;
+    background: #fff url(../img/ic_loading.gif) no-repeat;
+    background-size: 60px 60px;
+    background-position: center;
+    width: 100%;
+    height: 100%;
+}
+
+/*When the active webview is loaded*/
+#webviews-container.loaded::before {
+    opacity: 0;
+    z-index: -1;
+    visibility: hidden;
+}
+
 webview {
-    opacity: 1;
+    /* transition: opacity 0.3s ease-in; */
-    transition: opacity 0.3s ease-in;
     flex-grow: 1;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
 }
 
 webview.onload {
     transition: opacity 1s cubic-bezier(0.95, 0.05, 0.795, 0.035);
 }
 
-webview.disabled {
+webview.active {
-    flex: 0 1;
+    opacity: 1;
-    height: 0;
+    z-index: 1;
-    width: 0;
+    visibility: visible;
-    opacity: 0;
-    transition: opacity 0.3s ease-out;
 }
 
-webview:focus {
+webview.disabled {
+    opacity: 0;
+}
+
+webview.focus {
     outline: 0px solid transparent;
 }
 
-
 /* Tooltip styling */
 
+#dnd-tooltip,
+#back-tooltip,
 #reload-tooltip,
 #setting-tooltip {
     font-family: sans-serif;
     background: #222c31;
-    margin-left: 68px;
+    margin-left: 48px;
     padding: 6px 8px;
     position: absolute;
     margin-top: 0px;
@@ -262,6 +338,8 @@ webview:focus {
     font-size: 14px;
 }
 
+#dnd-tooltip:after,
+#back-tooltip:after,
 #reload-tooltip:after,
 #setting-tooltip:after {
     content: " ";
@@ -321,6 +399,8 @@ webview:focus {
     height: 100%;
     width: 100%;
     position: relative;
+    flex-grow: 1;
+    flex-basis: 0px;
 }
 
 .hidden {
@@ -363,3 +443,26 @@ webview:focus {
         opacity: 1;
     }
 }
+
+send-feedback {
+  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;
+}
+
+#feedback-modal.show {
+  display: flex;
+}

app/renderer/css/preference.css

@@ -12,16 +12,19 @@ body {
 }
 
 kbd {
-    padding: 0.3em 0.8em;
+    display: inline-block;
     border: 1px solid #ccc;
+    border-radius: 3px;
     font-size: 15px;
     font-family: Courier New, Courier, monospace;
-    background-color: #383430;
-    color: #ededed;
-    display: inline-block;
-    margin: 0 0.1em;
     font-weight: bold;
     white-space: nowrap;
+    background-color: #f7f7f7;
+    color: #333;
+    margin: 0 0.1em;
+    padding: 0.3em 0.8em;
+    text-shadow: 0 1px 0 #fff;
+    line-height: 1.4;
 }
 
 table,
@@ -38,11 +41,11 @@ table {
 }
 
 table tr:nth-child(even) {
-    background-color: #f7eee6;
+    background-color: #fafafa;
 }
 
 table tr:nth-child(odd) {
-    background-color: #fff8ef;
+    background-color: #fff;
 }
 
 td {
@@ -92,11 +95,13 @@ td:nth-child(odd) {
 }
 
 #sidebar {
-    width: 80px;
+    width: 150px;
-    padding: 30px;
+    min-width: 100px;
+    padding: 30px 30px 30px 35px;
     display: flex;
     flex-direction: column;
     font-size: 16px;
+    background: #f2f2f2;
 }
 
 #nav-container {
@@ -110,7 +115,7 @@ td:nth-child(odd) {
 }
 
 .nav.active {
-    color: #464e5a;
+    color: #4ebfac;
     cursor: default;
     position: relative;
 }
@@ -118,12 +123,19 @@ td:nth-child(odd) {
 .nav.active::before {
     background: #464e5a;
     width: 3px;
-    height: 16px;
+    height: 18px;
     position: absolute;
     left: -8px;
     content: '';
 }
 
+
+/* We don't want to show this in nav item since we have the + button for adding an Organization */
+
+#nav-AddServer {
+    display: none;
+}
+
 #settings-header {
     font-size: 22px;
     color: #222c31;
@@ -139,12 +151,12 @@ td:nth-child(odd) {
 }
 
 #new-server-container {
-    opacity: 1;
+    padding-left: 42px;
-    transition: opacity 0.3s;
+    padding-top: 25px;
+    margin-right: 16px;
 }
 
 .title {
-    padding: 4px 0 6px 0;
     font-weight: 500;
     color: #222c31;
 }
@@ -156,6 +168,16 @@ td:nth-child(odd) {
     padding: 4px 0 6px 0;
 }
 
+.add-server-info-row {
+    display: flex;
+    margin: 8px 0 0 0;
+}
+
+.add-server-info-right {
+    flex-grow: 1;
+    margin-top: 10px;
+}
+
 .sub-title {
     padding: 4px 0 6px 0;
     font-weight: bold;
@@ -166,20 +188,40 @@ img.server-info-icon {
     width: 36px;
     height: 36px;
     padding: 4px;
+    cursor: pointer;
+    vertical-align: middle;
 }
 
 .server-info-left {
-    margin: 10px 20px 0 0;
+    margin: 4px 20px 0 0;
+    min-width: 40%;
 }
 
 .server-info-right {
+    margin-top: 4px;
+    width: 55%;
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
     flex-grow: 1;
-    margin-right: 10px;
 }
 
 .server-info-row {
-    display: flex;
+    display: inline-block;
-    margin: 8px 0 0 0;
+    margin: 5px 0 0 0;
+}
+
+.server-info-left .server-info-row {
+    display: inline-flex;
+    align-items: inherit;
+    vertical-align: -2px;
+    position: relative;
+}
+
+.server-url {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 .server-info-alias {
@@ -187,6 +229,10 @@ img.server-info-icon {
     cursor: pointer;
 }
 
+.server-url-info {
+    margin-right: 10px;
+}
+
 .setting-input-key {
     font-size: 14px;
     height: 27px;
@@ -200,22 +246,20 @@ img.server-info-icon {
 .setting-input-value {
     flex-grow: 1;
     font-size: 14px;
-    height: 22px;
     border-radius: 3px;
-    padding: 7px;
+    padding: 13px;
     border: #ededed 2px solid;
     outline-width: 0;
     background: transparent;
-    max-width: 500px;
+    max-width: 450px;
 }
 
 .setting-input-value:focus {
-    border: #7cb980 2px solid;
+    border: #4EBFAC 2px solid;
-    border-radius: 3px;
 }
 
-.setting-block {
+.manual-proxy-block {
-    width: 100%;
+    width: 96%;
 }
 
 .actions-container {
@@ -267,9 +311,7 @@ img.server-info-icon {
 }
 
 .settings-card:hover {
-    border-left: 8px solid #bcbcbc;
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 0px 0px rgba(0, 0, 0, 0.12);
-    box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16),
-                0 2px 0px 0px rgba(0,0,0,0.12);
 }
 
 .hidden {
@@ -278,11 +320,15 @@ img.server-info-icon {
 }
 
 .red {
-    color: #ffffff;
+    color: #ef5350;
-    background: #ef5350;
+    padding: 8px;
-    padding: 3px;
+    border: rgba(239, 83, 80, 0.5) solid 1px;
-    padding-right: 10px;
+}
-    padding-left: 10px;
+
+.red:hover {
+    color: #e63431;
+    border: rgba(239, 83, 80, 0.7) solid 1px;
+    ;
 }
 
 .blue {
@@ -312,12 +358,14 @@ img.server-info-icon {
 }
 
 i.open-tab-button {
-    padding: 0 5px;
+    padding-left: 2px;
-    font-size: 18px;
+    font-size: 19px;
     cursor: pointer;
 }
 
-.reset-data-button {
+.reset-data-button,
+.custom-css-button,
+.download-folder-button {
     display: inline-block;
     border: none;
     padding: 10px;
@@ -328,19 +376,36 @@ i.open-tab-button {
     text-decoration: none;
 }
 
+.css-delete-action {
+    margin-bottom: 10px;
+}
+
 .reset-data-button:hover {
     background-color: #3c9f8d;
     color: #fff;
 }
 
+.selected-css-path,
+.download-folder-path {
+    background: #eeeeee;
+    padding: 10px;
+    margin-top: 10px;
+    margin-right: 10px;
+    display: flex;
+    width: 90%;
+    justify-content: space-between;
+}
+
+#remove-custom-css {
+    align-items: flex-end;
+}
+
 #server-info-container {
-    min-height: calc(100% - 235px);
+    min-height: calc(100% - 260px);
 }
 
 #create-organization-container {
     font-size: 1.15em;
-    position: fixed;
-    bottom: 15px;
 }
 
 #create-organization-container i {
@@ -349,17 +414,10 @@ i.open-tab-button {
 }
 
 #open-create-org-link {
-    color: #666;
     cursor: pointer;
     text-decoration: none;
 }
 
-#open-create-org-link:hover {
-    color: #005580;
-    ;
-    text-decoration: underline;
-}
-
 .toggle {
     position: absolute;
     margin-left: -9999px;
@@ -396,7 +454,6 @@ input.toggle-round+label:before {
     right: 2px;
     background-color: #f1f1f1;
     border-radius: 25px;
-    transition: background 0.4s;
 }
 
 input.toggle-round+label:after {
@@ -404,7 +461,6 @@ input.toggle-round+label:after {
     height: 25px;
     background-color: #fff;
     border-radius: 100%;
-    transition: margin 0.4s;
 }
 
 input.toggle-round:checked+label:before {
@@ -414,3 +470,198 @@ input.toggle-round:checked+label:before {
 input.toggle-round:checked+label:after {
     margin-left: 25px;
 }
+
+
+/*  Add new server modal */
+
+.add-server-modal {
+    display: block;
+    position: fixed;
+    z-index: 1;
+    padding-top: 15vh;
+    left: 0;
+    top: 0;
+    margin: auto;
+    width: 100%;
+    height: 100%;
+    /* background: rgba(61, 64, 67, 15); */
+    background: linear-gradient(35deg, #003b52, #45b59b);
+    overflow: auto;
+}
+
+
+/* Modal Content */
+
+.modal-container {
+    background-color: #f4f7f8;
+    margin: auto;
+    padding: 57px;
+    border: #dae1e3 1px solid;
+    width: 550px;
+    height: 370px;
+    border-radius: 4px;
+}
+
+.add-server-modal .page-title {
+    text-align: center;
+    font-size: 1.6rem;
+}
+
+.divider {
+    margin-bottom: 30px;
+    margin-top: 30px;
+    color: #7d878a;
+}
+
+.divider hr {
+    margin-left: 8px;
+    margin-right: 8px;
+    width: 44%;
+}
+
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+
+.server-center {
+    width: 100%;
+    text-align: center;
+    align-items: center;
+    padding-top: 13px;
+    margin-left: -5px;
+}
+
+.server-center button {
+    font-weight: bold;
+    font-size: 1.1rem;
+    margin: auto;
+    align-items: center;
+    text-align: center;
+    color: #fff;
+    background: #4EBFAC;
+    border-color: none;
+    border: none;
+    width: 98%;
+    height: 46px;
+    border-radius: 3px;
+    cursor: pointer;
+}
+
+.server-center button:hover {
+    background: #329588;
+}
+
+.server-center button:focus {
+    background: #329588;
+}
+
+.certificates-card {
+     width:70%
+}
+
+.certificate-input {
+     width:100%;
+     margin-top: 10px; 
+     display:inline-flex;
+}
+
+.certificate-input div {
+    align-self:center;
+}
+
+.certificate-input .setting-input-value {
+    margin-left:10px;
+    max-width: 100%;
+}
+
+#add-certificate-button {
+    width:20%;
+    margin-right:0px;
+    height: 35px;
+}
+
+.tip {
+    background-color: hsl(46,63%,95%);
+    border: 1px solid hsl(46,63%,84%);
+    border-radius: 4px;
+}
+
+.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,
+    .download-folder-path  {
+        margin-right: 15px;
+    }
+    #css-delete-action {
+        margin-left: 10px;
+    }
+    #css-delete-action span {
+        display: none;
+    }
+}
+
+@media (max-width: 720px) {
+    .modal-container {
+        width: 60vw;
+        padding: 40px;
+        min-width: 300px;
+    }
+    .server-center button {
+        margin-right: -12px;
+        width: 100%;
+    }
+    .divider {
+        margin-right: -8px;
+    }
+    .divider hr {
+        margin-left: 6px;
+        margin-right: 6px;
+        width: 43%;
+    }
+    #new-server-container {
+        padding-left: 0px;
+    }
+}
+
+@media (max-width: 600px) {
+    .divider {
+        margin-left: 4%;
+    }
+    .divider hr {
+        margin-left: 2px;
+        margin-right: 2px;
+        width: 40%;
+    }
+}
+
+@media (max-width: 900px) {
+    .settings-card {
+        flex-direction: column;
+        align-items: center;
+    }
+
+    .server-info-right {
+        flex-direction: column;
+        align-items: center;
+    }
+
+    .action {
+        margin-top: 10px;
+    }
+}

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

@@ -16,11 +16,12 @@ class FunctionalTab extends Tab {
 
 	init() {
 		this.$el = this.generateNodeFromTemplate(this.template());
+		if (this.props.name !== 'Settings') {
 			this.props.$root.appendChild(this.$el);
-
 			this.$closeButton = this.$el.getElementsByClassName('server-tab-badge')[0];
 			this.registerListeners();
 		}
+	}
 
 	registerListeners() {
 		super.registerListeners();

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

@@ -0,0 +1,54 @@
+const { ipcRenderer } = require('electron');
+const { shell, app } = require('electron').remote;
+const LinkUtil = require('../utils/link-util');
+const DomainUtil = require('../utils/domain-util');
+const ConfigUtil = require('../utils/config-util');
+
+const dingSound = new Audio('../resources/sounds/ding.ogg');
+
+function handleExternalLink(event) {
+	const { url } = event;
+	const domainPrefix = DomainUtil.getDomain(this.props.index).url;
+	const downloadPath = ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`);
+  // Whitelist URLs which are allowed to be opened in the app
+	const {
+    isInternalUrl: isWhiteListURL,
+    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
+		if (!LinkUtil.isImage(url) && isUploadsURL) {
+			ipcRenderer.send('downloadFile', url, downloadPath);
+			ipcRenderer.once('downloadFileCompleted', (event, filePath, fileName) => {
+				const downloadNotification = new Notification('Download Complete', {
+					body: `Click to open ${fileName}`,
+					silent: true // We'll play our own sound - ding.ogg
+				});
+
+				// Play sound to indicate download complete
+				if (!ConfigUtil.getConfigItem('silent')) {
+					dingSound.play();
+				}
+
+				downloadNotification.onclick = () => {
+					shell.openItem(filePath);
+				};
+			});
+			return;
+		}
+
+    // open internal urls inside the current webview.
+		this.$el.loadURL(url);
+	} else {
+		event.preventDefault();
+		shell.openExternal(url);
+	}
+}
+
+module.exports = handleExternalLink;

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

@@ -50,7 +50,8 @@ class ServerTab extends Tab {
 			shortcutText = `Ctrl+${shownIndex}`;
 		}
 
-		ipcRenderer.send('register-server-tab-shortcut', shownIndex);
+		// Array index == Shown index - 1
+		ipcRenderer.send('switch-server-tab', shownIndex - 1);
 
 		return shortcutText;
 	}

app/renderer/js/components/webview.js

@@ -3,13 +3,12 @@
 const path = require('path');
 const fs = require('fs');
 
-const DomainUtil = require(__dirname + '/../utils/domain-util.js');
 const ConfigUtil = require(__dirname + '/../utils/config-util.js');
 const SystemUtil = require(__dirname + '/../utils/system-util.js');
-const LinkUtil = require(__dirname + '/../utils/link-util.js');
+const { app, dialog } = require('electron').remote;
-const { shell, app } = require('electron').remote;
 
 const BaseComponent = require(__dirname + '/../components/base.js');
+const handleExternalLink = require(__dirname + '/../components/handle-external-link.js');
 
 const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
 class WebView extends BaseComponent {
@@ -19,8 +18,10 @@ class WebView extends BaseComponent {
 		this.props = props;
 
 		this.zoomFactor = 1.0;
-		this.loading = false;
+		this.loading = true;
 		this.badgeCount = 0;
+		this.customCSS = ConfigUtil.getConfigItem('customCSS');
+		this.$webviewsContainer = document.querySelector('#webviews-container').classList;
 	}
 
 	template() {
@@ -45,16 +46,7 @@ class WebView extends BaseComponent {
 
 	registerListeners() {
 		this.$el.addEventListener('new-window', event => {
-			const { url } = event;
+			handleExternalLink.call(this, event);
-			const domainPrefix = DomainUtil.getDomain(this.props.index).url;
-
-			if (LinkUtil.isInternal(domainPrefix, url) || url === (domainPrefix + '/')) {
-				event.preventDefault();
-				this.$el.loadURL(url);
-			} else {
-				event.preventDefault();
-				shell.openExternal(url);
-			}
 		});
 
 		if (shouldSilentWebview) {
@@ -69,13 +61,30 @@ class WebView extends BaseComponent {
 			this.props.onTitleChange();
 		});
 
+		this.$el.addEventListener('did-navigate-in-page', event => {
+			const isSettingPage = event.url.includes('renderer/preference.html');
+			if (isSettingPage) {
+				return;
+			}
+			this.canGoBackButton();
+		});
+
+		this.$el.addEventListener('did-navigate', () => {
+			this.canGoBackButton();
+		});
+
 		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();
+				}
 			}
 		});
 
@@ -83,6 +92,7 @@ class WebView extends BaseComponent {
 			if (this.props.role === 'server') {
 				this.$el.classList.add('onload');
 			}
+			this.loading = false;
 			this.show();
 		});
 
@@ -116,17 +126,39 @@ class WebView extends BaseComponent {
 			return;
 		}
 
+		// To show or hide the loading indicator in the the active tab
+		if (this.loading) {
+			this.$webviewsContainer.remove('loaded');
+		} else {
+			this.$webviewsContainer.add('loaded');
+		}
+
 		this.$el.classList.remove('disabled');
+		this.$el.classList.add('active');
 		setTimeout(() => {
 			if (this.props.role === 'server') {
 				this.$el.classList.remove('onload');
 			}
 		}, 1000);
 		this.focus();
-		this.loading = false;
 		this.props.onTitleChange();
 		// Injecting preload css in webview to override some css rules
 		this.$el.insertCSS(fs.readFileSync(path.join(__dirname, '/../../css/preload.css'), 'utf8'));
+
+		// get customCSS again from config util to avoid warning user again
+		this.customCSS = ConfigUtil.getConfigItem('customCSS');
+		if (this.customCSS) {
+			if (!fs.existsSync(this.customCSS)) {
+				this.customCSS = null;
+				ConfigUtil.setConfigItem('customCSS', null);
+
+				const errMsg = 'The custom css previously set is deleted!';
+				dialog.showErrorBox('custom css file deleted!', errMsg);
+				return;
+			}
+
+			this.$el.insertCSS(fs.readFileSync(path.resolve(__dirname, this.customCSS), 'utf8'));
+		}
 	}
 
 	focus() {
@@ -140,6 +172,7 @@ class WebView extends BaseComponent {
 
 	hide() {
 		this.$el.classList.add('disabled');
+		this.$el.classList.remove('active');
 	}
 
 	load() {
@@ -183,6 +216,15 @@ class WebView extends BaseComponent {
 		}
 	}
 
+	canGoBackButton() {
+		const $backButton = document.querySelector('#actions-container #back-action');
+		if (this.$el.canGoBack()) {
+			$backButton.classList.remove('disable');
+		} else {
+			$backButton.classList.add('disable');
+		}
+	}
+
 	forward() {
 		if (this.$el.canGoForward()) {
 			this.$el.goForward();
@@ -191,6 +233,9 @@ class WebView extends BaseComponent {
 
 	reload() {
 		this.hide();
+		// Shows the loading indicator till the webview is reloaded
+		this.$webviewsContainer.remove('loaded');
+		this.loading = true;
 		this.$el.reload();
 	}
 

app/renderer/js/feedback.js

@@ -0,0 +1,62 @@
+const { app } = require('electron').remote;
+const path = require('path');
+const fs = require('fs');
+const SendFeedback = require('@electron-elements/send-feedback');
+
+// make the button color match zulip app's theme
+SendFeedback.customStyles = `
+button:hover, button:focus {
+  border-color: #4EBFAC;
+  color: #4EBFAC;
+}
+
+button:active {
+  background-color: #f1f1f1;
+  color: #4EBFAC;
+}
+
+button {
+  background-color: #4EBFAC;
+  border-color: #4EBFAC;
+}
+`;
+
+customElements.define('send-feedback', SendFeedback);
+const sendFeedback = document.querySelector('send-feedback');
+const feedbackHolder = sendFeedback.parentElement;
+
+// customize the fields of custom elements
+sendFeedback.title = 'Report Issue';
+sendFeedback.titleLabel = 'Issue title:';
+sendFeedback.titlePlaceholder = 'Enter issue title';
+sendFeedback.textareaLabel = 'Describe the issue:';
+sendFeedback.textareaPlaceholder = 'Succinctly describe your issue and steps to reproduce it...';
+sendFeedback.buttonLabel = 'Report Issue';
+sendFeedback.loaderSuccessText = '';
+
+sendFeedback.useReporter('emailReporter', {
+	email: 'akash@zulipchat.com'
+});
+
+feedbackHolder.addEventListener('click', e => {
+  // only remove the class if the grey out faded
+  // part is clicked and not the feedback element itself
+	if (e.target === e.currentTarget) {
+		feedbackHolder.classList.remove('show');
+	}
+});
+
+sendFeedback.addEventListener('feedback-submitted', () => {
+	setTimeout(() => {
+		feedbackHolder.classList.remove('show');
+	}, 1000);
+});
+
+const dataDir = app.getPath('userData');
+const logsDir = path.join(dataDir, '/Logs');
+sendFeedback.logs.push(...fs.readdirSync(logsDir).map(file => path.join(logsDir, file)));
+
+module.exports = {
+	feedbackHolder,
+	sendFeedback
+};

app/renderer/js/main.js

@@ -1,8 +1,9 @@
 'use strict';
 
 const { ipcRenderer, remote } = require('electron');
+const isDev = require('electron-is-dev');
 
-const { session } = remote;
+const { session, app } = remote;
 
 require(__dirname + '/js/tray.js');
 const DomainUtil = require(__dirname + '/js/utils/domain-util.js');
@@ -10,6 +11,17 @@ const WebView = require(__dirname + '/js/components/webview.js');
 const ServerTab = require(__dirname + '/js/components/server-tab.js');
 const FunctionalTab = require(__dirname + '/js/components/functional-tab.js');
 const ConfigUtil = require(__dirname + '/js/utils/config-util.js');
+const DNDUtil = require(__dirname + '/js/utils/dnd-util.js');
+const ReconnectUtil = require(__dirname + '/js/utils/reconnect-util.js');
+const Logger = require(__dirname + '/js/utils/logger-util.js');
+const { feedbackHolder } = require(__dirname + '/js/feedback.js');
+
+const escape = require('escape-html');
+
+const logger = new Logger({
+	file: 'errors.log',
+	timestamp: true
+});
 
 class ServerManagerView {
 	constructor() {
@@ -20,11 +32,15 @@ class ServerManagerView {
 		this.$reloadButton = $actionsContainer.querySelector('#reload-action');
 		this.$settingsButton = $actionsContainer.querySelector('#settings-action');
 		this.$webviewsContainer = document.getElementById('webviews-container');
+		this.$backButton = $actionsContainer.querySelector('#back-action');
+		this.$dndButton = $actionsContainer.querySelector('#dnd-action');
 
 		this.$addServerTooltip = document.getElementById('add-server-tooltip');
 		this.$reloadTooltip = $actionsContainer.querySelector('#reload-tooltip');
 		this.$settingsTooltip = $actionsContainer.querySelector('#setting-tooltip');
 		this.$serverIconTooltip = document.getElementsByClassName('server-tooltip');
+		this.$backTooltip = $actionsContainer.querySelector('#back-tooltip');
+		this.$dndTooltip = $actionsContainer.querySelector('#dnd-tooltip');
 
 		this.$sidebar = document.getElementById('sidebar');
 
@@ -50,7 +66,17 @@ class ServerManagerView {
 
 	loadProxy() {
 		return new Promise(resolve => {
-			const proxyEnabled = ConfigUtil.getConfigItem('useProxy', false);
+			// To change proxyEnable to useManualProxy in older versions
+			const proxyEnabledOld = ConfigUtil.isConfigItemExists('useProxy');
+			if (proxyEnabledOld) {
+				const proxyEnableOldState = ConfigUtil.getConfigItem('useProxy');
+				if (proxyEnableOldState) {
+					ConfigUtil.setConfigItem('useManualProxy', true);
+				}
+				ConfigUtil.removeConfigItem('useProxy');
+			}
+
+			const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
 			if (proxyEnabled) {
 				session.fromPartition('persist:webviewsession').setProxy({
 					pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
@@ -74,16 +100,24 @@ class ServerManagerView {
 		// Default settings which should be respected
 		const settingOptions = {
 			trayIcon: true,
-			useProxy: false,
+			useManualProxy: false,
+			useSystemProxy: false,
 			showSidebar: true,
 			badgeOption: true,
 			startAtLogin: false,
 			startMinimized: false,
 			enableSpellchecker: true,
 			showNotification: true,
+			autoUpdate: true,
 			betaUpdate: false,
 			silent: false,
-			lastActiveTab: 0
+			lastActiveTab: 0,
+			dnd: false,
+			dndPreviousSettings: {
+				showNotification: true,
+				silent: false
+			},
+			downloadsPath: `${app.getPath('downloads')}`
 		};
 
 		// Platform specific settings
@@ -91,6 +125,12 @@ class ServerManagerView {
 		if (process.platform === 'win32') {
 			// Only available on Windows
 			settingOptions.flashTaskbarOnMessage = true;
+			settingOptions.dndPreviousSettings.flashTaskbarOnMessage = true;
+		}
+
+		if (process.platform === 'darwin') {
+			// Only available on macOS
+			settingOptions.dockBouncing = true;
 		}
 
 		for (const i in settingOptions) {
@@ -115,8 +155,10 @@ class ServerManagerView {
 			}
 			// Open last active tab
 			this.activateTab(ConfigUtil.getConfigItem('lastActiveTab'));
+			// Remove focus from the settings icon at sidebar bottom
+			this.$settingsButton.classList.remove('active');
 		} else {
-			this.openSettings('Servers');
+			this.openSettings('AddServer');
 		}
 	}
 
@@ -149,15 +191,23 @@ class ServerManagerView {
 	}
 
 	initActions() {
+		this.initDNDButton();
+		this.$dndButton.addEventListener('click', () => {
+			const dndUtil = DNDUtil.toggle();
+			ipcRenderer.send('forward-message', 'toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
+		});
 		this.$reloadButton.addEventListener('click', () => {
 			this.tabs[this.activeTabIndex].webview.reload();
 		});
 		this.$addServerButton.addEventListener('click', () => {
-			this.openSettings('Servers');
+			this.openSettings('AddServer');
 		});
 		this.$settingsButton.addEventListener('click', () => {
 			this.openSettings('General');
 		});
+		this.$backButton.addEventListener('click', () => {
+			this.tabs[this.activeTabIndex].webview.back();
+		});
 
 		const $serverImgs = document.querySelectorAll('.server-icons');
 		$serverImgs.forEach($serverImg => {
@@ -166,9 +216,16 @@ class ServerManagerView {
 			});
 		});
 
-		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip);
+		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip, true);
 		this.sidebarHoverEvent(this.$settingsButton, this.$settingsTooltip);
 		this.sidebarHoverEvent(this.$reloadButton, this.$reloadTooltip);
+		this.sidebarHoverEvent(this.$backButton, this.$backTooltip);
+		this.sidebarHoverEvent(this.$dndButton, this.$dndTooltip);
+	}
+
+	initDNDButton() {
+		const dnd = ConfigUtil.getConfigItem('dnd', false);
+		this.toggleDNDButton(dnd);
 	}
 
 	getTabIndex() {
@@ -177,9 +234,17 @@ class ServerManagerView {
 		return currentIndex;
 	}
 
-	sidebarHoverEvent(SidebarButton, SidebarTooltip) {
+	sidebarHoverEvent(SidebarButton, SidebarTooltip, addServer = false) {
 		SidebarButton.addEventListener('mouseover', () => {
 			SidebarTooltip.removeAttribute('style');
+			// To handle position of add server tooltip due to scrolling of list of organizations
+			// This could not be handled using CSS, hence the top of the tooltip is made same
+			// as that of its parent element.
+			// This needs to handled only for the add server tooltip and not others.
+			if (addServer) {
+				const { top } = SidebarButton.getBoundingClientRect();
+				SidebarTooltip.style.top = top + 'px';
+			}
 		});
 		SidebarButton.addEventListener('mouseout', () => {
 			SidebarTooltip.style.display = 'none';
@@ -187,8 +252,13 @@ class ServerManagerView {
 	}
 
 	onHover(index, serverName) {
-		this.$serverIconTooltip[index].innerHTML = serverName;
+		this.$serverIconTooltip[index].innerHTML = escape(serverName);
 		this.$serverIconTooltip[index].removeAttribute('style');
+		// To handle position of servers' tooltip due to scrolling of list of organizations
+		// This could not be handled using CSS, hence the top of the tooltip is made same
+		// as that of its parent element.
+		const { top } = this.$serverIconTooltip[index].parentElement.getBoundingClientRect();
+		this.$serverIconTooltip[index].style.top = top + 'px';
 	}
 
 	onHoverOut(index) {
@@ -207,6 +277,7 @@ class ServerManagerView {
 		this.tabs.push(new FunctionalTab({
 			role: 'function',
 			materialIcon: tabProps.materialIcon,
+			name: tabProps.name,
 			$root: this.$tabsContainer,
 			index: this.functionalTabs[tabProps.name],
 			tabIndex,
@@ -227,7 +298,9 @@ 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]);
 	}
 
@@ -237,6 +310,7 @@ class ServerManagerView {
 			materialIcon: 'settings',
 			url: `file://${__dirname}/preference.html#${nav}`
 		});
+		this.$settingsButton.classList.add('active');
 		this.tabs[this.functionalTabs.Settings].webview.send('switch-settings-nav', nav);
 	}
 
@@ -257,10 +331,10 @@ class ServerManagerView {
 	}
 
 	activateLastTab(index) {
-		// Open last active tab
+		// Open all the tabs in background, also activate the tab based on the index
-		ConfigUtil.setConfigItem('lastActiveTab', index);
-		// Open all the tabs in background
 		this.activateTab(index);
+		// Save last active tab
+		ConfigUtil.setConfigItem('lastActiveTab', index);
 	}
 
 	activateTab(index, hideOldTab = true) {
@@ -272,10 +346,19 @@ class ServerManagerView {
 			if (this.activeTabIndex === index) {
 				return;
 			} else if (hideOldTab) {
+				// If old tab is functional tab Settings, remove focus from the settings icon at sidebar bottom
+				if (this.tabs[this.activeTabIndex].props.role === 'function' && this.tabs[this.activeTabIndex].props.name === 'Settings') {
+					this.$settingsButton.classList.remove('active');
+				}
 				this.tabs[this.activeTabIndex].deactivate();
 			}
 		}
 
+		try {
+			this.tabs[index].webview.canGoBackButton();
+		} catch (err) {
+		}
+
 		this.activeTabIndex = index;
 		this.tabs[index].activate();
 
@@ -291,7 +374,7 @@ class ServerManagerView {
 			webContents.send('toggle-sidebar', state);
 		});
 
-		ipcRenderer.on('toogle-silent', (event, state) => {
+		ipcRenderer.on('toggle-silent', (event, state) => {
 			const webviews = document.querySelectorAll('webview');
 			webviews.forEach(webview => {
 				try {
@@ -304,6 +387,15 @@ class ServerManagerView {
 				}
 			});
 		});
+
+		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);
+		});
 	}
 
 	destroyTab(name, index) {
@@ -323,6 +415,9 @@ class ServerManagerView {
 	}
 
 	destroyView() {
+		// Show loading indicator
+		this.$webviewsContainer.classList.remove('loaded');
+
 		// Clear global variables
 		this.activeTabIndex = -1;
 		this.tabs = [];
@@ -370,6 +465,12 @@ class ServerManagerView {
 		}
 	}
 
+	// Toggles the dnd button icon.
+	toggleDNDButton(alert) {
+		this.$dndTooltip.textContent = (alert ? 'Turn Off' : 'Enable') + ' Do Not Disturb';
+		this.$dndButton.querySelector('i').textContent = alert ? 'notifications_off' : 'notifications';
+	}
+
 	registerIpcs() {
 		const webviewListeners = {
 			'webview-reload': 'reload',
@@ -412,13 +513,14 @@ class ServerManagerView {
 		});
 
 		ipcRenderer.on('switch-server-tab', (event, index) => {
-			this.activateTab(index);
+			this.activateLastTab(index);
 		});
 
 		ipcRenderer.on('reload-proxy', (event, showAlert) => {
 			this.loadProxy().then(() => {
 				if (showAlert) {
 					alert('Proxy settings saved!');
+					ipcRenderer.send('reload-full-app');
 				}
 			});
 		});
@@ -476,14 +578,33 @@ class ServerManagerView {
 			}
 			ipcRenderer.send('update-taskbar-icon', createOverlayIcon(messageCount).toDataURL(), String(messageCount));
 		});
+
+		ipcRenderer.on('open-feedback-modal', () => {
+			feedbackHolder.classList.add('show');
+		});
 	}
 }
 
 window.onload = () => {
 	const serverManagerView = new ServerManagerView();
+	const reconnectUtil = new ReconnectUtil(serverManagerView);
 	serverManagerView.init();
-
 	window.addEventListener('online', () => {
-		serverManagerView.reloadView();
+		reconnectUtil.pollInternetAndReload();
 	});
+
+	window.addEventListener('offline', () => {
+		reconnectUtil.clearState();
+		logger.log('No internet connection, you are offline.');
+	});
+
+	// only start electron-connect (auto reload on change) when its ran
+	// from `npm run dev` or `gulp dev` and not from `npm start` when
+	// app is started `npm start` main process's proces.argv will have
+	// `--no-electron-connect`
+	const mainProcessArgv = remote.getGlobal('process').argv;
+	if (isDev && !mainProcessArgv.includes('--no-electron-connect')) {
+		const electronConnect = require('electron-connect');
+		electronConnect.client.create();
+	}
 };

app/renderer/js/notification/helpers.js

@@ -1,8 +1,47 @@
 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';
 
+const botsList = [];
+let botsListLoaded = false;
+
+// this function load list of bots from the server
+// sync=True for a synchronous getJSON request
+// in case botsList isn't already completely loaded when required in parseRely
+function loadBots(sync = false) {
+	const { $ } = window;
+	botsList.length = 0;
+	if (sync) {
+		$.ajaxSetup({async: false});
+	}
+	$.getJSON('/json/users')
+		.done(data => {
+			const members = data.members;
+			members.forEach(membersRow => {
+				if (membersRow.is_bot) {
+					const bot = `@${membersRow.full_name}`;
+					const mention = `@**${bot.replace(/^@/, '')}**`;
+					botsList.push([bot, mention]);
+				}
+			});
+			botsListLoaded = true;
+		})
+		.fail(error => {
+			logger.log('Load bots request failed: ', error.responseText);
+			logger.log('Load bots request status: ', error.statusText);
+		});
+	if (sync) {
+		$.ajaxSetup({async: true});
+	}
+}
+
 function checkElements(...elements) {
 	let status = true;
 	elements.forEach(element => {
@@ -41,7 +80,6 @@ const webContentsId = webContents.id;
 function focusCurrentServer() {
 	currentWindow.send('focus-webview-with-id', webContentsId);
 }
-
 // this function parses the reply from to notification
 // making it easier to reply from notification eg
 // @username in reply will be converted to @**username**
@@ -83,6 +121,20 @@ function parseReply(reply) {
 		reply = reply.replace(regex, streamMention);
 	});
 
+	// If botsList isn't completely loaded yet, make a synchronous getJSON request for list
+	if (botsListLoaded === false) {
+		loadBots(true);
+	}
+
+	// Iterate for every bot name and replace in reply
+	// @botname with @**botname**
+	botsList.forEach(([bot, mention]) => {
+		if (reply.includes(bot)) {
+			const regex = new RegExp(bot, 'g');
+			reply = reply.replace(regex, mention);
+		}
+	});
+
 	reply = reply.replace(/\\n/, '\n');
 	return reply;
 }
@@ -98,5 +150,6 @@ module.exports = {
 	customReply,
 	parseReply,
 	setupReply,
-	focusCurrentServer
+	focusCurrentServer,
+	loadBots
 };

app/renderer/js/notification/index.js

@@ -5,14 +5,23 @@ const {
 } = require('electron');
 
 const DefaultNotification = require('./default-notification');
-const { appId } = require('./helpers');
+const { appId, loadBots } = require('./helpers');
 
 // From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
 // On windows 8 we have to explicitly set the appUserModelId otherwise notification won't work.
 app.setAppUserModelId(appId);
 
 window.Notification = DefaultNotification;
+
 if (process.platform === 'darwin') {
 	const DarwinNotification = require('./darwin-notifications');
 	window.Notification = DarwinNotification;
 }
+
+window.addEventListener('load', () => {
+	// Call this function only when user is logged in
+	// eslint-disable-next-line no-undef, camelcase
+	if (page_params.realm_uri) {
+		loadBots();
+	}
+});

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

@@ -0,0 +1,91 @@
+'use-strict';
+
+const { dialog } = require('electron').remote;
+
+const BaseComponent = require(__dirname + '/../../components/base.js');
+const CertificateUtil = require(__dirname + '/../../utils/certificate-util.js');
+const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+
+class AddCertificate extends BaseComponent {
+	constructor(props) {
+		super();
+		this.props = props;
+		this._certFile = '';
+	}
+
+	template() {
+		return `			
+			<div class="settings-card server-center certificates-card">
+				<div class="certificate-input">
+					<div>Organization URL :</div> 
+					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
+				</div>
+				<div class="certificate-input">
+					<div>Custom CA's certificate file :</div> 
+					<button id="add-certificate-button">Add</button>
+				</div>
+			</div>
+		`;
+	}
+
+	init() {
+		this.$addCertificate = this.generateNodeFromTemplate(this.template());
+		this.props.$root.appendChild(this.$addCertificate);
+		this.addCertificateButton = this.$addCertificate.querySelector('#add-certificate-button');
+		this.serverUrl = this.$addCertificate.querySelectorAll('input.setting-input-value')[0];
+		this.initListeners();
+	}
+
+	validateAndAdd() {
+		const certificate = this._certFile;
+		const serverUrl = this.serverUrl.value;
+		if (certificate !== '' && serverUrl !== '') {
+			const server = encodeURIComponent(DomainUtil.formatUrl(serverUrl));
+			const fileName = certificate.substring(certificate.lastIndexOf('/') + 1);
+			const copy = CertificateUtil.copyCertificate(server, certificate, fileName);
+			if (!copy) {
+				return;
+			}
+			CertificateUtil.setCertificate(server, fileName);
+			dialog.showMessageBox({
+				title: 'Success',
+				message: `Certificate saved!`
+			});
+			this.serverUrl.value = '';
+		} else {
+			dialog.showErrorBox('Error', `Please, ${serverUrl === '' ?
+      'Enter an Organization URL' : 'Choose certificate file'}`);
+		}
+	}
+
+	addHandler() {
+		const showDialogOptions = {
+			title: 'Select file',
+			defaultId: 1,
+			properties: ['openFile'],
+			filters: [{ name: 'crt, pem', extensions: ['crt', 'pem'] }]
+		};
+		dialog.showOpenDialog(showDialogOptions, selectedFile => {
+			if (selectedFile) {
+				this._certFile = selectedFile[0] || '';
+				this.validateAndAdd();
+			}
+		});
+	}
+
+	initListeners() {
+		this.addCertificateButton.addEventListener('click', () => {
+			this.addHandler();
+		});
+
+		this.serverUrl.addEventListener('keypress', event => {
+			const EnterkeyCode = event.keyCode;
+
+			if (EnterkeyCode === 13) {
+				this.addHandler();
+			}
+		});
+	}
+}
+
+module.exports = AddCertificate;

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

@@ -0,0 +1,64 @@
+'use strict';
+
+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) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+			<div class="settings-pane" id="server-settings-pane">
+				<div class="page-title">Connected organizations</div>
+				<div class="title" id="existing-servers">All the connected orgnizations will appear here.</div>
+				<div id="server-info-container"></div>
+
+				<div class="page-title">Add Custom Certificates</div>
+				<div id="add-certificate-container"></div>
+			</div>
+		`;
+	}
+
+	init() {
+		this.initServers();
+	}
+
+	initServers() {
+		this.props.$root.innerHTML = '';
+
+		const servers = DomainUtil.getDomains();
+		this.props.$root.innerHTML = this.template();
+		this.$serverInfoContainer = document.getElementById('server-info-container');
+		this.$existingServers = document.getElementById('existing-servers');
+
+		const noServerText = 'All the connected orgnizations will appear here';
+		// Show noServerText if no servers are there otherwise hide it
+		this.$existingServers.innerHTML = servers.length === 0 ? noServerText : '';
+
+		for (let i = 0; i < servers.length; i++) {
+			new ServerInfoForm({
+				$root: this.$serverInfoContainer,
+				server: servers[i],
+				index: i,
+				onChange: this.reloadApp
+			}).init();
+		}
+
+		this.$addCertificateContainer = document.getElementById('add-certificate-container');
+		this.initAddCertificate();
+	}
+
+	initAddCertificate() {
+		new AddCertificate({
+			$root: this.$addCertificateContainer
+		}).init();
+	}
+
+}
+
+module.exports = ConnectedOrgSection;

app/renderer/js/pages/preference/create-new-org.js

@@ -1,37 +0,0 @@
-'use strict';
-
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const shell = require('electron').shell;
-
-class CreateOrganziation extends BaseComponent {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-			<div class="setting-row">
-				<div class="setting-description">
-					<span id="open-create-org-link">Or create a new organization on zulipchat.com<i class="material-icons open-tab-button">open_in_new</i></span>
-				</div>
-				<div class="setting-control"></div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.props.$root.innerHTML = this.template();
-		this.openCreateNewOrgExternalLink();
-	}
-
-	openCreateNewOrgExternalLink() {
-		const link = 'https://zulipchat.com/beta/';
-		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
-		externalCreateNewOrgEl.addEventListener('click', () => {
-			shell.openExternal(link);
-		});
-	}
-}
-
-module.exports = CreateOrganziation;

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

@@ -31,6 +31,10 @@ class GeneralSection extends BaseSection {
 						<div class="setting-description">Show app unread badge</div>
 						<div class="setting-control"></div>
 					</div>
+					<div class="setting-row" id="dock-bounce-option" style= "display:${process.platform === 'darwin' ? '' : 'none'}">
+						<div class="setting-description">Bounce dock on new private message</div>
+						<div class="setting-control"></div>
+					</div>
 					<div class="setting-row" id="flash-taskbar-option" style= "display:${process.platform === 'win32' ? '' : 'none'}">
 						<div class="setting-description">Flash taskbar on new message</div>
 						<div class="setting-control"></div>
@@ -49,6 +53,10 @@ class GeneralSection extends BaseSection {
 				</div>
 				<div class="title">App Updates</div>
 				<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>
@@ -69,6 +77,38 @@ class GeneralSection extends BaseSection {
 						<div class="setting-control"></div>
 					</div>
 				</div>
+				<div class="title">Add custom CSS</div>
+				<div class="settings-card">
+					<div class="setting-row" id="add-custom-css">
+						<div class="setting-description">
+							This will inject the selected css stylesheet in all the added accounts
+						</div>
+						<button class="custom-css-button blue">Add</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>
+				<div class="title">Advanced</div>
+				<div class="settings-card">
+					<div class="setting-row" id="download-folder">
+						<div class="setting-description">
+							Default download location
+						</div>
+						<button class="download-folder-button blue">Choose</button>
+					</div>
+					<div class="setting-row">
+						<div class="setting-description">
+							<div class="download-folder-path">${ConfigUtil.getConfigItem('downloadsPath')}</div>
+						</div>
+					</div>
+				</div>
 				<div class="title">Reset Application Data</div>
                 <div class="settings-card">
 					<div class="setting-row" id="resetdata-option">
@@ -86,19 +126,29 @@ class GeneralSection extends BaseSection {
 		this.updateTrayOption();
 		this.updateBadgeOption();
 		this.updateSilentOption();
-		this.updateUpdateOption();
+		this.autoUpdateOption();
+		this.betaUpdateOption();
 		this.updateSidebarOption();
 		this.updateStartAtLoginOption();
 		this.updateResetDataOption();
 		this.showDesktopNotification();
 		this.enableSpellchecker();
 		this.minimizeOnStart();
+		this.addCustomCSS();
+		this.showCustomCSSPath();
+		this.removeCustomCSS();
+		this.downloadFolder();
 
 		// Platform specific settings
+
 		// Flashing taskbar on Windows
 		if (process.platform === 'win32') {
 			this.updateFlashTaskbar();
 		}
+		// Dock bounce on macOS
+		if (process.platform === 'darwin') {
+			this.updateDockBouncing();
+		}
 	}
 
 	updateTrayOption() {
@@ -127,6 +177,18 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
+	updateDockBouncing() {
+		this.generateSettingOption({
+			$element: document.querySelector('#dock-bounce-option .setting-control'),
+			value: ConfigUtil.getConfigItem('dockBouncing', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('dockBouncing');
+				ConfigUtil.setConfigItem('dockBouncing', newValue);
+				this.updateDockBouncing();
+			}
+		});
+	}
+
 	updateFlashTaskbar() {
 		this.generateSettingOption({
 			$element: document.querySelector('#flash-taskbar-option .setting-control'),
@@ -139,14 +201,26 @@ 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);
+				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();
+				this.betaUpdateOption();
 			}
 		});
 	}
@@ -159,7 +233,7 @@ class GeneralSection extends BaseSection {
 				const newValue = !ConfigUtil.getConfigItem('silent', true);
 				ConfigUtil.setConfigItem('silent', newValue);
 				this.updateSilentOption();
-				currentBrowserWindow.send('toogle-silent', newValue);
+				currentBrowserWindow.send('toggle-silent', newValue);
 			}
 		});
 	}
@@ -232,6 +306,22 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
+	customCssDialog() {
+		const showDialogOptions = {
+			title: 'Select file',
+			defaultId: 1,
+			properties: ['openFile'],
+			filters: [{ name: 'CSS file', extensions: ['css'] }]
+		};
+
+		dialog.showOpenDialog(showDialogOptions, selectedFile => {
+			if (selectedFile) {
+				ConfigUtil.setConfigItem('customCSS', selectedFile[0]);
+				ipcRenderer.send('forward-message', 'hard-reload');
+			}
+		});
+	}
+
 	updateResetDataOption() {
 		const resetDataButton = document.querySelector('#resetdata-option .reset-data-button');
 		resetDataButton.addEventListener('click', () => {
@@ -251,6 +341,50 @@ class GeneralSection extends BaseSection {
 		});
 	}
 
+	addCustomCSS() {
+		const customCSSButton = document.querySelector('#add-custom-css .custom-css-button');
+		customCSSButton.addEventListener('click', () => {
+			this.customCssDialog();
+		});
+	}
+
+	showCustomCSSPath() {
+		if (!ConfigUtil.getConfigItem('customCSS')) {
+			const cssPATH = document.getElementById('remove-custom-css');
+			cssPATH.style.display = 'none';
+		}
+	}
+
+	removeCustomCSS() {
+		const removeCSSButton = document.getElementById('css-delete-action');
+		removeCSSButton.addEventListener('click', () => {
+			ConfigUtil.setConfigItem('customCSS');
+			ipcRenderer.send('forward-message', 'hard-reload');
+		});
+	}
+
+	downloadFolderDialog() {
+		const showDialogOptions = {
+			title: 'Select Download Location',
+			defaultId: 1,
+			properties: ['openDirectory']
+		};
+
+		dialog.showOpenDialog(showDialogOptions, selectedFolder => {
+			if (selectedFolder) {
+				ConfigUtil.setConfigItem('downloadsPath', selectedFolder[0]);
+				const downloadFolderPath = document.querySelector('.download-folder-path');
+				downloadFolderPath.innerText = selectedFolder[0];
+			}
+		});
+	}
+	downloadFolder() {
+		const downloadFolder = document.querySelector('#download-folder .download-folder-button');
+		downloadFolder.addEventListener('click', () => {
+			this.downloadFolderDialog();
+		});
+	}
+
 }
 
 module.exports = GeneralSection;

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

@@ -8,7 +8,7 @@ class PreferenceNav extends BaseComponent {
 
 		this.props = props;
 
-		this.navItems = ['General', 'Network', 'Servers', 'Shortcuts'];
+		this.navItems = ['General', 'Network', 'AddServer', 'Organizations', 'Shortcuts'];
 
 		this.init();
 	}

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-row" id="use-system-settings">
-						<div class="setting-description">Connect servers through a proxy</div>
+						<div class="setting-description">Use system proxy settings (requires restart)</div>
 						<div class="setting-control"></div>
 					</div>
-					<div class="setting-block">
+					<div class="setting-row" id="use-manual-settings">
+						<div class="setting-description">Manual proxy configuration</div>
+						<div class="setting-control"></div>
+					</div>
+					<div class="manual-proxy-block">
 						<div class="setting-row" id="proxy-pac-option">
 							<span class="setting-input-key">PAC script</span>
 							<input class="setting-input-value" placeholder="e.g. foobar.com/pacfile.js"/>
@@ -51,7 +55,7 @@ class NetworkSection extends BaseSection {
 		this.$proxyRules = document.querySelector('#proxy-rules-option .setting-input-value');
 		this.$proxyBypass = document.querySelector('#proxy-bypass-option .setting-input-value');
 		this.$proxySaveAction = document.getElementById('proxy-save-action');
-		this.$settingBlock = this.props.$root.querySelector('.setting-block');
+		this.$manualProxyBlock = this.props.$root.querySelector('.manual-proxy-block');
 		this.initProxyOption();
 
 		this.$proxyPAC.value = ConfigUtil.getConfigItem('proxyPAC', '');
@@ -68,31 +72,54 @@ class NetworkSection extends BaseSection {
 	}
 
 	initProxyOption() {
-		const proxyEnabled = ConfigUtil.getConfigItem('useProxy', false);
+		const manualProxyEnabled = ConfigUtil.getConfigItem('useManualProxy', false);
-		this.toggleProxySettings(proxyEnabled);
+		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'),
+			$element: document.querySelector('#use-system-settings .setting-control'),
-			value: ConfigUtil.getConfigItem('useProxy', false),
+			value: ConfigUtil.getConfigItem('useSystemProxy', false),
 			clickHandler: () => {
-				const newValue = !ConfigUtil.getConfigItem('useProxy');
+				const newValue = !ConfigUtil.getConfigItem('useSystemProxy');
-				ConfigUtil.setConfigItem('useProxy', newValue);
+				const manualProxyValue = ConfigUtil.getConfigItem('useManualProxy');
-				this.toggleProxySettings(newValue);
+				if (manualProxyValue && newValue) {
-				if (newValue === false) {
+					ConfigUtil.setConfigItem('useManualProxy', !manualProxyValue);
-					// Reload proxy if the proxy is turned off
+					this.toggleManualProxySettings(!manualProxyValue);
-					ipcRenderer.send('forward-message', 'reload-proxy', false);
 				}
+				if (newValue === false) {
+					// Remove proxy system proxy settings
+					ConfigUtil.setConfigItem('proxyRules', '');
+					ipcRenderer.send('forward-message', 'reload-proxy', true);
+				}
+				ConfigUtil.setConfigItem('useSystemProxy', newValue);
+				this.updateProxyOption();
+			}
+		});
+		this.generateSettingOption({
+			$element: document.querySelector('#use-manual-settings .setting-control'),
+			value: ConfigUtil.getConfigItem('useManualProxy', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('useManualProxy');
+				const systemProxyValue = ConfigUtil.getConfigItem('useSystemProxy');
+				this.toggleManualProxySettings(newValue);
+				if (systemProxyValue && newValue) {
+					ConfigUtil.setConfigItem('useSystemProxy', !systemProxyValue);
+				}
+				ConfigUtil.setConfigItem('proxyRules', '');
+				ConfigUtil.setConfigItem('useManualProxy', newValue);
+				// Reload app only when turning manual proxy off, hence !newValue
+				ipcRenderer.send('forward-message', 'reload-proxy', !newValue);
 				this.updateProxyOption();
 			}
 		});

app/renderer/js/pages/preference/new-server-form.js

@@ -2,6 +2,7 @@
 
 const BaseComponent = require(__dirname + '/../../components/base.js');
 const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+const shell = require('electron').shell;
 
 class NewServerForm extends BaseComponent {
 	constructor(props) {
@@ -11,17 +12,24 @@ class NewServerForm extends BaseComponent {
 
 	template() {
 		return `
-			<div class="settings-card">
+			<div class="server-input-container">
-				<div class="server-info-right">
+				<div class="title">Organization URL</div>
-					<div class="title">URL of Zulip organization</div>
+				<div class="add-server-info-row">
-					<div class="server-info-row">
+					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
-						<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or chat.your-organization.com"/>
 				</div>
-					<div class="server-info-row">
+				<div class="server-center">
-						<div class="action blue server-save-action">
+					<div class="server-save-action">
-							<i class="material-icons">add_box</i>
+						<button id="connect">Connect</button>
-							<span>Add</span>
 					</div>
+				</div>
+				<div class="server-center">
+				<div class="divider">
+					<hr class="left"/>OR<hr class="right" />
+				</div>
+				</div>
+				<div class="server-center">
+				<div class="server-save-action">
+					<button id="open-create-org-link">Create a new organization</button>
 			</div>
 					</div>
 			</div>
@@ -43,15 +51,25 @@ class NewServerForm extends BaseComponent {
 	}
 
 	submitFormHandler() {
+		this.$saveServerButton.children[0].innerHTML = 'Connecting...';
 		DomainUtil.checkDomain(this.$newServerUrl.value).then(serverConf => {
 			DomainUtil.addDomain(serverConf).then(() => {
 				this.props.onChange(this.props.index);
 			});
 		}, errorMessage => {
+			this.$saveServerButton.children[0].innerHTML = 'Connect';
 			alert(errorMessage);
 		});
 	}
 
+	openCreateNewOrgExternalLink() {
+		const link = 'https://zulipchat.com/new/';
+		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
+
 	initActions() {
 		this.$saveServerButton.addEventListener('click', () => {
 			this.submitFormHandler();
@@ -63,6 +81,8 @@ class NewServerForm extends BaseComponent {
 				this.submitFormHandler();
 			}
 		});
+		// open create new org link in default browser
+		this.openCreateNewOrgExternalLink();
 	}
 }
 

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

@@ -7,6 +7,7 @@ const Nav = require(__dirname + '/js/pages/preference/nav.js');
 const ServersSection = require(__dirname + '/js/pages/preference/servers-section.js');
 const GeneralSection = require(__dirname + '/js/pages/preference/general-section.js');
 const NetworkSection = require(__dirname + '/js/pages/preference/network-section.js');
+const ConnectedOrgSection = require(__dirname + '/js/pages/preference/connected-org-section.js');
 const ShortcutsSection = require(__dirname + '/js/pages/preference/shortcuts-section.js');
 
 class PreferenceView extends BaseComponent {
@@ -39,7 +40,7 @@ class PreferenceView extends BaseComponent {
 	handleNavigation(navItem) {
 		this.nav.select(navItem);
 		switch (navItem) {
-			case 'Servers': {
+			case 'AddServer': {
 				this.section = new ServersSection({
 					$root: this.$settingsContainer
 				});
@@ -51,6 +52,12 @@ class PreferenceView extends BaseComponent {
 				});
 				break;
 			}
+			case 'Organizations': {
+				this.section = new ConnectedOrgSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
 			case 'Network': {
 				this.section = new NetworkSection({
 					$root: this.$settingsContainer
@@ -69,21 +76,35 @@ class PreferenceView extends BaseComponent {
 		window.location.hash = `#${navItem}`;
 	}
 
+	// Handle toggling and reflect changes in preference page
+	handleToggle(elementName, state) {
+		const inputSelector = `#${elementName} .action .switch input`;
+		const input = document.querySelector(inputSelector);
+		if (input) {
+			input.checked = state;
+		}
+	}
+
 	registerIpcs() {
 		ipcRenderer.on('switch-settings-nav', (event, navItem) => {
 			this.handleNavigation(navItem);
 		});
 
 		ipcRenderer.on('toggle-sidebar', (event, state) => {
-			const inputSelector = '#sidebar-option .action .switch input';
+			this.handleToggle('sidebar-option', state);
-			const input = document.querySelector(inputSelector);
-			input.checked = state;
 		});
 
 		ipcRenderer.on('toggletray', (event, state) => {
-			const inputSelector = '#tray-option .action .switch input';
+			this.handleToggle('tray-option', state);
-			const input = document.querySelector(inputSelector);
+		});
-			input.checked = state;
+
+		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
+			this.handleToggle('show-notification-option', newSettings.showNotification);
+			this.handleToggle('silent-option', newSettings.silent);
+
+			if (process.platform === 'win32') {
+				this.handleToggle('flash-taskbar-option', newSettings.flashTaskbarOnMessage);
+			}
 		});
 	}
 }

app/renderer/js/pages/preference/server-info-form.js

@@ -1,6 +1,6 @@
 'use strict';
-const {dialog} = require('electron').remote;
+const { dialog } = require('electron').remote;
-const {ipcRenderer} = require('electron');
+const { ipcRenderer } = require('electron');
 
 const BaseComponent = require(__dirname + '/../../components/base.js');
 const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
@@ -16,19 +16,18 @@ class ServerInfoForm extends BaseComponent {
 			<div class="settings-card">
 				<div class="server-info-left">
 					<img class="server-info-icon" src="${this.props.server.icon}"/>
-				</div>
-				<div class="server-info-right">
 					<div class="server-info-row">
 						<span class="server-info-alias">${this.props.server.alias}</span>
 						<i class="material-icons open-tab-button">open_in_new</i>
 					</div>
-					<div class="server-info-row">
+				</div>
-						<input class="setting-input-value" disabled value="${this.props.server.url}"/>
+				<div class="server-info-right">
+					<div class="server-info-row server-url">
+						<span class="server-url-info" title="${this.props.server.url}">${this.props.server.url}</span>
 					</div>
 					<div class="server-info-row">
 						<div class="action red server-delete-action">
-							<i class="material-icons">indeterminate_check_box</i>
+							<span>Disconnect</span>
-							<span>Delete</span>
 						</div>
 					</div>
 				</div>
@@ -44,6 +43,7 @@ class ServerInfoForm extends BaseComponent {
 	initForm() {
 		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
 		this.$serverInfoAlias = this.$serverInfoForm.getElementsByClassName('server-info-alias')[0];
+		this.$serverIcon = this.$serverInfoForm.getElementsByClassName('server-info-icon')[0];
 		this.$deleteServerButton = this.$serverInfoForm.getElementsByClassName('server-delete-action')[0];
 		this.$openServerButton = this.$serverInfoForm.getElementsByClassName('open-tab-button')[0];
 		this.props.$root.appendChild(this.$serverInfoForm);
@@ -55,7 +55,7 @@ class ServerInfoForm extends BaseComponent {
 				type: 'warning',
 				buttons: ['YES', 'NO'],
 				defaultId: 0,
-				message: 'Are you sure you want to delete this server?'
+				message: 'Are you sure you want to disconnect this organization?'
 			}, response => {
 				if (response === 0) {
 					DomainUtil.removeDomain(this.props.index);
@@ -71,7 +71,12 @@ class ServerInfoForm extends BaseComponent {
 		this.$serverInfoAlias.addEventListener('click', () => {
 			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
 		});
+
+		this.$serverIcon.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
+		});
 	}
+
 }
 
 module.exports = ServerInfoForm;

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

@@ -1,10 +1,7 @@
 'use strict';
 
 const BaseSection = require(__dirname + '/base-section.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-const ServerInfoForm = require(__dirname + '/server-info-form.js');
 const NewServerForm = require(__dirname + '/new-server-form.js');
-const CreateOrganziation = require(__dirname + '/create-new-org.js');
 
 class ServersSection extends BaseSection {
 	constructor(props) {
@@ -14,12 +11,13 @@ class ServersSection extends BaseSection {
 
 	template() {
 		return `
+		<div class="add-server-modal">
+			<div class="modal-container">
 				<div class="settings-pane" id="server-settings-pane">
-				<div class="page-title">Register or login to a Zulip organization to get started</div>
+					<div class="page-title">Add a Zulip organization</div>
 					<div id="new-server-container"></div>
-				<div class="title" id="existing-servers"></div>
+				</div>
-				<div id="server-info-container"></div>
+			</div>
-				<div id="create-organization-container"></div>
 		</div>
 		`;
 	}
@@ -31,35 +29,10 @@ class ServersSection extends BaseSection {
 	initServers() {
 		this.props.$root.innerHTML = '';
 
-		const servers = DomainUtil.getDomains();
 		this.props.$root.innerHTML = this.template();
-		this.$serverInfoContainer = document.getElementById('server-info-container');
-		this.$existingServers = document.getElementById('existing-servers');
 		this.$newServerContainer = document.getElementById('new-server-container');
-		this.$newServerButton = document.getElementById('new-server-action');
 
-		this.$serverInfoContainer.innerHTML = servers.length ? '' : '';
-		// Show Existing servers if servers are there otherwise hide it
-		this.$existingServers.innerHTML = servers.length === 0 ? '' : 'Existing organizations';
 		this.initNewServerForm();
-
-		this.$createOrganizationContainer = document.getElementById('create-organization-container');
-		this.initCreateNewOrganization();
-
-		for (let i = 0; i < servers.length; i++) {
-			new ServerInfoForm({
-				$root: this.$serverInfoContainer,
-				server: servers[i],
-				index: i,
-				onChange: this.reloadApp
-			}).init();
-		}
-	}
-
-	initCreateNewOrganization() {
-		new CreateOrganziation({
-			$root: this.$createOrganizationContainer
-		}).init();
 	}
 
 	initNewServerForm() {

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) {
@@ -23,6 +24,10 @@ class ShortcutsSection extends BaseSection {
                   <tr>
                     <td><kbd>${userOSKey}</kbd><kbd>K</kbd></td>
                     <td>Keyboard Shortcuts</td>
+                  </tr>
+									<tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>M</kbd></td>
+                    <td>Toggle Do Not Disturb</td>
                   </tr>
                   <tr>
                     <td><kbd>Shift</kbd><kbd>${userOSKey}</kbd><kbd>D</kbd></td>
@@ -78,14 +83,6 @@ class ShortcutsSection extends BaseSection {
                     <td><kbd>${userOSKey}</kbd><kbd>A</kbd></td>
                     <td>Select All</td>
                   </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>F</kbd></td>
-                    <td>Find</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>G</kbd></td>
-                    <td>Find Next</td>
-                  </tr>
                   <tr>
                     <td><kbd>Control</kbd><kbd>${userOSKey}</kbd><kbd>Space</kbd></td>
                     <td>Emoji & Symbols</td>
@@ -109,7 +106,7 @@ class ShortcutsSection extends BaseSection {
                     <td>Enter Full Screen</td>
                   </tr>
                   <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>=</kbd></td>
+                    <td><kbd>${userOSKey}</kbd><kbd>+</kbd></td>
                     <td>Zoom In</td>
                   </tr>
                   <tr>
@@ -121,7 +118,7 @@ class ShortcutsSection extends BaseSection {
                     <td>Actual Size</td>
                   </tr>
                   <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>S</kbd></td>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
                     <td>Toggle Sidebar</td>
                   </tr>
                   <tr>
@@ -163,6 +160,7 @@ class ShortcutsSection extends BaseSection {
                 </table>
                 <div class="setting-control"></div>
               </div>
+              <div class="settings-card tip"><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>.</div>
             </div>
 		`;
 	}
@@ -182,6 +180,10 @@ class ShortcutsSection extends BaseSection {
                   <tr>
                     <td><kbd>${userOSKey}</kbd> + <kbd>K</kbd></td>
                     <td>Keyboard Shortcuts</td>
+                  </tr>
+									<tr>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>M</kbd></td>
+                    <td>Toggle Do Not Disturb</td>
                   </tr>
                   <tr>
                     <td><kbd>${userOSKey}</kbd> + <kbd>L</kbd></td>
@@ -256,7 +258,7 @@ class ShortcutsSection extends BaseSection {
                     <td>Actual Size</td>
                   </tr>
                   <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>S</kbd></td>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
                     <td>Toggle Sidebar</td>
                   </tr>
                   <tr>
@@ -298,13 +300,22 @@ class ShortcutsSection extends BaseSection {
                 </table>
                 <div class="setting-control"></div>
               </div>
+              <div class="tip"><b><i class="material-icons md-14">lightbulb_outline</i>Tip: </b>These desktop app shortcuts extend the Zulip webapp's <span id="open-hotkeys-link">keyboard shortcuts</span>.</div>
             </div>
 		`;
 	}
 
+	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,13 +1,17 @@
 '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');
 
 // eslint-disable-next-line import/no-unassigned-import
 require('./notification');
 
+// Prevent drag and drop event in main process which prevents remote code executaion
+require(__dirname + '/shared/preventdrag.js');
+
 const logout = () => {
 	// Create the menu for the below
 	document.querySelector('.dropdown-toggle').click();
@@ -20,7 +24,7 @@ const shortcut = () => {
 	// Create the menu for the below
 	const node = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
 	// Additional check
-	if (node.text.trim().toLowerCase() === 'keyboard shortcuts') {
+	if (node.text.trim().toLowerCase() === 'keyboard shortcuts (?)') {
 		node.click();
 	} else {
 		// Atleast click the dropdown
@@ -52,6 +56,29 @@ document.addEventListener('DOMContentLoaded', () => {
 			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 (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();
+
+			// 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);
+		}
+	});
 });
 
 // Clean up spellchecker events after you navigate away from this page;
@@ -60,3 +87,10 @@ window.addEventListener('beforeunload', () => {
 	SetupSpellChecker.unsubscribeSpellChecker();
 });
 
+// electron's globalShortcut can cause unexpected results
+// so adding the reload shortcut in the old-school way
+document.addEventListener('keydown', event => {
+	if (event.code === 'F5') {
+		ipcRenderer.send('forward-message', 'hard-reload');
+	}
+});

app/renderer/js/shared/preventdrag.js

@@ -0,0 +1,17 @@
+'use strict';
+
+// This is a security fix. Following function prevents drag and drop event in the app
+// so that attackers can't execute any remote code within the app
+// It doesn't affect the compose box so that users can still
+// use drag and drop event to share files etc
+
+const preventDragAndDrop = () => {
+	const preventEvents = ['dragover', 'drop'];
+	preventEvents.forEach(dragEvents => {
+		document.addEventListener(dragEvents, event => {
+			event.preventDefault();
+		});
+	});
+};
+
+preventDragAndDrop();

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

app/renderer/js/tray.js

@@ -98,7 +98,7 @@ const renderNativeImage = function (arg) {
 	return Promise.resolve()
 		.then(() => renderCanvas(arg))
 		.then(canvas => {
-			const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPng();
+			const pngData = nativeImage.createFromDataURL(canvas.toDataURL('image/png')).toPNG();
 			return Promise.resolve(nativeImage.createFromBuffer(pngData, config.pixelRatio));
 		});
 };

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/config-util.js

@@ -48,6 +48,12 @@ class ConfigUtil {
 			return value;
 		}
 	}
+	// This function returns whether a key exists in the configuration file (settings.json)
+	isConfigItemExists(key) {
+		this.reloadDB();
+		const value = this.db.getData('/')[key];
+		return (value !== undefined);
+	}
 
 	setConfigItem(key, value) {
 		this.db.push(`/${key}`, value, true);
@@ -60,7 +66,7 @@ class ConfigUtil {
 	}
 
 	reloadDB() {
-		const settingsJsonPath = path.join(app.getPath('userData'), '/settings.json');
+		const settingsJsonPath = path.join(app.getPath('userData'), '/config/settings.json');
 		try {
 			const file = fs.readFileSync(settingsJsonPath, 'utf8');
 			JSON.parse(file);
@@ -69,10 +75,11 @@ class ConfigUtil {
 				fs.unlinkSync(settingsJsonPath);
 				dialog.showErrorBox(
 					'Error saving settings',
-					'We encountered error while saving current settings.'
+					'We encountered an error while saving the settings.'
 				);
 				logger.error('Error while JSON parsing settings.json: ');
 				logger.error(err);
+				logger.reportSentry(err);
 			}
 		}
 		this.db = new JsonDB(settingsJsonPath, true, true);

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/dnd-util.js

@@ -0,0 +1,41 @@
+'use strict';
+
+const ConfigUtil = require(__dirname + '/config-util.js');
+
+function toggle() {
+	const dnd = !ConfigUtil.getConfigItem('dnd', false);
+	const dndSettingList = ['showNotification', 'silent'];
+	if (process.platform === 'win32') {
+		dndSettingList.push('flashTaskbarOnMessage');
+	}
+
+	let newSettings;
+	if (dnd) {
+		const oldSettings = {};
+		newSettings = {};
+
+		// Iterate through the dndSettingList.
+		for (const settingName of dndSettingList) {
+			// Store the current value of setting.
+			oldSettings[settingName] = ConfigUtil.getConfigItem(settingName);
+			// New value of setting.
+			newSettings[settingName] = (settingName === 'silent');
+		}
+
+		// Store old value in oldSettings.
+		ConfigUtil.setConfigItem('dndPreviousSettings', oldSettings);
+	} else {
+		newSettings = ConfigUtil.getConfigItem('dndPreviousSettings');
+	}
+
+	for (const settingName of dndSettingList) {
+		ConfigUtil.setConfigItem(settingName, newSettings[settingName]);
+	}
+
+	ConfigUtil.setConfigItem('dnd', dnd);
+	return {dnd, newSettings};
+}
+
+module.exports = {
+	toggle
+};

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 CertificateUtil = require(__dirname + '/certificate-util.js');
+
 const logger = new Logger({
 	file: `domain-util.log`,
 	timestamp: true
@@ -99,13 +103,24 @@ class DomainUtil {
 	checkDomain(domain, silent = false) {
 		if (!silent && this.duplicateDomain(domain)) {
 			// Do not check duplicate in silent mode
-			alert('This server has been added.');
+			return Promise.reject('This server has been added.');
-			return;
 		}
 
 		domain = this.formatUrl(domain);
 
-		const checkDomain = domain + '/static/audio/zulip.ogg';
+		const certificate = CertificateUtil.getCertificate(encodeURIComponent(domain));
+		let certificateLocation = '';
+
+		if (certificate) {
+			// To handle case where certificate has been moved from the location in certificates.json
+			try {
+				certificateLocation = fs.readFileSync(certificate);
+			} catch (err) {
+				logger.warn('Error while trying to get certificate: ' + err);
+			}
+		}
+		// If certificate for the domain exists add it as a ca key in the request's parameter else consider only domain as the parameter for request
+		const checkDomain = (certificateLocation) ? ({url: domain + '/static/audio/zulip.ogg', ca: certificateLocation}) : domain + '/static/audio/zulip.ogg';
 
 		const serverConf = {
 			icon: defaultIconUrl,
@@ -115,21 +130,16 @@ class DomainUtil {
 
 		return new Promise((resolve, reject) => {
 			request(checkDomain, (error, response) => {
-				const certsError =
-					[
-						'Error: self signed certificate',
-						'Error: unable to verify the first certificate',
-						'Error: unable to get local issuer certificate'
-					];
-
 				// If the domain contains following strings we just bypass the server
 				const whitelistDomains = [
 					'zulipdev.org'
 				];
 
-				// make sure that error is a error or string not undefined
+				// make sure that error is an error or string not undefined
 				// so validation does not throw error.
 				error = error || '';
+
+				const certsError = error.toString().includes('certificate');
 				if (!error && response.statusCode < 400) {
 					// Correct
 					this.getServerSettings(domain).then(serverSettings => {
@@ -137,7 +147,7 @@ class DomainUtil {
 					}, () => {
 						resolve(serverConf);
 					});
-				} else if (domain.indexOf(whitelistDomains) >= 0 || certsError.indexOf(error.toString()) >= 0) {
+				} else if (domain.indexOf(whitelistDomains) >= 0 || certsError) {
 					if (silent) {
 						this.getServerSettings(domain).then(serverSettings => {
 							resolve(serverSettings);
@@ -145,15 +155,19 @@ class DomainUtil {
 							resolve(serverConf);
 						});
 					} else {
+						// Report error to sentry to get idea of possible certificate errors
+						// users get when adding the servers
+						logger.reportSentry(new Error(error));
 						const certErrorMessage = `Do you trust certificate from ${domain}? \n ${error}`;
-						const certErrorDetail = `The server you're connecting to is either someone impersonating the Zulip server you entered, or the server you're trying to connect to is configured in an insecure way.
+						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.
-						\n Unless you have a good reason to believe otherwise, you should not proceed.
+						\nIf you have a valid certificate please add it from Settings>Organizations and try to add the organization again.
-						\n You can click here if you'd like to proceed with the connection.`;
+						\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 => {
@@ -170,7 +184,8 @@ class DomainUtil {
 					}
 				} else {
 					const invalidZulipServerError = `${domain} does not appear to be a valid Zulip server. Make sure that \
-					\n(1) you can connect to that URL in a web browser and \n (2) if you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings \n (3) its a zulip server`;
+					\n (1) you can connect to that URL in a web browser and \n (2) if you need a proxy to connect to the Internet, that you've configured your proxy in the Network settings \n (3) its a zulip server \
+					\n (4) the server has a valid certificate, you can add custom certificates in Settings>Organizations`;
 					reject(invalidZulipServerError);
 				}
 			});
@@ -189,7 +204,7 @@ 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)
 						});
 					}
 				} else {
@@ -207,18 +222,24 @@ class DomainUtil {
 			try {
 				request(url).on('response', response => {
 					response.on('error', err => {
-						console.log(err);
+						logger.log('Could not get server icon.');
+						logger.log(err);
+						logger.reportSentry(err);
 						resolve(defaultIconUrl);
 					});
 					response.pipe(file).on('finish', () => {
 						resolve(filePath);
 					});
 				}).on('error', err => {
-					console.log(err);
+					logger.log('Could not get server icon.');
+					logger.log(err);
+					logger.reportSentry(err);
 					resolve(defaultIconUrl);
 				});
 			} catch (err) {
-				console.log(err);
+				logger.log('Could not get server icon.');
+				logger.log(err);
+				logger.reportSentry(err);
 				resolve(defaultIconUrl);
 			}
 		});
@@ -236,7 +257,7 @@ class DomainUtil {
 	}
 
 	reloadDB() {
-		const domainJsonPath = path.join(app.getPath('userData'), '/domain.json');
+		const domainJsonPath = path.join(app.getPath('userData'), 'config/domain.json');
 		try {
 			const file = fs.readFileSync(domainJsonPath, 'utf8');
 			JSON.parse(file);
@@ -250,6 +271,7 @@ class DomainUtil {
 				);
 				logger.error('Error while JSON parsing domain.json: ');
 				logger.error(err);
+				logger.reportSentry(err);
 			}
 		}
 		this.db = new JsonDB(domainJsonPath, true, true);

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

@@ -19,7 +19,20 @@ class LinkUtil {
 		const currentDomain = wurl('hostname', currentUrl);
 		const newDomain = wurl('hostname', newUrl);
 
-		return (currentDomain === newDomain) && newUrl.includes('/#narrow');
+		const sameDomainUrl = (currentDomain === newDomain || newUrl === currentUrl + '/');
+		const isUploadsUrl = newUrl.includes(currentUrl + '/user_uploads/');
+		const isInternalUrl = newUrl.includes('/#narrow') || isUploadsUrl;
+
+		return {
+			isInternalUrl: sameDomainUrl && isInternalUrl,
+			isUploadsUrl
+		};
+	}
+
+	isImage(url) {
+		// test for images extension as well as urls like .png?s=100
+		const isImageUrl = /\.(bmp|gif|jpg|jpeg|png|webp)\?*.*$/i;
+		return isImageUrl.test(url);
 	}
 }
 

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

@@ -0,0 +1,74 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const process = require('process');
+const remote =
+	process.type === 'renderer' ? require('electron').remote : require('electron');
+const JsonDB = require('node-json-db');
+const Logger = require('./logger-util');
+
+const logger = new Logger({
+	file: 'linux-update-util.log',
+	timestamp: true
+});
+
+/* To make the util runnable in both main and renderer process */
+const { dialog, app } = remote;
+
+let instance = null;
+
+class LinuxUpdateUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		this.reloadDB();
+		return instance;
+	}
+
+	getUpdateItem(key, defaultValue = null) {
+		this.reloadDB();
+		const value = this.db.getData('/')[key];
+		if (value === undefined) {
+			this.setUpdateItem(key, defaultValue);
+			return defaultValue;
+		} else {
+			return value;
+		}
+	}
+
+	setUpdateItem(key, value) {
+		this.db.push(`/${key}`, value, true);
+		this.reloadDB();
+	}
+
+	removeUpdateItem(key) {
+		this.db.delete(`/${key}`);
+		this.reloadDB();
+	}
+
+	reloadDB() {
+		const linuxUpdateJsonPath = path.join(app.getPath('userData'), '/config/updates.json');
+		try {
+			const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
+			JSON.parse(file);
+		} catch (err) {
+			if (fs.existsSync(linuxUpdateJsonPath)) {
+				fs.unlinkSync(linuxUpdateJsonPath);
+				dialog.showErrorBox(
+					'Error saving update notifications.',
+					'We encountered an error while saving the update notifications.'
+				);
+				logger.error('Error while JSON parsing updates.json: ');
+				logger.error(err);
+			}
+		}
+		this.db = new JsonDB(linuxUpdateJsonPath, true, true);
+	}
+}
+
+module.exports = new LinuxUpdateUtil();

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

@@ -2,8 +2,10 @@ const NodeConsole = require('console').Console;
 const fs = require('fs');
 const isDev = require('electron-is-dev');
 const { initSetUp } = require('./default-util');
+const { sentryInit, captureException } = require('./sentry-util');
 
 initSetUp();
+sentryInit();
 let app = null;
 if (process.type === 'renderer') {
 	app = require('electron').remote.app;
@@ -82,6 +84,10 @@ class Logger {
 			`${date.getMinutes()}:${date.getSeconds()}`;
 		return timestamp;
 	}
+
+	reportSentry(err) {
+		captureException(err);
+	}
 }
 
 module.exports = Logger;

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

@@ -0,0 +1,96 @@
+'use strict';
+
+const ConfigUtil = require('./config-util.js');
+
+let instance = null;
+
+class ProxyUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+
+		return instance;
+	}
+
+	resolveSystemProxy(mainWindow) {
+		const page = mainWindow.webContents;
+		const ses = page.session;
+		const resolveProxyUrl = 'www.google.com';
+
+		// Check HTTP Proxy
+		const httpProxy = new Promise(resolve => {
+			ses.resolveProxy('http://' + resolveProxyUrl, proxy => {
+				let httpString = '';
+				if (proxy !== 'DIRECT') {
+					// in case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
+					// for all other HTTP or direct url:port both uses PROXY
+					if (proxy.includes('PROXY') || proxy.includes('HTTPS')) {
+						httpString = 'http=' + proxy.split('PROXY')[1] + ';';
+					}
+				}
+				resolve(httpString);
+			});
+		});
+		// Check HTTPS Proxy
+		const httpsProxy = new Promise(resolve => {
+			ses.resolveProxy('https://' + resolveProxyUrl, proxy => {
+				let httpsString = '';
+				if (proxy !== 'DIRECT' || proxy.includes('HTTPS')) {
+					// in case of proxy HTTPS url:port, windows gives first word as HTTPS while linux gives PROXY
+					// for all other HTTP or direct url:port both uses PROXY
+					if (proxy.includes('PROXY' || proxy.includes('HTTPS'))) {
+						httpsString += 'https=' + proxy.split('PROXY')[1] + ';';
+					}
+				}
+				resolve(httpsString);
+			});
+		});
+
+		// Check FTP Proxy
+		const ftpProxy = new Promise(resolve => {
+			ses.resolveProxy('ftp://' + resolveProxyUrl, proxy => {
+				let ftpString = '';
+				if (proxy !== 'DIRECT') {
+					if (proxy.includes('PROXY')) {
+						ftpString += 'ftp=' + proxy.split('PROXY')[1] + ';';
+					}
+				}
+				resolve(ftpString);
+			});
+		});
+
+		// Check SOCKS Proxy
+		const socksProxy = new Promise(resolve => {
+			ses.resolveProxy('socks4://' + resolveProxyUrl, proxy => {
+				let socksString = '';
+				if (proxy !== 'DIRECT') {
+					if (proxy.includes('SOCKS5')) {
+						socksString += 'socks=' + proxy.split('SOCKS5')[1] + ';';
+					} else if (proxy.includes('SOCKS4')) {
+						socksString += 'socks=' + proxy.split('SOCKS4')[1] + ';';
+					} else if (proxy.includes('PROXY')) {
+						socksString += 'socks=' + proxy.split('PROXY')[1] + ';';
+					}
+				}
+				resolve(socksString);
+			});
+		});
+
+		Promise.all([httpProxy, httpsProxy, ftpProxy, socksProxy]).then(values => {
+			let proxyString = '';
+			values.forEach(proxy => {
+				proxyString += proxy;
+			});
+			ConfigUtil.setConfigItem('systemProxyRules', proxyString);
+			const useSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');
+			if (useSystemProxy) {
+				ConfigUtil.setConfigItem('proxyRules', proxyString);
+			}
+		});
+	}
+}
+
+module.exports = new ProxyUtil();

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

@@ -0,0 +1,60 @@
+const isOnline = require('is-online');
+const Logger = require('./logger-util');
+
+const logger = new Logger({
+	file: `domain-util.log`,
+	timestamp: true
+});
+
+class ReconnectUtil {
+	constructor(serverManagerView) {
+		this.serverManagerView = serverManagerView;
+		this.alreadyReloaded = false;
+	}
+
+	clearState() {
+		this.alreadyReloaded = false;
+	}
+
+	pollInternetAndReload() {
+		const pollInterval = setInterval(() => {
+			this._checkAndReload()
+				.then(status => {
+					if (status) {
+						this.alreadyReloaded = true;
+						clearInterval(pollInterval);
+					}
+				});
+		}, 1500);
+	}
+
+	_checkAndReload() {
+		return new Promise(resolve => {
+			if (!this.alreadyReloaded) { // eslint-disable-line no-negated-condition
+				isOnline()
+					.then(online => {
+						if (online) {
+							if (!this.alreadyReloaded) {
+								this.serverManagerView.reloadView();
+							}
+							logger.log('You\'re back online.');
+							return resolve(true);
+						}
+
+						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>`;
+						}
+						return resolve(false);
+					});
+			} else {
+				return resolve(true);
+			}
+		});
+	}
+}
+
+module.exports = ReconnectUtil;

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

@@ -0,0 +1,16 @@
+const { init, captureException } = require('@sentry/electron');
+const isDev = require('electron-is-dev');
+
+const sentryInit = () => {
+	if (!isDev) {
+		init({
+			dsn: 'SENTRY_DSN',
+			sendTimeout: 30 // wait 30 seconds before considering the sending capture to have failed, default is 1 second
+		});
+	}
+};
+
+module.exports = {
+	sentryInit,
+	captureException
+};

app/renderer/main.html

@@ -24,10 +24,18 @@
       </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>
@@ -38,7 +46,11 @@
     <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>
 </html>

app/renderer/network.html

@@ -18,4 +18,5 @@
     </div>
   </body>
   <script src="js/pages/network.js"></script>
+  <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/renderer/preference.html

@@ -13,4 +13,5 @@
     </div>
   </body>
   <script src="js/pages/preference/preference.js"></script>
+  <script>require('./js/shared/preventdrag.js')</script>
 </html>

app/translations/bg.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "За Зулип",
+	"Actual Size": "Реален размер",
+	"Back": "обратно",
+	"Close": "Близо",
+	"Copy": "копие",
+	"Cut": "Разрез",
+	"Delete": "Изтрий",
+	"Desktop App Settings": "Настройки за настолни приложения",
+	"Edit": "редактиране",
+	"File": "досие",
+	"Forward": "напред",
+	"Hard Reload": "Трудно презареждане",
+	"Help": "Помогне",
+	"History": "история",
+	"Keyboard Shortcuts": "Комбинация от клавиши",
+	"Log Out": "Излез от профила си",
+	"Minimize": "Минимизиране",
+	"Paste": "паста",
+	"Paste and Match Style": "Поставяне и съвпадение на стила",
+	"Quit": "напускам",
+	"Redo": "ремонтирам",
+	"Reload": "Презареди",
+	"Report an issue...": "Подаване на сигнал за проблем ...",
+	"Reset App Settings": "Нулирайте настройките на приложението",
+	"Select All": "Избери всички",
+	"Show App Logs": "Показване на регистрационните файлове на приложения",
+	"Toggle DevTools for Active Tab": "Превключете DevTools за активен раздел",
+	"Toggle DevTools for Zulip App": "Превключете DevTools за Zulip App",
+	"Toggle Full Screen": "Превключване на цял екран",
+	"Toggle Sidebar": "Превключване на страничната лента",
+	"Toggle Tray Icon": "Превключване на иконата на тавата",
+	"Undo": "премахвам",
+	"View": "изглед",
+	"Window": "прозорец",
+	"Zoom In": "Увеличавам",
+	"Zoom Out": "Отдалечавам",
+	"Zulip Help": "Помощ за Zulip"
+}

app/translations/cs.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "O společnosti Zulip",
+	"Actual Size": "Aktuální velikost",
+	"Back": "Zadní",
+	"Close": "Zavřít",
+	"Copy": "kopírovat",
+	"Cut": "Střih",
+	"Delete": "Vymazat",
+	"Desktop App Settings": "Nastavení aplikace Desktop",
+	"Edit": "Upravit",
+	"File": "Soubor",
+	"Forward": "Vpřed",
+	"Hard Reload": "Hard Reload",
+	"Help": "Pomoc",
+	"History": "Dějiny",
+	"Keyboard Shortcuts": "Klávesové zkratky",
+	"Log Out": "Odhlásit se",
+	"Minimize": "Minimalizujte",
+	"Paste": "Vložit",
+	"Paste and Match Style": "Vložit a přizpůsobit styl",
+	"Quit": "Přestat",
+	"Redo": "Předělat",
+	"Reload": "Znovu načíst",
+	"Report an issue...": "Nahlásit problém...",
+	"Reset App Settings": "Obnovit nastavení aplikace",
+	"Select All": "Vybrat vše",
+	"Show App Logs": "Zobrazit protokoly aplikace",
+	"Toggle DevTools for Active Tab": "Přepínač DevTools pro aktivní kartu",
+	"Toggle DevTools for Zulip App": "Přepnout nástroj DevTools pro aplikaci Zulip App",
+	"Toggle Full Screen": "Přepnout na celou obrazovku",
+	"Toggle Sidebar": "Přepnout postranní panel",
+	"Toggle Tray Icon": "Přepnout ikonu zásobníku",
+	"Undo": "vrátit",
+	"View": "Pohled",
+	"Window": "Okno",
+	"Zoom In": "Přiblížit",
+	"Zoom Out": "Oddálit",
+	"Zulip Help": "Zulip Nápověda"
+}

app/translations/de.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Über Zulip",
+	"Actual Size": "Tatsächliche Größe",
+	"Back": "Zurück",
+	"Close": "Schließen",
+	"Copy": "Kopieren",
+	"Cut": "Schnitt",
+	"Delete": "Löschen",
+	"Desktop App Settings": "Desktop App Einstellungen",
+	"Edit": "Bearbeiten",
+	"File": "Datei",
+	"Forward": "Nach vorne",
+	"Hard Reload": "Hard Reload",
+	"Help": "Hilfe",
+	"History": "Geschichte",
+	"Keyboard Shortcuts": "Tastatürkürzel",
+	"Log Out": "Ausloggen",
+	"Minimize": "Minimieren",
+	"Paste": "Einfügen",
+	"Paste and Match Style": "Einfügen und Anpassen von Stilen",
+	"Quit": "Verlassen",
+	"Redo": "Wiederholen",
+	"Reload": "Neu laden",
+	"Report an issue...": "Ein Problem melden...",
+	"Reset App Settings": "App-Einstellungen zurücksetzen",
+	"Select All": "Wählen Sie Alle",
+	"Show App Logs": "App-Logs anzeigen",
+	"Toggle DevTools for Active Tab": "Schalten Sie DevTools für Active Tab ein",
+	"Toggle DevTools for Zulip App": "Umschalt DevTools für Zulip App",
+	"Toggle Full Screen": "Vollbild umschalten",
+	"Toggle Sidebar": "Toggle Seitenleiste",
+	"Toggle Tray Icon": "Toggle Tray-Symbol",
+	"Undo": "Rückgängig machen",
+	"View": "Aussicht",
+	"Window": "Fenster",
+	"Zoom In": "Hineinzoomen",
+	"Zoom Out": "Rauszoomen",
+	"Zulip Help": "Zulip Hilfe"
+}

app/translations/en.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "About Zulip",
+	"Actual Size": "Actual Size",
+	"Back": "Back",
+	"Close": "Close",
+	"Copy": "Copy",
+	"Cut": "Cut",
+	"Delete": "Delete",
+	"Desktop App Settings": "Desktop App Settings",
+	"Edit": "Edit",
+	"File": "File",
+	"Forward": "Forward",
+	"Hard Reload": "Hard Reload",
+	"Help": "Help",
+	"History": "History",
+	"Keyboard Shortcuts": "Keyboard Shortcuts",
+	"Log Out": "Log Out",
+	"Minimize": "Minimize",
+	"Paste": "Paste",
+	"Paste and Match Style": "Paste and Match Style",
+	"Quit": "Quit",
+	"Redo": "Redo",
+	"Reload": "Reload",
+	"Report an issue...": "Report an issue...",
+	"Reset App Settings": "Reset App Settings",
+	"Select All": "Select All",
+	"Show App Logs": "Show App Logs",
+	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
+	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
+	"Toggle Full Screen": "Toggle Full Screen",
+	"Toggle Sidebar": "Toggle Sidebar",
+	"Toggle Tray Icon": "Toggle Tray Icon",
+	"Undo": "Undo",
+	"View": "View",
+	"Window": "Window",
+	"Zoom In": "Zoom In",
+	"Zoom Out": "Zoom Out",
+	"Zulip Help": "Zulip Help"
+}

app/translations/es.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Acerca de Zulip",
+	"Actual Size": "Tamaño real",
+	"Back": "Espalda",
+	"Close": "Cerca",
+	"Copy": "Dupdo",
+	"Cut": "Cortar",
+	"Delete": "Borrar",
+	"Desktop App Settings": "Configuración de la aplicación de escritorio",
+	"Edit": "Editar",
+	"File": "Archivo",
+	"Forward": "Adelante",
+	"Hard Reload": "Recargar duro",
+	"Help": "Ayuda",
+	"History": "Historia",
+	"Keyboard Shortcuts": "Atajos de teclado",
+	"Log Out": "Cerrar sesión",
+	"Minimize": "Minimizar",
+	"Paste": "Pegar",
+	"Paste and Match Style": "Pegar y combinar estilo",
+	"Quit": "Dejar",
+	"Redo": "Rehacer",
+	"Reload": "Recargar",
+	"Report an issue...": "Reportar un problema...",
+	"Reset App Settings": "Restablecer configuraciones",
+	"Select All": "Seleccionar todo",
+	"Show App Logs": "Mostrar registros de aplicaciones",
+	"Toggle DevTools for Active Tab": "Alternar DevTools para Active Tab",
+	"Toggle DevTools for Zulip App": "Alternar DevTools para la aplicación Zulip",
+	"Toggle Full Screen": "Alternar pantalla completa",
+	"Toggle Sidebar": "Alternar barra lateral",
+	"Toggle Tray Icon": "Alternar el icono de la bandeja",
+	"Undo": "Deshacer",
+	"View": "Ver",
+	"Window": "Ventana",
+	"Zoom In": "Acercarse",
+	"Zoom Out": "Disminuir el zoom",
+	"Zulip Help": "Ayuda de Zulip"
+}

app/translations/fr.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "À propos de Zulip",
+	"Actual Size": "Taille actuelle",
+	"Back": "Arrière",
+	"Close": "Fermer",
+	"Copy": "Copie",
+	"Cut": "Couper",
+	"Delete": "Effacer",
+	"Desktop App Settings": "Paramètres de l'application de bureau",
+	"Edit": "modifier",
+	"File": "Fichier",
+	"Forward": "Vers l'avant",
+	"Hard Reload": "Rechargement dur",
+	"Help": "Aidez-moi",
+	"History": "Histoire",
+	"Keyboard Shortcuts": "Raccourcis clavier",
+	"Log Out": "Connectez - Out",
+	"Minimize": "Minimiser",
+	"Paste": "Coller",
+	"Paste and Match Style": "Coller et assortir le style",
+	"Quit": "Quitter",
+	"Redo": "Refaire",
+	"Reload": "Recharger",
+	"Report an issue...": "Signaler un problème...",
+	"Reset App Settings": "Réinitialiser les paramètres",
+	"Select All": "Tout sélectionner",
+	"Show App Logs": "Afficher les journaux d'applications",
+	"Toggle DevTools for Active Tab": "Basculer DevTools pour l'onglet actif",
+	"Toggle DevTools for Zulip App": "Basculer DevTools pour l'application Zulip",
+	"Toggle Full Screen": "Basculer en plein écran",
+	"Toggle Sidebar": "Basculer la barre latérale",
+	"Toggle Tray Icon": "Toggle Tray Icône",
+	"Undo": "annuler",
+	"View": "Vue",
+	"Window": "Fenêtre",
+	"Zoom In": "Agrandir",
+	"Zoom Out": "Dézoomer",
+	"Zulip Help": "Aide Zulip"
+}

app/translations/hi.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Zulip के बारे में",
+	"Actual Size": "वास्तविक आकार",
+	"Back": "वापस",
+	"Close": "बंद करे",
+	"Copy": "प्रतिलिपि",
+	"Cut": "कट गया",
+	"Delete": "हटाना",
+	"Desktop App Settings": "डेस्कटॉप ऐप सेटिंग्स",
+	"Edit": "संपादित करें",
+	"File": "फ़ाइल",
+	"Forward": "आगे",
+	"Hard Reload": "कठिन पुन: लोड करें",
+	"Help": "मदद",
+	"History": "इतिहास",
+	"Keyboard Shortcuts": "कुंजीपटल अल्प मार्ग",
+	"Log Out": "लोग आउट",
+	"Minimize": "छोटा करना",
+	"Paste": "चिपकाएं",
+	"Paste and Match Style": "चिपकाएं और शैली का मिलान करें",
+	"Quit": "छोड़ना",
+	"Redo": "फिर से करना",
+	"Reload": "सीमा से अधिक लादना",
+	"Report an issue...": "मामले की रिपोर्ट करें...",
+	"Reset App Settings": "ऐप सेटिंग्स रीसेट करें",
+	"Select All": "सभी का चयन करे",
+	"Show App Logs": "ऐप लॉग दिखाएं",
+	"Toggle DevTools for Active Tab": "सक्रिय टैब के लिए DevTools टॉगल करें",
+	"Toggle DevTools for Zulip App": "Zulip ऐप के लिए DevTools टॉगल करें",
+	"Toggle Full Screen": "पूर्णस्क्रीन चालू करें",
+	"Toggle Sidebar": "साइडबार टॉगल करें",
+	"Toggle Tray Icon": "ट्रे आइकन टॉगल करें",
+	"Undo": "पूर्ववत करें",
+	"View": "राय",
+	"Window": "खिड़की",
+	"Zoom In": "ज़ूम इन",
+	"Zoom Out": "ज़ूम आउट",
+	"Zulip Help": "Zulip सहायता"
+}

app/translations/hu.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "A Zulipról",
+	"Actual Size": "Valódi méret",
+	"Back": "Hát",
+	"Close": "Bezárás",
+	"Copy": "Másolat",
+	"Cut": "Vágott",
+	"Delete": "Töröl",
+	"Desktop App Settings": "Asztali alkalmazások beállításai",
+	"Edit": "szerkesztése",
+	"File": "fájl",
+	"Forward": "Előre",
+	"Hard Reload": "Hard Reload",
+	"Help": "Segítség",
+	"History": "Történelem",
+	"Keyboard Shortcuts": "Gyorsbillentyűket",
+	"Log Out": "Kijelentkezés",
+	"Minimize": "Kis méret",
+	"Paste": "Paszta",
+	"Paste and Match Style": "Beillesztés és stílusok illesztése",
+	"Quit": "quit",
+	"Redo": "Újra",
+	"Reload": "Reload",
+	"Report an issue...": "Hibajelentés ...",
+	"Reset App Settings": "Az alkalmazás beállításainak visszaállítása",
+	"Select All": "Mindet kiválaszt",
+	"Show App Logs": "Alkalmazásnaplók megjelenítése",
+	"Toggle DevTools for Active Tab": "A DevTools aktiválása az Aktív laphoz",
+	"Toggle DevTools for Zulip App": "Kapcsolja a DevTools-ot a Zulip App-hoz",
+	"Toggle Full Screen": "Teljes képernyőre váltás",
+	"Toggle Sidebar": "Oldalsáv átkapcsolása",
+	"Toggle Tray Icon": "Tálcaikon átkapcsolása",
+	"Undo": "kibont",
+	"View": "Kilátás",
+	"Window": "Ablak",
+	"Zoom In": "Nagyítás",
+	"Zoom Out": "Kicsinyítés",
+	"Zulip Help": "Zulip Súgó"
+}

app/translations/id.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Tentang Zulip",
+	"Actual Size": "Ukuran sebenarnya",
+	"Back": "Kembali",
+	"Close": "Dekat",
+	"Copy": "Salinan",
+	"Cut": "Memotong",
+	"Delete": "Menghapus",
+	"Desktop App Settings": "Setelan Aplikasi Desktop",
+	"Edit": "Edit",
+	"File": "Mengajukan",
+	"Forward": "Meneruskan",
+	"Hard Reload": "Hard Reload",
+	"Help": "Membantu",
+	"History": "Sejarah",
+	"Keyboard Shortcuts": "Cara pintas keyboard",
+	"Log Out": "Keluar",
+	"Minimize": "Memperkecil",
+	"Paste": "Pasta",
+	"Paste and Match Style": "Tempel dan Cocokkan Gaya",
+	"Quit": "Berhenti",
+	"Redo": "Mengulangi",
+	"Reload": "Reload",
+	"Report an issue...": "Laporkan masalah ...",
+	"Reset App Settings": "Setel ulang Pengaturan Aplikasi",
+	"Select All": "Pilih Semua",
+	"Show App Logs": "Tampilkan log aplikasi",
+	"Toggle DevTools for Active Tab": "Toggle DevTools untuk Tab Aktif",
+	"Toggle DevTools for Zulip App": "Toggle DevTools untuk Aplikasi Zulip",
+	"Toggle Full Screen": "Toggle Full Screen",
+	"Toggle Sidebar": "Toggle Sidebar",
+	"Toggle Tray Icon": "Toggle Tray Icon",
+	"Undo": "Membuka",
+	"View": "Melihat",
+	"Window": "Jendela",
+	"Zoom In": "Perbesar",
+	"Zoom Out": "Zoom Out",
+	"Zulip Help": "Zulip Help"
+}

app/translations/ja.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "チューリップについて",
+	"Actual Size": "実際のサイズ",
+	"Back": "バック",
+	"Close": "閉じる",
+	"Copy": "コピー",
+	"Cut": "カット",
+	"Delete": "削除",
+	"Desktop App Settings": "デスクトップアプリケーションの設定",
+	"Edit": "編集",
+	"File": "ファイル",
+	"Forward": "フォワード",
+	"Hard Reload": "ハードリロード",
+	"Help": "助けて",
+	"History": "歴史",
+	"Keyboard Shortcuts": "キーボードショートカット",
+	"Log Out": "ログアウト",
+	"Minimize": "最小化する",
+	"Paste": "ペースト",
+	"Paste and Match Style": "スタイルの貼り付けと一致",
+	"Quit": "終了する",
+	"Redo": "やり直し",
+	"Reload": "リロード",
+	"Report an issue...": "問題を報告する...",
+	"Reset App Settings": "アプリの設定をリセットする",
+	"Select All": "すべて選択",
+	"Show App Logs": "アプリケーションログを表示する",
+	"Toggle DevTools for Active Tab": "DevTools for Activeタブを切り替える",
+	"Toggle DevTools for Zulip App": "Zulip AppのDevToolsの切り替え",
+	"Toggle Full Screen": "フルスクリーン切り替え",
+	"Toggle Sidebar": "サイドバーの切り替え",
+	"Toggle Tray Icon": "トレイアイコンを切り替える",
+	"Undo": "元に戻す",
+	"View": "ビュー",
+	"Window": "窓",
+	"Zoom In": "ズームイン",
+	"Zoom Out": "ズームアウトする",
+	"Zulip Help": "チューリップヘルプ"
+}

app/translations/ko.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "튤립 소개",
+	"Actual Size": "실제 크기",
+	"Back": "뒤로",
+	"Close": "닫기",
+	"Copy": "부",
+	"Cut": "절단",
+	"Delete": "지우다",
+	"Desktop App Settings": "데스크톱 앱 설정",
+	"Edit": "편집하다",
+	"File": "파일",
+	"Forward": "앞으로",
+	"Hard Reload": "하드 다시로드",
+	"Help": "도움",
+	"History": "역사",
+	"Keyboard Shortcuts": "키보드 단축키",
+	"Log Out": "로그 아웃",
+	"Minimize": "최소화",
+	"Paste": "풀",
+	"Paste and Match Style": "붙여 넣기 및 스타일 일치",
+	"Quit": "떠나다",
+	"Redo": "다시 하다",
+	"Reload": "다시로드",
+	"Report an issue...": "문제 신고 ...",
+	"Reset App Settings": "앱 설정 재설정",
+	"Select All": "모두 선택",
+	"Show App Logs": "앱 로그 표시",
+	"Toggle DevTools for Active Tab": "DevTools for Active Tab 토글",
+	"Toggle DevTools for Zulip App": "Zulip App 용 DevTools 토글",
+	"Toggle Full Screen": "전체 화면 토글",
+	"Toggle Sidebar": "사이드 바 전환",
+	"Toggle Tray Icon": "트레이 아이콘 토글",
+	"Undo": "끄르다",
+	"View": "전망",
+	"Window": "창문",
+	"Zoom In": "확대",
+	"Zoom Out": "축소",
+	"Zulip Help": "튤립 도움말"
+}

app/translations/ml.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "സുലിപ്",
+	"Actual Size": "യഥാർത്ഥ വലുപ്പം",
+	"Back": "തിരികെ",
+	"Close": "അടയ്ക്കുക",
+	"Copy": "പകർത്തുക",
+	"Cut": "മുറിക്കുക",
+	"Delete": "ഇല്ലാതാക്കുക",
+	"Desktop App Settings": "ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങൾ",
+	"Edit": "എഡിറ്റുചെയ്യുക",
+	"File": "ഫയൽ",
+	"Forward": "മുന്നോട്ട്",
+	"Hard Reload": "ഹാർഡ് റീലോഡ്",
+	"Help": "സഹായിക്കൂ",
+	"History": "ചരിത്രം",
+	"Keyboard Shortcuts": "കീബോർഡ് കുറുക്കുവഴികൾ",
+	"Log Out": "ലോഗ് ഔട്ട്",
+	"Minimize": "ചെറുതാക്കുക",
+	"Paste": "പേസ്റ്റ്",
+	"Paste and Match Style": "ശൈലി ഒട്ടിക്കുകയും പൊരുത്തപ്പെടുത്തുകയും ചെയ്യുക",
+	"Quit": "പുറത്തുകടക്കുക",
+	"Redo": "വീണ്ടും ചെയ്യുക",
+	"Reload": "വീണ്ടും ലോഡുചെയ്യുക",
+	"Report an issue...": "ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക ...",
+	"Reset App Settings": "അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങൾ പുനഃസജ്ജമാക്കുക",
+	"Select All": "എല്ലാം തിരഞ്ഞെടുക്കുക",
+	"Show App Logs": "അപ്ലിക്കേഷൻ ലോഗുകൾ കാണിക്കുക",
+	"Toggle DevTools for Active Tab": "സജീവ ടാബിനായി DevTools ടോഗിൾ ചെയ്യുക",
+	"Toggle DevTools for Zulip App": "സുലിപ്പ് ആപ്ലിക്കേഷനായി DevTools ടോഗിൾ ചെയ്യുക",
+	"Toggle Full Screen": "പൂർണ്ണ സ്ക്രീൻ ടോഗിൾ ചെയ്യുക",
+	"Toggle Sidebar": "സൈഡ്ബാർ ടോഗിൾ ചെയ്യുക",
+	"Toggle Tray Icon": "ട്രേ ഐക്കൺ ടോഗിൾ ചെയ്യുക",
+	"Undo": "പഴയപടിയാക്കുക",
+	"View": "കാണുക",
+	"Window": "ജാലകം",
+	"Zoom In": "വലുതാക്കുക",
+	"Zoom Out": "സൂം ഔട്ട്",
+	"Zulip Help": "സുലിപ്പ് സഹായം"
+}

app/translations/nl.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Over Zulip",
+	"Actual Size": "Daadwerkelijke grootte",
+	"Back": "Terug",
+	"Close": "Dichtbij",
+	"Copy": "Kopiëren",
+	"Cut": "Besnoeiing",
+	"Delete": "Verwijder",
+	"Desktop App Settings": "Desktop-app-instellingen",
+	"Edit": "Bewerk",
+	"File": "het dossier",
+	"Forward": "Vooruit",
+	"Hard Reload": "Moeilijke herladen",
+	"Help": "Helpen",
+	"History": "Geschiedenis",
+	"Keyboard Shortcuts": "Toetsenbord sneltoetsen",
+	"Log Out": "Uitloggen",
+	"Minimize": "verkleinen",
+	"Paste": "Plakken",
+	"Paste and Match Style": "Plak en match stijl",
+	"Quit": "ophouden",
+	"Redo": "Opnieuw doen",
+	"Reload": "vernieuwen",
+	"Report an issue...": "Een probleem melden...",
+	"Reset App Settings": "App-instellingen opnieuw instellen",
+	"Select All": "Selecteer alles",
+	"Show App Logs": "App-logs weergeven",
+	"Toggle DevTools for Active Tab": "DevTools voor actieve tabblad omschakelen",
+	"Toggle DevTools for Zulip App": "DevTools voor Zulip-app omschakelen",
+	"Toggle Full Screen": "Volledig scherm activeren",
+	"Toggle Sidebar": "Zijbalk verschuiven",
+	"Toggle Tray Icon": "Pictogram Lade wisselen",
+	"Undo": "ongedaan maken",
+	"View": "Uitzicht",
+	"Window": "Venster",
+	"Zoom In": "In zoomen",
+	"Zoom Out": "Uitzoomen",
+	"Zulip Help": "Zulip Help"
+}

app/translations/pl.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "O Zulip",
+	"Actual Size": "Rzeczywisty rozmiar",
+	"Back": "Plecy",
+	"Close": "Blisko",
+	"Copy": "Kopiuj",
+	"Cut": "Ciąć",
+	"Delete": "Kasować",
+	"Desktop App Settings": "Ustawienia aplikacji na komputer",
+	"Edit": "Edytować",
+	"File": "Plik",
+	"Forward": "Naprzód",
+	"Hard Reload": "Trudne przeładowanie",
+	"Help": "Wsparcie",
+	"History": "Historia",
+	"Keyboard Shortcuts": "Skróty klawiszowe",
+	"Log Out": "Wyloguj",
+	"Minimize": "Zminimalizować",
+	"Paste": "Pasta",
+	"Paste and Match Style": "Wklej i dopasuj styl",
+	"Quit": "Porzucić",
+	"Redo": "Przerobić",
+	"Reload": "Przeładować",
+	"Report an issue...": "Zgłoś problem...",
+	"Reset App Settings": "Zresetuj ustawienia aplikacji",
+	"Select All": "Zaznacz wszystko",
+	"Show App Logs": "Pokaż dzienniki aplikacji",
+	"Toggle DevTools for Active Tab": "Przełącz DevTools dla Active Tab",
+	"Toggle DevTools for Zulip App": "Przełącz DevTools dla aplikacji Zulip",
+	"Toggle Full Screen": "Przełącz tryb pełnoekranowy",
+	"Toggle Sidebar": "Przełącz boczny pasek",
+	"Toggle Tray Icon": "Przełącz ikonę tacy",
+	"Undo": "Cofnij",
+	"View": "Widok",
+	"Window": "Okno",
+	"Zoom In": "Zbliżenie",
+	"Zoom Out": "Pomniejsz",
+	"Zulip Help": "Zulip Help"
+}

app/translations/pt.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Sobre Zulip",
+	"Actual Size": "Tamanho atual",
+	"Back": "Costas",
+	"Close": "Fechar",
+	"Copy": "cópia de",
+	"Cut": "Cortar",
+	"Delete": "Excluir",
+	"Desktop App Settings": "Configurações da aplicação Desktop",
+	"Edit": "Editar",
+	"File": "Arquivo",
+	"Forward": "frente",
+	"Hard Reload": "Hard Recargar",
+	"Help": "Socorro",
+	"History": "História",
+	"Keyboard Shortcuts": "Atalhos do teclado",
+	"Log Out": "Sair",
+	"Minimize": "Minimizar",
+	"Paste": "Colar",
+	"Paste and Match Style": "Estilo de colar e combinar",
+	"Quit": "Sair",
+	"Redo": "Refazer",
+	"Reload": "recarregar",
+	"Report an issue...": "Relatar um problema ...",
+	"Reset App Settings": "Redefinir as configurações da aplicação",
+	"Select All": "Selecionar tudo",
+	"Show App Logs": "Mostrar logs de aplicativos",
+	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
+	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
+	"Toggle Full Screen": "Alternar para o modo tela cheia",
+	"Toggle Sidebar": "Toggle Sidebar",
+	"Toggle Tray Icon": "Ícone Toggle Tray",
+	"Undo": "Desfazer",
+	"View": "Visão",
+	"Window": "Janela",
+	"Zoom In": "Mais Zoom",
+	"Zoom Out": "Reduzir o zoom",
+	"Zulip Help": "Zulip Help"
+}

app/translations/ru.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "О пользователе Zulip",
+	"Actual Size": "Фактический размер",
+	"Back": "назад",
+	"Close": "Закрыть",
+	"Copy": "копия",
+	"Cut": "Порез",
+	"Delete": "Удалить",
+	"Desktop App Settings": "Настройки настольных приложений",
+	"Edit": "редактировать",
+	"File": "файл",
+	"Forward": "Вперед",
+	"Hard Reload": "Hard Reload",
+	"Help": "Помогите",
+	"History": "история",
+	"Keyboard Shortcuts": "Горячие клавиши",
+	"Log Out": "Выйти",
+	"Minimize": "Минимизировать",
+	"Paste": "Вставить",
+	"Paste and Match Style": "Стиль вставки и совпадения",
+	"Quit": "Уволиться",
+	"Redo": "переделывать",
+	"Reload": "перезагружать",
+	"Report an issue...": "Сообщить о проблеме...",
+	"Reset App Settings": "Сбросить настройки приложения",
+	"Select All": "Выбрать все",
+	"Show App Logs": "Показать журналы приложений",
+	"Toggle DevTools for Active Tab": "Toggle DevTools для активной вкладки",
+	"Toggle DevTools for Zulip App": "Toggle DevTools для приложения Zulip",
+	"Toggle Full Screen": "Включить полноэкранный режим",
+	"Toggle Sidebar": "Переключить боковую панель",
+	"Toggle Tray Icon": "Иконка Toggle Tray",
+	"Undo": "расстегивать",
+	"View": "Посмотреть",
+	"Window": "Окно",
+	"Zoom In": "Приблизить",
+	"Zoom Out": "Уменьшить",
+	"Zulip Help": "Zulip Help"
+}

app/translations/sr.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "О Зулипу",
+	"Actual Size": "Стварна величина",
+	"Back": "Назад",
+	"Close": "Близу",
+	"Copy": "Копирај",
+	"Cut": "Цут",
+	"Delete": "Избриши",
+	"Desktop App Settings": "Подешавања за десктоп апликације",
+	"Edit": "Уредити",
+	"File": "Филе",
+	"Forward": "Напријед",
+	"Hard Reload": "Хард Релоад",
+	"Help": "Помоћ",
+	"History": "Историја",
+	"Keyboard Shortcuts": "Пречице на тастатури",
+	"Log Out": "Одјавити се",
+	"Minimize": "Минимизирај",
+	"Paste": "Пасте",
+	"Paste and Match Style": "Пасте и Матцх Стиле",
+	"Quit": "Одустати",
+	"Redo": "Поново",
+	"Reload": "Освежи",
+	"Report an issue...": "Пријавите проблем...",
+	"Reset App Settings": "Поново поставите подешавања апликације",
+	"Select All": "Изабери све",
+	"Show App Logs": "Прикажи евиденције апликација",
+	"Toggle DevTools for Active Tab": "Пребаците ДевТоолс за Ацтиве Таб",
+	"Toggle DevTools for Zulip App": "Пребаците ДевТоолс за Зулип Апп",
+	"Toggle Full Screen": "Пребаците цео екран",
+	"Toggle Sidebar": "Пребаците бочну траку",
+	"Toggle Tray Icon": "Тоггле Траи Ицон",
+	"Undo": "Ундо",
+	"View": "Поглед",
+	"Window": "Прозор",
+	"Zoom In": "Увеличати",
+	"Zoom Out": "Зумирај",
+	"Zulip Help": "Зулип Хелп"
+}

app/translations/ta.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "ஜுலிப் பற்றி",
+	"Actual Size": "உண்மையான அளவு",
+	"Back": "மீண்டும்",
+	"Close": "நெருக்கமான",
+	"Copy": "நகல்",
+	"Cut": "வெட்டு",
+	"Delete": "அழி",
+	"Desktop App Settings": "டெஸ்க்டாப் பயன்பாட்டு அமைப்புகள்",
+	"Edit": "தொகு",
+	"File": "கோப்பு",
+	"Forward": "முன்னோக்கி",
+	"Hard Reload": "கடினமாக மீண்டும் ஏற்றவும்",
+	"Help": "உதவி",
+	"History": "வரலாறு",
+	"Keyboard Shortcuts": "விசைப்பலகை குறுக்குவழிகள்",
+	"Log Out": "வெளியேறு",
+	"Minimize": "குறைத்தல்",
+	"Paste": "ஒட்டு",
+	"Paste and Match Style": "உடை ஒட்டு மற்றும் பொருந்தும்",
+	"Quit": "விட்டுவிட",
+	"Redo": "மீண்டும் செய்",
+	"Reload": "ஏற்றவும்",
+	"Report an issue...": "சிக்கலைப் புகார ...",
+	"Reset App Settings": "பயன்பாட்டு அமைப்புகளை மீட்டமைக்கவும்",
+	"Select All": "அனைத்தையும் தெரிவுசெய்",
+	"Show App Logs": "பயன்பாட்டு பதிவுகள் காட்டு",
+	"Toggle DevTools for Active Tab": "செயலில் தாவலுக்கு DevTools ஐ மாற்று",
+	"Toggle DevTools for Zulip App": "Zulip பயன்பாட்டிற்கான DevTools ஐ மாற்று",
+	"Toggle Full Screen": "மாற்று முழுத்திரை",
+	"Toggle Sidebar": "பக்கப்பட்டி மாறு",
+	"Toggle Tray Icon": "ட்ரே ஐகானை மாற்று",
+	"Undo": "செயல்தவிர்",
+	"View": "காண்க",
+	"Window": "ஜன்னல்",
+	"Zoom In": "பெரிதாக்க",
+	"Zoom Out": "பெரிதாக்குக",
+	"Zulip Help": "Zulip உதவி"
+}

app/translations/tr.json

@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Zulip Hakkinda",
+	"Actual Size": "Gerçek boyutu",
+	"Back": "Geri",
+	"Close": "Kapat",
+	"Copy": "kopya",
+	"Cut": "Kesmek",
+	"Delete": "silmek",
+	"Desktop App Settings": "Masaüstü Uygulama Ayarları",
+	"Edit": "Düzenle",
+	"File": "Dosya",
+	"Forward": "ileri",
+	"Hard Reload": "Sert Yeniden Yükle",
+	"Help": "yardım et",
+	"History": "Tarihçe",
+	"Keyboard Shortcuts": "Klavye kısayolları",
+	"Log Out": "Çıkış Yap",
+	"Minimize": "küçültmek",
+	"Paste": "Yapıştırmak",
+	"Paste and Match Style": "Stili Yapıştır ve Eşleştir",
+	"Quit": "çıkmak",
+	"Redo": "yeniden yapmak",
+	"Reload": "Tekrar yükle",
+	"Report an issue...": "Bir sorun bildir ...",
+	"Reset App Settings": "Uygulama Ayarlarını Sıfırla",
+	"Select All": "Hepsini seç",
+	"Show App Logs": "Uygulama Günlüğlerini Göster",
+	"Toggle DevTools for Active Tab": "Aktif Sekme İçin DevTools'a Geçiş Yap",
+	"Toggle DevTools for Zulip App": "Zulip App için DevTools'a Geçiş Yap",
+	"Toggle Full Screen": "Tam ekrana geç",
+	"Toggle Sidebar": "Kenar Çubuğunu Aç / Kapat",
+	"Toggle Tray Icon": "Tepsi Simgesini Aç / Kapat",
+	"Undo": "Geri alma",
+	"View": "Görünüm",
+	"Window": "pencere",
+	"Zoom In": "Yakınlaştır",
+	"Zoom Out": "Uzaklaştır",
+	"Zulip Help": "Zulip Yardımı"
+}

appveyor.yml

@@ -8,7 +8,7 @@ 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,665 @@
+# Version History
+
+
+
+All notable changes to the Zulip desktop app are documented in this file.
+
+
+
+### v2.3.2 --2018-05-28
+
+
+This is a quick release since we recently updated the certificate for code signing the app and we want to make sure the previous versions of the app get auto-updates without any conflicts.
+
+  <hr>
+
+### v2.3.1 --2018-05-23
+
+**Enhancements**:
+
+* Add a new setting to disable auto-updates
+
+* Add a menu item to check for updates manually
+
+* Other minor improvements
+
+**Fixes**:
+
+* Fix app not rendering colors properly
+
+*  **Security fix** - Do proper HTML escaping for server data to avoid XSS attacks
+
+* Fix loading indicator when server is loaded
+* Other minor fixes
+
+
+
+
+**Updated dependencies**:
+
+electron - `v2.0.1`
+
+electron-builder - `v20.13.4`
+
+electron-updater - `v2.21.10`
+
+<hr>
+
+
+### v2.2.0-beta --2018-05-08
+
+
+
+**Enhancements**:
+
+* Added do not disturb feature
+
+* New DMG installer image
+
+* Minor improvements
+
+
+
+**Fixes**:
+
+* Fix download functionality of file attachment links
+
+* Fix tray icon not showing unread counts
+
+
+
+
+**Updated dependencies**:
+
+electron - `v2.0.0`
+
+electron-builder - `v2.21.10`
+
+electron-updater - `v2.21.8`
+
+
+<hr>
+
+### v2.0.0 -- 2018-04-20
+
+**Enhancements**:
+
+*  [Snap](https://snapcraft.io/zulip) support for Linux
+
+* Add an option to download the file attachments instead of opening it in the browser
+
+* Open image link in webapp lightbox
+
+* Add scrollbar for list of organizations on overflow
+
+* Better report issue UX
+
+* Add F5 shortcut for reloading the app
+
+* Responsive UI for connected orgs in smaller window sizes
+
+* Minor improvements
+
+
+
+
+**Fixes**:
+
+
+
+* Remove unused shortcuts
+
+* Update toggle sidebar shortcut to CMD/CTRL+SHIFT+S
+
+* Warning dialog box for Reset App Settings
+
+* Fix reinstall script for working across all platforms
+
+* Other minor fixes
+
+
+
+**Updated dependencies**:
+
+* Update electron-builder to `v20.8.1`
+<hr>
+
+
+
+### v1.9.0 --2018-03-23
+
+**Enhancements**:
+
+* Major UI changes in the add new server and setting page
+
+* Some users wanted to change the look of the Zulip. Now you have the power. Feel free to add your own CSS using the all-new setting option **Add Custom CSS**
+
+* Added i18n locale helper script. Internalization is coming in the next release
+
+* Added **What's new** in `help` submenu so that you can see all the latest changes in the app
+
+* Other small improvements
+
+
+
+**Fixes**:
+
+* Add Zulip binary link to the bin. It was a regression we missed somehow. You can now start the app using `zulip` from a terminal [Linux]
+
+* Fix app settings overriding issue. This bug was unnoticed from `v1.4.0`. The bug was overriding the app settings which was pretty bad. Don't worry this works as expected now
+
+
+
+* Prevent drag and drop events to avoid few security risks
+
+* Do not allow running insecure contents in the app
+
+* The ugly white flickering in the webview is now fixed
+
+* Fix position of left-sidebar on toggle
+
+* Fix actions tooltip not visible on hover
+
+* Other small fixes
+
+
+
+
+**Updated dependencies**:
+
+* electron - `v1.8.4`
+
+* Spectron - `v3.8.0`
+
+
+
+<hr>
+
+### v1.8.2 --2018-02-27
+
+**Enhancements**:
+
+* Add bots mention support to reply option
+
+* Show a notification when a new update available [Linux]
+
+* Add back button in left-sidebar
+
+* Add a Loading indication for new server button
+
+* Improve help menu
+
+* Add menu-item to reveal app logs in file manager
+
+* Setting page and left-sidebar UI improvements
+
+* Other minor improvments
+
+
+
+
+**Fixes**:
+
+* Fix broken last active tab
+
+* Fix Zoom In shortcut
+
+* Check whether the internet is working before reloading
+
+* New organization link overlapping existing servers
+
+* Disable electron-connect when it's run from npm start
+
+* Do not auto-reload app when the system comes back from sleep
+
+* Only toggle the setting state if the element is present
+
+* Other minor fixes
+
+
+
+**Updated dependencies**:
+
+* electron - `v1.8.2`
+
+
+
+<hr>
+
+### v1.8.1 --2018-01-19
+
+**Enhancements**:
+
+* Reply from notifications [macOS]
+
+* Add a setting option to start the app in the background
+
+* 32-bit Debian installer
+
+* 32-bit AppImage installer
+
+* Automatically add apt-repo and GPG public keys on installing Debian file [Linux]
+
+* Remove app data, config files etc on uninstalling Debian installer [Linux]
+
+* Add logger utility for debugging that makes easier to sharing the apps
+
+
+
+**Fixes**:
+
+* Handle corrupted config files
+
+* Reload full app on system hibernation
+* Load default icon if organization icon is not available
+
+* Focus app when a notification is triggered
+
+* Reflect changes in the preference page (#362)
+
+* Set the default value of flash taskbar setting [Windows]
+
+* Rename Zoom In keyboard shortcut
+
+* Fix checkDomain, so it checks all error codes
+
+* Disable hardware acceleration to decrease the load on GPU
+
+* Minor bug fixes
+
+
+
+**Updated dependencies**:
+
+* electron - `v1.7.10`
+
+* electron-builder - `v19.53.6`
+
+* electron-updater - `v2.18.2`
+
+
+<hr>
+
+
+
+### v1.7.0 --2017-11-24
+
+**Enhancements**:
+
+* Updated to Electron `v1.6.15`, electron-builder `v19.46.4`
+
+* Improved setting page for new users
+
+* On the developer side, we have added few tests to make sure app doesn't fail
+
+* Minor improvements
+
+
+<hr>
+
+
+### 1.6.0-beta --2017-11-16
+
+**Enhancements**:
+
+* Added setting option to enable/disable spellcheck
+
+* Added setting option to control Windows taskbar flashing [Windows]
+
+* Auto-updates for Linux [AppImage]
+
+* Better tray icons for retina display
+
+* Reset app settings from Menu item
+
+* Show detailed error message on invalid Zulip server
+
+
+
+**Fixes**:
+
+* Fixed a bug which was caused by app's shortcuts. From now on our shortcuts won't hijack other apps shortcuts
+
+* Removed [electron-localshortcut](https://github.com/parro-it/electron-localshortcut) completely. Now we only depends on menu accelerators for keyboard shortcuts
+
+* Handle certificate issue properly
+
+* Other minor fixes
+
+<hr>
+
+
+### v1.5.0 --2017-10-11
+
+**Enhancements**:
+
+* Added an option to clear app data
+
+* Added an option to show/hide desktop notifications
+
+* Redesigned setting page
+
+* Red dot over dock icon for PM [macOS]
+
+* Show server-info on hovering the server icon
+
+
+
+
+**Fixes**:
+
+* Fetch correct organization icon from server_settings API
+
+* Minor improvements
+
+
+<hr>
+
+### v1.4.0 --2017-09-04
+
+**Enhancements**:
+
+* Added proxy support
+
+* Added setting option for badges
+
+* Start app at login setting option
+
+* Added app category for Linux
+
+* Minor improvements in settings page
+
+* apt-repo on bintray for linux - [here](https://bintray.com/zulip/debian/zulip-elec)
+
+
+
+**Fixes**
+
+* Fixed auto-updates
+
+* Better warning message on certificate error
+
+* Don't allow duplicate servers
+
+<hr>
+
+
+### 1.3.0-beta -- 2017-08-09
+
+**Enhancements**:
+
+* Added back/forward option under `History` submenu
+
+* Added taskbar overlay icon [Windows]
+
+* Added `Window` submenu by which users can switch to other servers
+
+* Added flashing taskbar icon on incoming message [Windows]
+
+* Option to hide the left sidebar
+
+* Staged rollouts
+
+* Minor style improvements
+
+
+
+
+**Fixes**
+
+* Handle focus event properly
+
+* Open external links in default browser
+
+* Allow user to change installation directory
+
+* Fixed server-icon path error [Windows]
+
+* Fixed server validation error
+
+* Fetch server details from Zulip api
+
+* Added tooltip in left sidebar
+
+* Added publisher name in windows installer
+
+
+
+**Updated dependencies**:
+
+* electron - `v1.6.11`
+
+* spellchecker - `v1.2.0`
+
+* electron-builder - `v19.9.1`
+
+
+<hr>
+
+### v1.2.0-beta -- 2017-07-12
+
+**Enhancements**:
+
+
+
+* Added new setting page
+
+* Setting for beta-updates. You can opt in for beta updates via selecting it from setting page
+
+* Added Keyboard shortcuts to switch between multiple servers
+
+* Desktop notifications support on Windows
+
+
+
+**Fixes**
+
+* Unregister keyboard shortcuts on windows close
+
+* Show warning dialog while deleting server
+
+* Allow server which is signed by root cert
+
+* Other minor bug fixes
+
+<hr>
+
+
+### v1.1.0-beta --2017-06-23
+
+**Enhancements**:
+
+* New network error page. App will auto-reload once the network comes back
+* Quit shortcut - CTRL+Q [Windows]
+* Improved preferences
+
+
+
+**Fixes**:
+
+* Fixed power-monitor module error
+* Fixed code signing error [macOS]
+
+<hr>
+
+
+
+### v1.0.0-beta --2017-06-21
+
+**Enhancements**:
+
+* Sign in to multiple teams
+* Windows 7 desktop notification support
+* Show badge count for each Zulip server
+* Toggle window on clicking tray icon [Windows]
+
+* Windows installer is properly code signed using [DigiCert](https://www.digicert.com/) certificate. You may get a warning regarding the certificate, please make it false positive
+
+
+**Fixes**:
+
+* Close/hide app properly
+* Keep app running in background on clicking X
+
+
+<hr>
+
+### v0.5.10 --2017-05-12
+
+**Enhancements**:
+
+* Added self-signed server support
+* Unread message counts in tray icon
+
+
+
+<hr>
+
+### v0.5.9 --2017-04-12
+
+**Enhancements**:
+
+* Properly signed app for macOS
+* Toggle tray icon
+* Better error handling when no internet connenction
+
+
+
+**Fixes**:
+
+* Fixed permission issue on windows
+* Fixed wrong keyboard shortcuts
+
+
+<hr>
+
+### v0.5.8 --2017-02-13
+
+**Enhacements**:
+Smaller Windows installer size
+
+<hr>
+
+### v0.5.7 --2017-02-08
+
+Minor improvements
+
+
+
+<hr>
+
+### v0.5.6 --2017-02-07
+
+
+**Enhacements**:
+
+- Using NSIS instead of [Squirrel.Windows](https://github.com/Squirrel/Squirrel.Windows) on Windows
+
+- Autoupdates: now using [electron-updater](https://www.npmjs.com/package/electron-updater)
+
+- Removed nuts dependency
+
+
+**Fixes**:
+
+- Windows installer error
+- Compile and build error in native node modules + spellchecker [Windows]
+- Missing icon on installing [Windows]
+
+<hr>
+
+
+### v0.5.4 --2017-01-09
+
+**Fixes**:
+- Fixed :
+	- Auto-updates
+	- Spellchecker
+	- Zooming functionality
+
+- Removed unused node modules
+- Using stable version for node modules
+- Added icon for AppImage
+
+<hr>
+
+
+### v0.5.3 --2016-12-24
+**Enhancements**:
+- 🎉 Added automatic update support on Windows
+
+**Fixes**:
+
+- Fixed  javascript error when electron has been left running and try to right-click
+
+- Fixed error - Unregister Spellchecker while window is closed
+
+- Fixed - Keyboard shortcuts not getting unregistered
+
+- Minor UI Changes
+
+
+<hr>
+
+### v0.5.2 --2016-12-13
+
+**Enhancements**:
+
+- ⚡️ Added automatic app updates for macOS
+- Added windows installer for 32 bit machine
+
+- Better tray icons
+
+**Fixes**:
+- Blurry Unity icon fixed
+
+
+
+<hr>
+
+### v0.5.1 --2016-11-23
+
+**Enhacements**:
+
+- Added Spellchecker support with correct spell suggestions
+
+- Added Code-Signing on MAC
+
+- Added Win/linux/Mac installers
+
+- Added Continuous Integration on travis and appveyor
+
+- Open internal links in app only and external in default browser
+
+- Better icons
+
+- Electron version updated to `v1.4.7`
+
+- Using two package.json structure
+
+- Node integration disabled in main window due to jquery error
+
+- Now using electron-builder for packaging instead of electron-packager
+
+- Removed electron-context-menu and simple-spellchecker dependency
+
+
+
+**Fixes**:
+
+- Better error handling when user enters wrong zulip server
+
+- Fixed close Zulip window JavaScript error
+
+- Fixed opening image in default browser
+
+- Fixed native notifications issue on linux
+
+
+<hr>
+
+### v0.0.1-alpha -- 2016-08-31
+
+**Enhacements**:
+
+* Added DMG installer for macOS

development.md

@@ -15,6 +15,7 @@ To build and run the app from source, you'll need the following:
 * [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
 
 ### Debian/Ubuntu and friends
@@ -25,7 +26,7 @@ manager (see [here][nodesource-install] for more on the first command):
 
 ```sh
 $ curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
-$ sudo apt install git nodejs python build-essential libxext-dev libxtst-dev libxkbfile-dev
+$ sudo apt install git nodejs python build-essential snapcraft libxext-dev libxtst-dev libxkbfile-dev libgconf-2-4
 ```
 
 [nodesource-install]: https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions
@@ -76,7 +77,7 @@ 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 and an
+* 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.

gulpfile.js

@@ -14,7 +14,7 @@ gulp.task('dev', () => {
   // 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/js/**/*.js', ['reload:renderer']);
 });
 
 gulp.task('restart:browser', done => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "1.8.1",
+  "version": "2.3.3",
   "main": "./app/main",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
@@ -17,17 +17,21 @@
   "bugs": {
     "url": "https://github.com/zulip/zulip-electron/issues"
   },
+  "engines": {
+    "node": ">=6.0.0"
+  },
   "scripts": {
-    "start": "electron app --disable-http-cache",
+    "start": "electron app --disable-http-cache --no-electron-connect",
-    "reinstall": "rm -rf node_modules; rm -rf app/node_modules; npm install",
+    "reinstall": "node ./tools/reinstall-node-modules.js",
     "postinstall": "electron-builder install-app-deps",
     "test": "xo",
     "test-e2e": "gulp test-e2e",
-    "dev": "gulp dev",
+    "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"
+    "travis": "cd ./scripts && ./travis-build-test.sh",
+    "build-locales": "node tools/locale-helper"
   },
   "pre-commit": [
     "test"
@@ -42,7 +46,8 @@
     ],
     "copyright": "©2017 Kandra Labs, Inc.",
     "mac": {
-      "category": "public.app-category.productivity"
+      "category": "public.app-category.productivity",
+      "artifactName": "${productName}-${version}-${arch}.${ext}"
     },
     "linux": {
       "category": "Chat;GNOME;GTK;Network;InstantMessaging",
@@ -51,32 +56,41 @@
       "target": [
         "deb",
         "zip",
-        "AppImage"
+        "AppImage",
+        "snap"
       ],
-      "maintainer": "Akash Nimare <svnitakash@gmail.com>"
+      "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": 128,
+      "iconSize": 100,
       "contents": [
         {
           "x": 380,
-          "y": 240,
+          "y": 280,
           "type": "link",
           "path": "/Applications"
         },
         {
-          "x": 122,
+          "x": 110,
-          "y": 240,
+          "y": 280,
           "type": "file"
         }
-      ]
+      ],
+      "window": {
+        "width": 500,
+        "height": 500
+      }
     },
     "win": {
       "target": [
@@ -109,15 +123,17 @@
     "assert": "1.4.1",
     "cp-file": "^5.0.0",
     "devtron": "1.4.0",
-    "electron-builder": "19.53.6",
+    "electron": "2.0.1",
-    "electron": "1.7.10",
+    "electron-builder": "20.20.4",
     "electron-connect": "0.6.2",
     "electron-debug": "1.4.0",
-    "gulp": "3.9.1",
+    "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.7.2",
+    "spectron": "3.8.0",
     "tap-colorize": "^1.2.0",
     "tape": "^4.8.0",
     "xo": "0.18.2"
@@ -136,7 +152,11 @@
         "rules": {
           "max-lines": [
             "warn",
-            500
+            {
+              "max": 500,
+              "skipBlankLines": true,
+              "skipComments": true
+            }
           ],
           "no-warning-comments": 0,
           "object-curly-spacing": 0,
@@ -153,7 +173,8 @@
       }
     ],
     "ignore": [
-      "tests/*.js"
+      "tests/*.js",
+      "tools/locale-helper/*.js"
     ],
     "envs": [
       "node",

scripts/debian-add-repo.sh

@@ -2,6 +2,10 @@
 
 # This script runs when user install the debian package
 
+# Link to the binary
+ln -sf '/opt/${productFilename}/${executable}' '/usr/local/bin/${executable}';
+echo 'Successfully added /opt/${productFilename}/${executable} to /usr/local/bin/${executable}'
+
 # Install apt repository source list if it does not exist
 if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep zulip.list; then
     sudo apt-key adv --keyserver pool.sks-keyservers.net --recv 69AD12704E71A4803DCA3A682424BE5AE9BD10D9

scripts/debian-uninstaller.sh

@@ -29,3 +29,7 @@ appDirectory=/home/$getSudoUser/.config/Zulip/;
 if [ -d $appDirectory ]; then
     sudo rm -rf $appDirectory;
 fi
+
+# Delete the link to the binary
+echo 'Removing binary link'
+sudo rm -f '/usr/local/bin/${executable}';

scripts/travis-build-test.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# exit script if fails
+set -e;
+
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     export {no_proxy,NO_PROXY}="127.0.0.1,localhost"
     export DISPLAY=:99.0
@@ -12,6 +15,6 @@ fi
 
 npm run test
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+# if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    npm run test-e2e
+#     npm run test-e2e
-fi
+# fi

snap/snapcraft.yaml

@@ -0,0 +1,37 @@
+name: zulip
+version: 2.0.0
+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
+grade: stable
+icon: snap/gui/icon.png
+apps:
+  zulip:
+    command: env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/zulip
+    plugs:
+      - desktop
+      - desktop-legacy
+      - home
+      - x11
+      - unity7
+      - browser-support
+      - network
+      - gsettings
+      - pulseaudio
+      - opengl
+parts:
+  app:
+    plugin: dump
+    stage-packages:
+      - libasound2
+      - libgconf2-4
+      - libnotify4
+      - libnspr4
+      - libnss3
+      - libpcre3
+      - libpulse0
+      - libxss1
+      - libxtst6
+    source: dist/linux-unpacked
+    after:
+      - desktop-gtk2

tests/index.js

@@ -7,7 +7,7 @@ test('app runs', function (t) {
   const app = setup.createApp()
   setup.waitForLoad(app, t)
     .then(() => app.client.windowByIndex(1)) // focus on webview
-    .then(() => app.client.waitForExist('//*[@id="new-server-container"]/div/div/div[2]/input'))
+    .then(() => app.client.waitForExist('//*[@id="connect"]')) // id of the connect button
     .then(() => setup.endTest(app, t),
           (err) => setup.endTest(app, t, err || 'error'))
 })

tests/test-new-organization.js

@@ -0,0 +1,17 @@
+const test = require('tape')
+const setup = require('./setup')
+
+// Create new org link should open in the default browser [WIP]
+
+test('new-org-link', function (t) {
+  t.timeoutAfter(50e3)
+  setup.resetTestDataDir()
+  const app = setup.createApp()
+  setup.waitForLoad(app, t)
+    .then(() => app.client.windowByIndex(1)) // focus on webview
+    .then(() => app.client.click('#open-create-org-link')) // Click on new org link button
+    .then(() => setup.wait(5000))
+    .then(() => setup.endTest(app, t),
+          (err) => setup.endTest(app, t, err || 'error'))
+})
+

tools/fetch-pull-request

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+set -x
+
+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
+request_id="$1"
+remote=${2:-"upstream"}
+git fetch "$remote" "pull/$request_id/head"
+git checkout -B "review-original-${request_id}"
+git reset --hard FETCH_HEAD

tools/fetch-pull-request.cmd

@@ -0,0 +1,23 @@
+@echo off
+git diff-index --quiet HEAD
+if %ERRORLEVEL% NEQ 0 (
+    echo "There are uncommitted changes:"
+    git status --short
+    echo "Doing nothing to avoid losing your work."
+    exit /B 1
+)
+
+if "%~1"=="" (
+    echo "Error you must specify the PR number"
+)
+
+if "%~2"=="" ( 
+    set remote="upstream"
+) else (
+    set remote=%2
+)
+
+set request_id="%1"
+git fetch "%remote%" "pull/%request_id%/head"
+git checkout -B "review-%request_id%"
+git reset --hard FETCH_HEAD

tools/fetch-rebase-pull-request

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+set -x
+
+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
+request_id="$1"
+remote=${2:-"upstream"}
+git fetch "$remote" "pull/$request_id/head"
+git checkout -B "review-${request_id}" $remote/master
+git reset --hard FETCH_HEAD
+git pull --rebase

tools/fetch-rebase-pull-request.cmd

@@ -0,0 +1,24 @@
+@echo off
+git diff-index --quiet HEAD
+if %errorlevel% neq 0 (
+    echo "There are uncommitted changes:"
+    git status --short
+    echo "Doing nothing to avoid losing your work."
+    exit \B 1
+)
+
+if "%~1"=="" (
+    echo "Error you must specify the PR number"
+)
+
+if "%~2"=="" ( 
+    set remote="upstream"
+) else (
+    set remote=%2
+)
+
+set request_id="%1"
+git fetch "%remote%" "pull/%request_id%/head"
+git checkout -B "review-%request_id%" %remote%/master
+git reset --hard FETCH_HEAD
+git pull --rebase

tools/locale-helper/index.js

@@ -0,0 +1,30 @@
+const translate = require('google-translate-api');
+const path = require('path');
+const fs = require('fs');
+
+const translationDir = path.resolve(__dirname, '../../app/translations');
+
+function writeJSON(file, data) {
+    const filePath = path.resolve(translationDir, file);
+    fs.writeFileSync(filePath, `${JSON.stringify(data, null, '\t')}\n`, 'utf8');
+}
+
+const { phrases } = require('./locale-template');
+const supportedLocales = require('./supported-locales');
+
+phrases.sort();
+for (let locale in supportedLocales) {
+    console.log(`fetching translation for: ${supportedLocales[locale]} - ${locale}..`);
+    translate(phrases.join('\n'), { to: locale })
+        .then(res => {
+            const localeFile = `${locale}.json`;
+            const translatedText = res.text.split('\n');
+            const translationJSON = {};
+            phrases.forEach((phrase, index) => {
+               translationJSON[phrase] = translatedText[index];
+            });
+
+            writeJSON(localeFile, translationJSON);
+            console.log(`create: ${localeFile}`);
+        });
+}

tools/locale-helper/locale-template.json

@@ -0,0 +1,41 @@
+{
+	"phrases": [
+		"About Zulip",
+		"Actual Size",
+		"Back",
+		"Close",
+		"Copy",
+		"Cut",
+		"Delete",
+		"Desktop App Settings",
+		"Edit",
+		"File",
+		"Forward",
+		"Hard Reload",
+		"Help",
+		"History",
+		"Keyboard Shortcuts",
+		"Log Out",
+		"Minimize",
+		"Paste",
+		"Paste and Match Style",
+		"Quit",
+		"Redo",
+		"Reload",
+		"Report an issue...",
+		"Reset App Settings",
+		"Select All",
+		"Show App Logs",
+		"Toggle DevTools for Active Tab",
+		"Toggle DevTools for Zulip App",
+		"Toggle Full Screen",
+		"Toggle Sidebar",
+		"Toggle Tray Icon",
+		"Undo",
+		"View",
+		"Window",
+		"Zoom In",
+		"Zoom Out",
+		"Zulip Help"
+	]
+}

tools/locale-helper/supported-locales.js

@@ -0,0 +1,21 @@
+module.exports = {
+    "de": "Deutsch",
+    "pl": "polski",
+    "en": "English",
+    "cs": "česky",
+    "hi": "Hindi",
+    "ru": "Русский",
+    "id": "Indonesia",
+    "bg": "български",
+    "hu": "Magyar",
+    "sr": "српски",
+    "ml": "Malayalam",
+    "ta": "தமிழ்",
+    "nl": "Nederlands",
+    "ja": "日本語",
+    "pt": "Português",
+    "tr": "Türkçe",
+    "es": "español",
+    "ko": "한국어",
+    "fr": "français"
+};

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/reinstall-node-modules

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+set -x
+
+echo "Removing node_modules and app/node_modules"
+rm -rf node_modules
+rm -rf app/node_modules
+
+echo "node_modules removed reinstalling npm packages"
+npm i

tools/reinstall-node-modules.cmd

@@ -0,0 +1,8 @@
+@echo off
+
+echo "Removing node_modules and app/node_modules"
+rmdir /s /q node_modules
+rmdir /s /q app/node_modules
+
+echo "node_modules removed reinstalling npm packages"
+npm i

tools/reinstall-node-modules.js

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+const {exec} = require('child_process');
+const path = require('path');
+
+const isWindows = process.platform === 'win32';
+const command = path.join(__dirname, `reinstall-node-modules${isWindows ? '.cmd' : ''}`);
+
+const proc = exec(command, error => {
+	if (error) {
+		console.error(error);
+	}
+});
+
+proc.stdout.on('data', data => console.log(data.toString()));
+proc.stderr.on('data', data => console.error(data.toString()));
+proc.on('exit', code => {
+	process.exit(code);
+});

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