New beta release v2.5.0.

settings: Shorcut section horizontal alignment fix.
pdf-viewer: disable pdf-viewer window.
2025-10-23 03:31:56 +00:00 · 2019-03-01 18:51:38 +05:30 · 2019-02-18 17:11:27 +05:30 · 2019-02-09 14:04:50 +05:30 · 2019-01-30 12:22:36 +05:30 · 2019-01-24 11:15:40 +05:30
37 changed files with 1906 additions and 1384 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,16 @@
-* text=auto
+* text=auto eol=lf
+
+package-lock.json binary
+app/package-lock.json binary
+*.gif binary
+*.jpg binary
+*.jpeg binary
+*.eot binary
+*.woff binary
+*.woff2 binary
+*.svg binary
+*.ttf binary
+*.png binary
+*.otf binary
+*.tif binary
+*.ogg binary
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,6 @@ yarn-error.log*
 config.gypi

 # Test generated files
-tests/package.json
+# tests/package.json

 .python-version
--- a/README.md
+++ b/README.md
@@ -2,31 +2,26 @@
 [![Build Status](https://travis-ci.org/zulip/zulip-electron.svg?branch=master)](https://travis-ci.org/zulip/zulip-electron)
 [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-electron?branch=master&svg=true)](https://ci.appveyor.com/project/akashnimare/zulip-electron/branch/master)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
+[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org)

-Desktop client for Zulip. Available for Mac, Linux and Windows.
+Desktop client for Zulip. Available for Mac, Linux, and Windows.

 <img src="http://i.imgur.com/ChzTq4F.png"/>

 # Download
-Please see [installation guide](https://zulipchat.com/help/desktop-app-install-guide).
+Please see the [installation guide](https://zulipchat.com/help/desktop-app-install-guide).

 # Features
-* Sign in to multiple teams
-* Desktop Notifications with inline reply support
-* Multilanguage SpellChecker
-* OSX/Win/Linux installers
-* Automatic Updates (macOS/Windows/Linux)
-* Keyboard shortcuts
-
-# Development
-Please see our [development guide](./development.md) to get started and run app locally.
+* Sign in to multiple organizations
+* Desktop notifications with inline reply
+* Tray/dock integration
+* Multi-language spell checker
+* Automatic updates

 # Contribute

-If you want to contribute please make sure to read [our documentation about contributing](./CONTRIBUTING.md) first.
-
-* [Issue Tracker](https://github.com/zulip/zulip-electron/issues)
-* [Source Code](https://github.com/zulip/zulip-electron/)
+First, join us on the [Zulip community server](https://zulip.readthedocs.io/en/latest/contributing/chat-zulip-org.html)! 
+Also see our [contribution guidelines](./CONTRIBUTING.md) and our [development guide](./development.md).

 # License
 Released under the [Apache-2.0](./LICENSE) license.
--- a/app/main/index.js
+++ b/app/main/index.js
@@ -1,5 +1,7 @@
 'use strict';
 const path = require('path');
+const fs = require('fs');
+
 const electron = require('electron');
 const windowStateKeeper = require('electron-window-state');
 const isDev = require('electron-is-dev');
@@ -30,18 +32,19 @@ let isQuitting = false;
 // Load this url in main window
 const mainURL = 'file://' + path.join(__dirname, '../renderer', 'main.html');

-const isAlreadyRunning = app.makeSingleInstance(() => {
-	if (mainWindow) {
-		if (mainWindow.isMinimized()) {
-			mainWindow.restore();
+const singleInstanceLock = app.requestSingleInstanceLock();
+if (singleInstanceLock) {
+	app.on('second-instance', () => {
+		if (mainWindow) {
+			if (mainWindow.isMinimized()) {
+				mainWindow.restore();
+			}
+
+			mainWindow.show();
 		}
-
-		mainWindow.show();
-	}
-});
-
-if (isAlreadyRunning) {
-	return app.quit();
+	});
+} else {
+	app.quit();
 }

 const APP_ICON = path.join(__dirname, '../resources', 'Icon');
@@ -83,14 +86,6 @@ function createMainWindow() {
 		win.webContents.send('focus');
 	});

-	win.once('ready-to-show', () => {
-		if (ConfigUtil.getConfigItem('startMinimized')) {
-			win.minimize();
-		} else {
-			win.show();
-		}
-	});
-
 	win.loadURL(mainURL);

 	// Keep the app running in background on close event
@@ -156,6 +151,13 @@ app.on('ready', () => {
 	});
 	mainWindow = createMainWindow();

+	// Auto-hide menu bar on Windows + Linux
+	if (process.platform !== 'darwin') {
+		const shouldHideMenu = ConfigUtil.getConfigItem('autoHideMenubar') || false;
+		mainWindow.setAutoHideMenuBar(shouldHideMenu);
+		mainWindow.setMenuBarVisibility(!shouldHideMenu);
+	}
+
 	// Initialize sentry for main process
 	sentryInit();

@@ -169,14 +171,14 @@ app.on('ready', () => {

 	page.on('dom-ready', () => {
 		if (ConfigUtil.getConfigItem('startMinimized')) {
-			mainWindow.minimize();
+			mainWindow.hide();
 		} else {
 			mainWindow.show();
 		}
 	});

 	page.once('did-frame-finish-load', () => {
-		// Initate auto-updates on MacOS and Windows
+		// Initiate auto-updates on MacOS and Windows
 		if (ConfigUtil.getConfigItem('autoUpdate')) {
 			appUpdater();
 		}
@@ -196,6 +198,32 @@ app.on('ready', () => {
 		app.quit();
 	});

+	// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+	// ipcMain.on('pdf-view', (event, url) => {
+	// 	// Paddings for pdfWindow so that it fits into the main browserWindow
+	// 	const paddingWidth = 55;
+	// 	const paddingHeight = 22;
+
+	// 	// Get the config of main browserWindow
+	// 	const mainWindowState = global.mainWindowState;
+
+	// 	// Window to view the pdf file
+	// 	const pdfWindow = new electron.BrowserWindow({
+	// 		x: mainWindowState.x + paddingWidth,
+	// 		y: mainWindowState.y + paddingHeight,
+	// 		width: mainWindowState.width - paddingWidth,
+	// 		height: mainWindowState.height - paddingHeight,
+	// 		webPreferences: {
+	// 			plugins: true,
+	// 			partition: 'persist:webviewsession'
+	// 		}
+	// 	});
+	// 	pdfWindow.loadURL(url);
+
+	// 	// We don't want to have the menu bar in pdf window
+	// 	pdfWindow.setMenu(null);
+	// });
+
 	// Reload full app not just webview, useful in debugging
 	ipcMain.on('reload-full-app', () => {
 		mainWindow.reload();
@@ -209,10 +237,10 @@ app.on('ready', () => {
 	});

 	ipcMain.on('toggle-app', () => {
-		if (mainWindow.isVisible()) {
-			mainWindow.hide();
-		} else {
+		if (!mainWindow.isVisible() || mainWindow.isMinimized()) {
 			mainWindow.show();
+		} else {
+			mainWindow.hide();
 		}
 	});

@@ -220,6 +248,11 @@ app.on('ready', () => {
 		BadgeSettings.updateBadge(badgeCount, mainWindow);
 	});

+	ipcMain.on('toggle-menubar', (event, showMenubar) => {
+		mainWindow.setAutoHideMenuBar(showMenubar);
+		mainWindow.setMenuBarVisibility(!showMenubar);
+	});
+
 	ipcMain.on('update-badge', (event, messageCount) => {
 		badgeCount = messageCount;
 		BadgeSettings.updateBadge(badgeCount, mainWindow);
@@ -236,6 +269,10 @@ app.on('ready', () => {

 	ipcMain.on('update-menu', (event, props) => {
 		appMenu.setMenu(props);
+		const activeTab = props.tabs[props.activeTabIndex];
+		if (activeTab) {
+			mainWindow.setTitle(`Zulip - ${activeTab.webview.props.name}`);
+		}
 	});

 	ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
@@ -246,10 +283,29 @@ app.on('ready', () => {
 		page.downloadURL(url);
 		page.session.once('will-download', (event, item) => {
 			const filePath = path.join(downloadPath, item.getFilename());
-			item.setSavePath(filePath);
+
+			const getTimeStamp = () => {
+				const date = new Date();
+				return date.getTime();
+			};
+
+			const formatFile = filePath => {
+				const fileExtension = path.extname(filePath);
+				const baseName = path.basename(filePath, fileExtension);
+				return `${baseName}-${getTimeStamp()}${fileExtension}`;
+			};
+
+			// Update the name and path of the file if it already exists
+
+			const updatedFilePath = path.join(downloadPath, formatFile(filePath));
+
+			const setFilePath = fs.existsSync(filePath) ? updatedFilePath : filePath;
+
+			item.setSavePath(setFilePath);
+
 			item.on('updated', (event, state) => {
 				switch (state) {
-					case 'interrupted' : {
+					case 'interrupted': {
 						// Can interrupted to due to network error, cancel download then
 						console.log('Download interrupted, cancelling and fallback to dialog download.');
 						item.cancel();
@@ -259,7 +315,7 @@ app.on('ready', () => {
 						if (item.isPaused()) {
 							item.cancel();
 						}
-						// This event can also be used to show progres in percentage in future.
+						// This event can also be used to show progress in percentage in future.
 						break;
 					}
 					default: {
@@ -268,8 +324,9 @@ app.on('ready', () => {
 				}
 			});
 			item.once('done', (event, state) => {
+				const getFileName = fs.existsSync(filePath) ? formatFile(filePath) : item.getFilename();
 				if (state === 'completed') {
-					page.send('downloadFileCompleted', item.getSavePath(), item.getFilename());
+					page.send('downloadFileCompleted', item.getSavePath(), getFileName);
 				} else {
 					console.log('Download failed state: ', state);
 					page.send('downloadFileFailed');
@@ -280,6 +337,10 @@ app.on('ready', () => {
 		});
 	});

+	ipcMain.on('realm-name-changed', (event, serverURL, realmName) => {
+		page.send('update-realm-name', serverURL, realmName);
+	});
+
 	ipcMain.on('realm-icon-changed', (event, serverURL, iconURL) => {
 		page.send('update-realm-icon', serverURL, iconURL);
 	});
--- a/app/main/linuxupdater.js
+++ b/app/main/linuxupdater.js
@@ -4,6 +4,7 @@ const { Notification } = require('electron');
 const request = require('request');
 const semver = require('semver');
 const ConfigUtil = require('../renderer/js/utils/config-util');
+const ProxyUtil = require('../renderer/js/utils/proxy-util');
 const LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
 const Logger = require('../renderer/js/utils/logger-util');

@@ -15,10 +16,13 @@ const logger = new Logger({
 function linuxUpdateNotification() {
 	let	url = 'https://api.github.com/repos/zulip/zulip-electron/releases';
 	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
+	const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');

 	const options = {
 		url,
-		headers: {'User-Agent': 'request'}
+		headers: {'User-Agent': 'request'},
+		proxy: proxyEnabled ? ProxyUtil.getProxy(url) : '',
+		ecdhCurve: 'auto'
 	};

 	request(options, (error, response, body) => {
--- a/app/main/menu.js
+++ b/app/main/menu.js
@@ -39,6 +39,65 @@ class AppMenu {
 		}];
 	}

+	getToolsSubmenu() {
+		return [{
+			label: `Check for Updates`,
+			click() {
+				AppMenu.checkForUpdate();
+			}
+		},
+		{
+			label: `Release Notes`,
+			click() {
+				shell.openExternal(`https://github.com/zulip/zulip-electron/releases/tag/v${app.getVersion()}`);
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: 'Factory Reset',
+			accelerator: process.platform === 'darwin' ? 'Command+Shift+D' : 'Ctrl+Shift+D',
+			click() {
+				AppMenu.resetAppSettings();
+			}
+		}, {
+			label: 'Download App Logs',
+			click() {
+				const zip = new AdmZip();
+				let date = new Date();
+				date = date.toLocaleDateString().replace(/\//g, '-');
+
+				// Create a zip file of all the logs and config data
+				zip.addLocalFolder(`${app.getPath('appData')}/${appName}/Logs`);
+				zip.addLocalFolder(`${app.getPath('appData')}/${appName}/config`);
+
+				// Put the log file in downloads folder
+				const logFilePath = `${app.getPath('downloads')}/Zulip-logs-${date}.zip`;
+				zip.writeZip(logFilePath);
+
+				// Open and select the log file
+				shell.showItemInFolder(logFilePath);
+			}
+		}, {
+			type: 'separator'
+		}, {
+			label: 'Toggle DevTools for Zulip App',
+			accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					focusedWindow.webContents.toggleDevTools();
+				}
+			}
+		}, {
+			label: 'Toggle DevTools for Active Tab',
+			accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
+			click(item, focusedWindow) {
+				if (focusedWindow) {
+					AppMenu.sendAction('tab-devtools');
+				}
+			}
+		}];
+	}
+
 	getViewSubmenu() {
 		return [{
 			label: 'Reload',
@@ -103,62 +162,30 @@ class AppMenu {
 					ConfigUtil.setConfigItem('showSidebar', newValue);
 				}
 			}
-		}, {
-			label: 'Toggle DevTools for Zulip App',
-			accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					focusedWindow.webContents.toggleDevTools();
-				}
-			}
-		}, {
-			label: 'Toggle DevTools for Active Tab',
-			accelerator: process.platform === 'darwin' ? 'Alt+Command+U' : 'Ctrl+Shift+U',
-			click(item, focusedWindow) {
-				if (focusedWindow) {
-					AppMenu.sendAction('tab-devtools');
-				}
-			}
 		}];
 	}

 	getHelpSubmenu() {
 		return [
 			{
-				label: `${appName + ' Desktop-'} v${app.getVersion()}`,
+				label: `${appName + ' Desktop'} v${app.getVersion()}`,
 				enabled: false
 			},
 			{
-				label: `What's New...`,
-				click() {
-					shell.openExternal(`https://github.com/zulip/zulip-electron/releases/tag/v${app.getVersion()}`);
+				label: 'About Zulip',
+				click(item, focusedWindow) {
+					if (focusedWindow) {
+						AppMenu.sendAction('open-about');
+					}
 				}
 			},
 			{
-				label: `${appName} Help`,
+				label: `Help Center`,
 				click() {
 					shell.openExternal('https://zulipchat.com/help/');
 				}
 			}, {
-				label: 'Show App Logs',
-				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...',
+				label: 'Report an Issue',
 				click() {
 					// the goal is to notify the main.html BrowserWindow
 					// which may not be the focused window.
@@ -205,26 +232,12 @@ class AppMenu {
 	}

 	getDarwinTpl(props) {
-		const { tabs, activeTabIndex } = props;
+		const { tabs, activeTabIndex, enableMenu } = props;

 		return [{
 			label: `${app.getName()}`,
 			submenu: [{
-				label: 'About Zulip',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('open-about');
-					}
-				}
-			}, {
-				label: `Check for Update`,
-				click() {
-					AppMenu.checkForUpdate();
-				}
-			}, {
-				type: 'separator'
-			}, {
-				label: 'Desktop App Settings',
+				label: 'Desktop Settings',
 				accelerator: 'Cmd+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -234,6 +247,7 @@ class AppMenu {
 			}, {
 				label: 'Keyboard Shortcuts',
 				accelerator: 'Cmd+Shift+K',
+				enabled: enableMenu,
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -248,15 +262,10 @@ class AppMenu {
 					const dndUtil = DNDUtil.toggle();
 					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
 				}
-			}, {
-				label: 'Reset App Settings',
-				accelerator: 'Command+Shift+D',
-				click() {
-					AppMenu.resetAppSettings();
-				}
 			}, {
 				label: 'Log Out',
 				accelerator: 'Cmd+L',
+				enabled: enableMenu,
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('log-out');
@@ -296,8 +305,6 @@ class AppMenu {
 				role: 'paste'
 			}, {
 				role: 'pasteandmatchstyle'
-			}, {
-				role: 'delete'
 			}, {
 				role: 'selectall'
 			}]
@@ -310,6 +317,9 @@ class AppMenu {
 		}, {
 			label: 'Window',
 			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
+		}, {
+			label: 'Tools',
+			submenu: this.getToolsSubmenu()
 		}, {
 			role: 'help',
 			submenu: this.getHelpSubmenu()
@@ -317,26 +327,12 @@ class AppMenu {
 	}

 	getOtherTpl(props) {
-		const { tabs, activeTabIndex } = props;
+		const { tabs, activeTabIndex, enableMenu } = props;

 		return [{
-			label: 'File',
+			label: '&File',
 			submenu: [{
-				label: 'About Zulip',
-				click(item, focusedWindow) {
-					if (focusedWindow) {
-						AppMenu.sendAction('open-about');
-					}
-				}
-			}, {
-				label: `Check for Update`,
-				click() {
-					AppMenu.checkForUpdate();
-				}
-			}, {
-				type: 'separator'
-			}, {
-				label: 'Desktop App Settings',
+				label: 'Desktop Settings',
 				accelerator: 'Ctrl+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -348,6 +344,7 @@ class AppMenu {
 			}, {
 				label: 'Keyboard Shortcuts',
 				accelerator: 'Ctrl+Shift+K',
+				enabled: enableMenu,
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -362,15 +359,10 @@ class AppMenu {
 					const dndUtil = DNDUtil.toggle();
 					AppMenu.sendAction('toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
 				}
-			}, {
-				label: 'Reset App Settings',
-				accelerator: 'Ctrl+Shift+D',
-				click() {
-					AppMenu.resetAppSettings();
-				}
 			}, {
 				label: 'Log Out',
 				accelerator: 'Ctrl+L',
+				enabled: enableMenu,
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('log-out');
@@ -383,7 +375,7 @@ class AppMenu {
 				accelerator: 'Ctrl+Q'
 			}]
 		}, {
-			label: 'Edit',
+			label: '&Edit',
 			submenu: [{
 				role: 'undo'
 			}, {
@@ -398,23 +390,25 @@ class AppMenu {
 				role: 'paste'
 			}, {
 				role: 'pasteandmatchstyle'
-			}, {
-				role: 'delete'
 			}, {
 				type: 'separator'
 			}, {
 				role: 'selectall'
 			}]
 		}, {
-			label: 'View',
+			label: '&View',
 			submenu: this.getViewSubmenu()
 		}, {
-			label: 'History',
+			label: '&History',
 			submenu: this.getHistorySubmenu()
 		}, {
-			label: 'Window',
+			label: '&Window',
 			submenu: this.getWindowSubmenu(tabs, activeTabIndex)
 		}, {
+			label: '&Tools',
+			submenu: this.getToolsSubmenu()
+		}, {
+			label: '&Help',
 			role: 'help',
 			submenu: this.getHelpSubmenu()
 		}];
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,13 +1,13 @@
 {
  "name": "zulip",
-  "version": "2.3.5",
+  "version": "2.5.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
    "@electron-elements/send-feedback": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@electron-elements/send-feedback/-/send-feedback-1.0.7.tgz",
-      "integrity": "sha1-HmTsFMvNkmZAngeu1BDoUi45deA=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@electron-elements/send-feedback/-/send-feedback-1.0.8.tgz",
+      "integrity": "sha512-spIZIYSe0Bp028sbZ7bcGOaUYhMyFArk+Tv7kQ4XCRNuVWRkw3SfbR8zIljZAdUavJp0wX6prSWrqLL4Dpd3Fw==",
      "requires": {
        "@electron-elements/utils": "1.0.3"
      }
@@ -37,62 +37,105 @@
      }
    },
    "@sentry/browser": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-0.5.4.tgz",
-      "integrity": "sha1-Yh/5chgrc7YoVlhLkvxl/elpBMw=",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-4.3.4.tgz",
+      "integrity": "sha512-odRXxnhcSYzyR4YvTolNEyrz3fdDVw308l+9RBRJA9yOFVlezaz1mXH6Gv00F7cIj9yE/JtezDyhP339WsWy3w==",
      "requires": {
-        "@sentry/core": "0.5.4",
-        "@sentry/shim": "0.5.4"
+        "@sentry/core": "4.3.4",
+        "@sentry/types": "4.3.4",
+        "@sentry/utils": "4.3.4",
+        "tslib": "^1.9.3"
      }
    },
    "@sentry/core": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-0.5.4.tgz",
-      "integrity": "sha1-mwqEK0QhMbOAG65wviyk6cUQV04=",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-4.3.4.tgz",
+      "integrity": "sha512-KwolQmAnXiFMeXBuxPUM8fW+2bOICdHfpjdf83qD7WSeuKqGvXhxXyApWNSLE+l2DPO6/8UKnIGmR8bEn0G7QA==",
      "requires": {
-        "@sentry/shim": "0.5.4"
+        "@sentry/hub": "4.3.4",
+        "@sentry/minimal": "4.3.4",
+        "@sentry/types": "4.3.4",
+        "@sentry/utils": "4.3.4",
+        "tslib": "^1.9.3"
      }
    },
    "@sentry/electron": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-0.5.5.tgz",
-      "integrity": "sha1-kInWNC22xr1sCSpTdHcIAx1ft8M=",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-0.14.0.tgz",
+      "integrity": "sha512-f0Aj2gKcX9LampOEFER0m6cC4etT1B3bsuY7E1R3vzZXcL7y5TaH2Omgk5atzAX5ycBk8LHxhVqUtE6fZBWlFA==",
      "requires": {
-        "@sentry/browser": "0.5.4",
-        "@sentry/core": "0.5.4",
-        "@sentry/node": "0.5.4",
-        "@sentry/shim": "0.5.4",
-        "@sentry/utils": "0.5.4",
-        "electron-fetch": "^1.1.0",
-        "form-data": "^2.3.2",
-        "util.promisify": "^1.0.0"
+        "@sentry/browser": "~4.3.4",
+        "@sentry/core": "~4.3.4",
+        "@sentry/minimal": "~4.3.4",
+        "@sentry/node": "~4.3.4",
+        "@sentry/types": "~4.3.4",
+        "@sentry/utils": "~4.3.4",
+        "electron-fetch": "1.1.0",
+        "form-data": "2.3.2",
+        "util.promisify": "1.0.0"
+      }
+    },
+    "@sentry/hub": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-4.3.4.tgz",
+      "integrity": "sha512-vaBGCnhinLB8N4aQLMiPPhnlTkIUwU/dxWzw/xsuKY3MYWrmfMUyWgMZF60Mz3B4F0lW1lsg5jnJz9xPnjZowg==",
+      "requires": {
+        "@sentry/types": "4.3.4",
+        "@sentry/utils": "4.3.4",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/minimal": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-4.3.4.tgz",
+      "integrity": "sha512-EBmQgdAQgxkhWFsBO4TmsP3cg5yTzg48HmPe3Dyt7PtF5Umw3DFW6qboAqnN1+KF+pHNuxkqevvgBTFp7b4Saw==",
+      "requires": {
+        "@sentry/hub": "4.3.4",
+        "@sentry/types": "4.3.4",
+        "tslib": "^1.9.3"
      }
    },
    "@sentry/node": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-0.5.4.tgz",
-      "integrity": "sha1-s+c0nRs2EjmVkDbqrhnOvzVkw9M=",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-4.3.4.tgz",
+      "integrity": "sha512-4ro8eFnIuuYrF/TLw788xU10AYJl9HvOYC5G3jLrHXTjRNLp7jJo9lZrUexjCvwM2WF/srF3+Z0Pwr+HwdKVVw==",
      "requires": {
-        "@sentry/core": "0.5.4",
-        "@sentry/shim": "0.5.4",
-        "raven": "^2.6.0"
+        "@sentry/core": "4.3.4",
+        "@sentry/hub": "4.3.4",
+        "@sentry/types": "4.3.4",
+        "@sentry/utils": "4.3.4",
+        "@types/stack-trace": "0.0.29",
+        "cookie": "0.3.1",
+        "lsmod": "1.0.0",
+        "md5": "2.2.1",
+        "stack-trace": "0.0.10",
+        "tslib": "^1.9.3"
      }
    },
-    "@sentry/shim": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@sentry/shim/-/shim-0.5.4.tgz",
-      "integrity": "sha1-y4JrGjR2WuXhsh5h3y3vL42pHcE="
+    "@sentry/types": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-4.3.4.tgz",
+      "integrity": "sha512-qsqrcyNilpbzYjqef+km0Grh5BckSFD4MUdJDNkUE5XU/ImniYddj18bMDlQxluJlTPDjUFQ37FXtEmxLeOwkQ=="
    },
    "@sentry/utils": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-0.5.4.tgz",
-      "integrity": "sha1-jt54rOlgIW3WMv1WHIP1AGLlruE="
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-4.3.4.tgz",
+      "integrity": "sha512-CMGMdIv5RHUCKRF4aWPZ/gFRTfBQpLVVJEGCeFGZLXHBdpgQac0lf3jlu8sND0KZ0S3C5x3tGS/eEqmOZRQ/pw==",
+      "requires": {
+        "@sentry/types": "4.3.4",
+        "tslib": "^1.9.3"
+      }
    },
    "@sindresorhus/is": {
      "version": "0.7.0",
      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
    },
+    "@types/stack-trace": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz",
+      "integrity": "sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g=="
+    },
    "adm-zip": {
      "version": "0.4.11",
      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
@@ -126,7 +169,7 @@
    "argparse": {
      "version": "1.0.10",
      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
      "requires": {
        "sprintf-js": "~1.0.2"
      }
@@ -194,16 +237,16 @@
      "optional": true
    },
    "bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk="
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
    },
    "bluebird-lst": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.5.tgz",
-      "integrity": "sha1-vryDAmt+kqcocaPcWZ4hnL+wAqk=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.6.tgz",
+      "integrity": "sha512-CBWFoPuUPpcvMUxfyr8DKdI5d4kjxFl1h39+VbKxP3KJWJHEsLtuT4pPLkjpxCGU6Ask21tvbnftWXdqIxYldQ==",
      "requires": {
-        "bluebird": "^3.5.1"
+        "bluebird": "^3.5.2"
      }
    },
    "boom": {
@@ -224,28 +267,33 @@
      }
    },
    "buffer-from": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
-      "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
    },
    "builder-util-runtime": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.0.tgz",
-      "integrity": "sha512-tkTF1o7XAX79ZkMo8822ZdQMpEBGSgfJ9kEYgyTAja90BPu7HO8C02pb8iSlFXfmK0Q0UA6D8MmnSNNPi0JLeg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.0.tgz",
+      "integrity": "sha512-s1mlJ28mv+56Iebh6c9aXjVe11O3Z0cDTwAGeB0PCcUzHA37fDxGgS8ZGoYNMZP+rBHj21d/od1wuYofTVLaQg==",
      "requires": {
-        "bluebird-lst": "^1.0.5",
-        "debug": "^3.1.0",
-        "fs-extra-p": "^4.6.1",
+        "bluebird-lst": "^1.0.6",
+        "debug": "^4.1.0",
+        "fs-extra-p": "^7.0.0",
        "sax": "^1.2.4"
      },
      "dependencies": {
        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
          "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
        }
      }
    },
@@ -386,18 +434,12 @@
        "mimic-response": "^1.0.0"
      }
    },
-    "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
-    },
    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
      "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
+        "object-keys": "^1.0.12"
      }
    },
    "delayed-stream": {
@@ -487,46 +529,35 @@
      }
    },
    "electron-updater": {
-      "version": "2.23.3",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.23.3.tgz",
-      "integrity": "sha512-ZoQZpiEbhT3xA5Oxn7a5o4Z9adRaYs901pnTKBVBxPWmc0Qw5sZXAHkRjftlRmEn3RiEVkJtBPQSfx8kIkRcUA==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.0.6.tgz",
+      "integrity": "sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg==",
      "requires": {
-        "bluebird-lst": "^1.0.5",
-        "builder-util-runtime": "~4.4.0",
-        "electron-is-dev": "^0.3.0",
-        "fs-extra-p": "^4.6.1",
+        "bluebird-lst": "^1.0.6",
+        "builder-util-runtime": "~8.1.0",
+        "fs-extra-p": "^7.0.0",
        "js-yaml": "^3.12.0",
        "lazy-val": "^1.0.3",
        "lodash.isequal": "^4.5.0",
-        "semver": "^5.5.0",
-        "source-map-support": "^0.5.6"
+        "pako": "^1.0.7",
+        "semver": "^5.6.0",
+        "source-map-support": "^0.5.9"
      },
      "dependencies": {
        "semver": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
        }
      }
    },
    "electron-window-state": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-4.1.1.tgz",
-      "integrity": "sha1-azT9wxs4UU3+yLfI97XUrdtnYy0=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-5.0.3.tgz",
+      "integrity": "sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg==",
      "requires": {
-        "deep-equal": "^1.0.1",
-        "jsonfile": "^2.2.3",
+        "jsonfile": "^4.0.0",
        "mkdirp": "^0.5.1"
-      },
-      "dependencies": {
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        }
      }
    },
    "encoding": {
@@ -550,13 +581,13 @@
      }
    },
    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
      "requires": {
-        "is-callable": "^1.1.1",
+        "is-callable": "^1.1.4",
        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
+        "is-symbol": "^1.0.2"
      }
    },
    "escape-html": {
@@ -565,9 +596,9 @@
      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
    },
    "esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
    },
    "event-kit": {
      "version": "2.4.0",
@@ -600,11 +631,6 @@
      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
    },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
-    },
    "forever-agent": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -630,9 +656,9 @@
      }
    },
    "fs-extra": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
      "requires": {
        "graceful-fs": "^4.1.2",
        "jsonfile": "^4.0.0",
@@ -640,12 +666,12 @@
      }
    },
    "fs-extra-p": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz",
-      "integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.0.tgz",
+      "integrity": "sha512-5tg5jBOd0xIXjwj4PDnafOXL5TyPVzjxLby4DPKev53wurEXp7IsojBaD4Lj5M5w7jxw0pbkEU0fFEPmcKoMnA==",
      "requires": {
-        "bluebird-lst": "^1.0.5",
-        "fs-extra": "^6.0.1"
+        "bluebird-lst": "^1.0.6",
+        "fs-extra": "^7.0.0"
      }
    },
    "fs.realpath": {
@@ -733,6 +759,11 @@
      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+    },
    "has-to-string-tag-x": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
@@ -778,9 +809,9 @@
      }
    },
    "iconv-lite": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "requires": {
        "safer-buffer": ">= 2.1.2 < 3"
      }
@@ -891,9 +922,12 @@
      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
    },
    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
    },
    "is-typedarray": {
      "version": "1.0.0",
@@ -993,7 +1027,7 @@
    "lazy-val": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.3.tgz",
-      "integrity": "sha1-u5eyAO8AgB2UwxfincbtOeMcXtw="
+      "integrity": "sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg=="
    },
    "lodash.assign": {
      "version": "4.2.0",
@@ -1024,6 +1058,11 @@
        "yallist": "^2.1.2"
      }
    },
+    "lsmod": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz",
+      "integrity": "sha1-mgD3bco26yP6BTUK/htYXUKZ5ks="
+    },
    "md5": {
      "version": "2.2.1",
      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
@@ -1084,30 +1123,24 @@
      "integrity": "sha1-ltDNYQ69WNS03pzAxoKM2pnHVI8="
    },
    "node-json-db": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/node-json-db/-/node-json-db-0.7.3.tgz",
-      "integrity": "sha1-v2Mf9NTPQhHL3/5srmqq/m7lTN8=",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/node-json-db/-/node-json-db-0.9.1.tgz",
+      "integrity": "sha512-4BydUI7a10W8QBdHq/J3UBswU1i8WhCgTS4BZU0MjlUKrSU7cuUti71eojistgqe5hIrb4adj/wvAT5dw63NPg==",
      "requires": {
        "mkdirp": "0.5.x"
      }
    },
    "node-mac-notifier": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/node-mac-notifier/-/node-mac-notifier-0.1.0.tgz",
-      "integrity": "sha512-K07p0jW6BhE4Jxpem4pcOdOCDgF/vy3xIqZoZpqme5JAfeW0cEkQ5Z3AmsM7fhJB59kDeOiouyykwPnvLV+hAg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/node-mac-notifier/-/node-mac-notifier-1.1.0.tgz",
+      "integrity": "sha512-Fwv09eKMGkM4xn+Eby5g7lvmYF+1KYWX4V5QNn27l4cVFVS7MNYOxhbvGGHT5VuTWbWDQIi/Lr7l6so5vvmqVw==",
      "optional": true,
      "requires": {
        "bindings": "^1.2.1",
        "event-target-shim": "^1.1.1",
-        "node-uuid": "^1.4.7"
+        "uuid": "^3.3.2"
      }
    },
-    "node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
-      "optional": true
-    },
    "normalize-url": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
@@ -1196,6 +1229,11 @@
        "p-finally": "^1.0.0"
      }
    },
+    "pako": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz",
+      "integrity": "sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ=="
+    },
    "path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -1309,18 +1347,6 @@
        "strict-uri-encode": "^1.0.0"
      }
    },
-    "raven": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/raven/-/raven-2.6.3.tgz",
-      "integrity": "sha512-bKre7qlDW+y1+G2bUtCuntdDYc8o5v1T233t0vmJfbj8ttGOgLrGRlYB8saelVMW9KUAJNLrhFkAKOwFWFJonw==",
-      "requires": {
-        "cookie": "0.3.1",
-        "md5": "^2.2.1",
-        "stack-trace": "0.0.10",
-        "timed-out": "4.0.1",
-        "uuid": "3.0.0"
-      }
-    },
    "readable-stream": {
      "version": "2.3.6",
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
@@ -1431,7 +1457,7 @@
    "sax": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
    },
    "semver": {
      "version": "5.4.1",
@@ -1457,12 +1483,12 @@
    "source-map": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
    },
    "source-map-support": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
-      "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
+      "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -1539,6 +1565,11 @@
        "punycode": "^1.4.1"
      }
    },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+    },
    "tunnel-agent": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -1601,9 +1632,10 @@
      }
    },
    "uuid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz",
-      "integrity": "sha1-Zyj8BFnEUNeWqZwxg3VpvfZy1yg="
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "optional": true
    },
    "verror": {
      "version": "1.10.0",
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "2.3.5",
+  "version": "2.5.0-beta",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
  "copyright": "Kandra Labs, Inc.",
@@ -26,23 +26,23 @@
    "InstantMessaging"
  ],
  "dependencies": {
-    "@electron-elements/send-feedback": "1.0.7",
-    "@sentry/electron": "0.5.5",
+    "@electron-elements/send-feedback": "1.0.8",
+    "@sentry/electron": "0.14.0",
    "adm-zip": "0.4.11",
    "auto-launch": "5.0.5",
    "electron-is-dev": "0.3.0",
    "electron-log": "2.2.14",
    "electron-spellchecker": "1.1.2",
-    "electron-updater": "2.23.3",
-    "electron-window-state": "4.1.1",
+    "electron-updater": "4.0.6",
+    "electron-window-state": "5.0.3",
    "escape-html": "1.0.3",
    "is-online": "7.0.0",
-    "node-json-db": "0.7.3",
+    "node-json-db": "0.9.1",
    "request": "2.85.0",
    "semver": "5.4.1",
    "wurl": "2.5.0"
  },
  "optionalDependencies": {
-    "node-mac-notifier": "0.1.0"
+    "node-mac-notifier": "1.1.0"
  }
 }
--- a/app/renderer/about.html
+++ b/app/renderer/about.html
@@ -19,7 +19,6 @@
 				Available under the
 				<a onclick="linkInBrowser('license')">Apache 2.0 License</a>
 			</p>
-			<a class="bug" onclick="linkInBrowser('bug')" href="#">Found bug?</a>
 		</div>
 	</div>
 	<script>
@@ -38,9 +37,6 @@
 				case 'license':
 					url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
 					break;
-				default:
-					url = 'https://github.com/zulip/zulip-electron/issues/new?body=' +
-						'%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
 			}
 			shell.openExternal(url);
 		}
--- a/app/renderer/css/about.css
+++ b/app/renderer/css/about.css
@@ -57,22 +57,6 @@ body {
 	width: 100%;
 }

-.maintenance-info .bug {
-	display: inline-block;
-	padding: 8px 15px;
-	margin-top: 30px;
-	text-decoration: none;
-	background-color: #52c2af;
-	color: #fff;
-	border-radius: 4px;
-
-	transition: background-color 0.2s ease;
-}
-
-.maintenance-info .bug:hover {
-	background-color: #32a692;
-}
-
 p.detail a {
 	color: #355f4c;
 }
--- a/app/renderer/css/main.css
+++ b/app/renderer/css/main.css
@@ -151,7 +151,7 @@ body {
 }

 .tab:first-child {
-    margin-top: 8px;
+    margin-top: 9px;
 }

 .tab {
@@ -165,25 +165,33 @@ body {
 }

 .tab .server-icons {
-    border-radius: 50%;
-    width: 30px;
-    padding: 3px;
-    height: 30px;
+    width: 35px;
    vertical-align: top;
+    border-radius: 4px;
 }

 .tab .server-tab {
    width: 100%;
    height: 35px;
    position: relative;
-    margin: 5px 0 2px 0;
+    margin-top: 5px;
    z-index: 11;
    line-height: 31px;
    color: #eee;
    text-align: center;
    overflow: hidden;
    opacity: 0.6;
-    padding: 2px 0;
+    padding: 6px 0;
+}
+
+.server-tab .alt-icon {
+    font-family: Verdana;
+    font-weight: 600;
+    font-size: 22px;
+    border: 2px solid #222c31;
+    margin-left: 17%;
+    width: 35px;
+    border-radius: 4px;
 }

 .tab .server-tab:hover {
@@ -358,7 +366,7 @@ webview.focus {
    left: 56px;
    padding: 10px 20px;
    position: fixed;
-    margin-top: 8px;
+    margin-top: 11px;
    z-index: 5000 !important;
    color: #fff;
    border-radius: 4px;
--- a/app/renderer/css/preference.css
+++ b/app/renderer/css/preference.css
@@ -7,14 +7,16 @@ body {
    font-family: menu, "Helvetica Neue", sans-serif;
    -webkit-font-smoothing: antialiased;
    font-size: 14px;
-    color: #333;
    background: #efefef;
+    letter-spacing: -.08px;
+    line-height: 18px;
+    color: #8b8e8f;
 }

 kbd {
    display: inline-block;
    border: 1px solid #ccc;
-    border-radius: 3px;
+    border-radius: 4px;
    font-size: 15px;
    font-family: Courier New, Courier, monospace;
    font-weight: bold;
@@ -109,7 +111,7 @@ td:nth-child(odd) {
 }

 .nav {
-    padding: 5px 0;
+    padding: 7px 0;
    color: #999;
    cursor: pointer;
 }
@@ -129,7 +131,6 @@ td:nth-child(odd) {
    content: '';
 }

-
 /* We don't want to show this in nav item since we have the + button for adding an Organization */

 #nav-AddServer {
@@ -187,7 +188,7 @@ td:nth-child(odd) {
 img.server-info-icon {
    width: 36px;
    height: 36px;
-    padding: 4px;
+    padding: 4px 4px 4px 10px;
    cursor: pointer;
    vertical-align: middle;
 }
@@ -246,7 +247,7 @@ img.server-info-icon {
 .setting-input-value {
    flex-grow: 1;
    font-size: 14px;
-    border-radius: 3px;
+    border-radius: 4px;
    padding: 13px;
    border: #ededed 2px solid;
    outline-width: 0;
@@ -286,6 +287,7 @@ img.server-info-icon {

 .settings-pane {
    flex-grow: 1;
+	min-width: 550px;
 }

 .action:hover {
@@ -306,7 +308,7 @@ img.server-info-icon {
    padding: 12px 30px;
    margin: 10px 0 20px 0;
    background: #fff;
-    width: 70%;
+    width: 80%;
    transition: all 0.2s;
 }

@@ -323,20 +325,42 @@ img.server-info-icon {
    color: #ef5350;
    padding: 8px;
    border: rgba(239, 83, 80, 0.5) solid 1px;
+    border-radius: 4px;
+    border-color: #fff;
 }

 .red:hover {
-    color: #e63431;
-    border: rgba(239, 83, 80, 0.7) solid 1px;
-    ;
+    background-color: rgba(230, 52, 49, 0.5);
+    color: #fff;
 }

-.blue {
-    color: #ffffff;
+.green {
+    color: #fff;
    background: #4EBFAC;
-    padding: 3px;
-    padding-right: 10px;
-    padding-left: 10px;
+    border-radius: 4px;
+    display: inline-block;
+    border: none;
+    padding: 10px;
+    width: 100px;
+    cursor: pointer;
+    font-size: 1rem;
+    font-weight: bold;
+    transition: background-color 0.2s ease;
+    text-decoration: none;
+    text-align: center;
+}
+
+.green:hover {
+    background-color: #3c9f8d;
+    color: #fff;
+}
+
+.w-150 {
+    width: 150px;
+}
+
+.w-250 {
+    width: 250px;
 }

 .grey {
@@ -358,33 +382,15 @@ img.server-info-icon {
 }

 i.open-tab-button {
-    padding-left: 2px;
+    padding-left: 5px;
    font-size: 19px;
    cursor: pointer;
 }

-.reset-data-button,
-.custom-css-button,
-.download-folder-button {
-    display: inline-block;
-    border: none;
-    padding: 10px;
-    width: 120px;
-    cursor: pointer;
-    font-size: 13px;
-    transition: background-color 0.2s ease;
-    text-decoration: none;
-}
-
 .css-delete-action {
    margin-bottom: 10px;
 }

-.reset-data-button:hover {
-    background-color: #3c9f8d;
-    color: #fff;
-}
-
 .selected-css-path,
 .download-folder-path {
    background: #eeeeee;
@@ -400,7 +406,11 @@ i.open-tab-button {
 }

 #server-info-container {
-    min-height: calc(100% - 260px);
+    /* min-height: calc(100% - 260px); */
+}
+
+#new-org-button {
+    margin: 30px 0px 30px 0px;
 }

 #create-organization-container {
@@ -450,9 +460,12 @@ input.toggle-round+label:after {
 }

 input.toggle-round+label:before {
-    right: 2px;
    background-color: #f1f1f1;
    border-radius: 25px;
+    top: 0;
+    right: 0px;
+    left: 0px;
+    bottom: 0px;
 }

 input.toggle-round+label:after {
@@ -464,13 +477,16 @@ input.toggle-round+label:after {

 input.toggle-round:checked+label:before {
    background-color: #4EBFAC;
+    top: 0;
+    right: 0px;
+    left: 0px;
+    bottom: 0px;
 }

 input.toggle-round:checked+label:after {
    margin-left: 25px;
 }

-
 /*  Add new server modal */

 .add-server-modal {
@@ -488,7 +504,6 @@ input.toggle-round:checked+label:after {
    overflow: auto;
 }

-
 /* Modal Content */

 .modal-container {
@@ -546,7 +561,7 @@ input.toggle-round:checked+label:after {
    border: none;
    width: 98%;
    height: 46px;
-    border-radius: 3px;
+    border-radius: 4px;
    cursor: pointer;
 }

@@ -559,34 +574,35 @@ input.toggle-round:checked+label:after {
 }

 .certificates-card {
-     width:70%
+    width: 80%
 }

 .certificate-input {
-     width:100%;
-     margin-top: 10px;
-     display:inline-flex;
+    width: 100%;
+    margin-top: 10px;
+    display: inline-flex;
 }

 .certificate-input div {
-    align-self:center;
+    align-self: center;
 }

 .certificate-input .setting-input-value {
-    margin-left:10px;
+    margin-left: 10px;
    max-width: 100%;
 }

 #add-certificate-button {
-    width:20%;
-    margin-right:0px;
-    height: 35px;
+    margin: 10px 10px 10px 37px;
 }

 .tip {
-    background-color: hsl(46,63%,95%);
-    border: 1px solid hsl(46,63%,84%);
-    border-radius: 4px;
+    background: none;
+    padding: 0;
+}
+
+.tip:hover{
+   box-shadow: none;
 }

 .md-14 {
@@ -604,7 +620,7 @@ input.toggle-round:checked+label:after {

@media (max-width: 650px) {
    .selected-css-path,
-    .download-folder-path  {
+    .download-folder-path {
        margin-right: 15px;
    }
    #css-delete-action {
@@ -654,12 +670,10 @@ input.toggle-round:checked+label:after {
        flex-direction: column;
        align-items: center;
    }
-
    .server-info-right {
        flex-direction: column;
        align-items: center;
    }
-
    .action {
        margin-top: 10px;
    }
--- a/app/renderer/js/components/handle-external-link.js
+++ b/app/renderer/js/components/handle-external-link.js
@@ -21,10 +21,20 @@ function handleExternalLink(event) {
 	if (isWhiteListURL) {
 		event.preventDefault();

-		// download txt, pdf, mp3, mp4 etc.. by using downloadURL in the
+		// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+		// Show pdf attachments in a new window
+		// if (LinkUtil.isPDF(url) && isUploadsURL) {
+		// 	ipcRenderer.send('pdf-view', url);
+		// 	return;
+		// }
+
+		// download txt, mp3, mp4 etc.. by using downloadURL in the
 		// main process which allows the user to save the files to their desktop
 		// and not trigger webview reload while image in webview will
 		// do nothing and will not save it
+
+			// Code to show pdf in a new BrowserWindow (currently commented out due to bug-upstream)
+		// if (!LinkUtil.isImage(url) && !LinkUtil.isPDF(url) && isUploadsURL) {
 		if (!LinkUtil.isImage(url) && isUploadsURL) {
 			ipcRenderer.send('downloadFile', url, downloadPath);
 			ipcRenderer.once('downloadFileCompleted', (event, filePath, fileName) => {
--- a/app/renderer/js/components/server-tab.js
+++ b/app/renderer/js/components/server-tab.js
@@ -8,7 +8,7 @@ const {ipcRenderer} = require('electron');
 class ServerTab extends Tab {
 	template() {
 		return `<div class="tab" data-tab-id="${this.props.tabIndex}">
-					<div class="server-tooltip" style="display:none"></div>
+					<div class="server-tooltip" style="display:none">${this.props.name}</div>
 					<div class="server-tab-badge"></div>
 					<div class="server-tab">
 					<img class="server-icons" src='${this.props.icon}'/>
--- a/app/renderer/js/components/webview.js
+++ b/app/renderer/js/components/webview.js
@@ -33,6 +33,7 @@ class WebView extends BaseComponent {
 					disablewebsecurity
 					${this.props.preload ? 'preload="js/preload.js"' : ''}
 					partition="persist:webviewsession"
+					name="${this.props.name}"
 					webpreferences="allowRunningInsecureContent, javascript=yes">
 				</webview>`;
 	}
--- a/app/renderer/js/electron-bridge.js
+++ b/app/renderer/js/electron-bridge.js
@@ -21,8 +21,9 @@ electron_bridge.on('total_unread_count', (...args) => {
 	ipcRenderer.send('unread-count', ...args);
 });

-electron_bridge.on('realm_name', (...args) => {
-	ipcRenderer.send('realm-name-changed', ...args);
+electron_bridge.on('realm_name', realmName => {
+	const serverURL = location.origin;
+	ipcRenderer.send('realm-name-changed', serverURL, realmName);
 });

 electron_bridge.on('realm_icon_url', iconURL => {
--- a/app/renderer/js/main.js
+++ b/app/renderer/js/main.js
@@ -3,7 +3,8 @@
 const { ipcRenderer, remote } = require('electron');
 const isDev = require('electron-is-dev');

-const { session, app } = remote;
+const { session, app, Menu, dialog } = remote;
+const escape = require('escape-html');

 require(__dirname + '/js/tray.js');
 const DomainUtil = require(__dirname + '/js/utils/domain-util.js');
@@ -14,9 +15,9 @@ 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 CommonUtil = require(__dirname + '/js/utils/common-util.js');

-const escape = require('escape-html');
+const { feedbackHolder } = require(__dirname + '/js/feedback.js');

 const logger = new Logger({
 	file: 'errors.log',
@@ -110,6 +111,7 @@ class ServerManagerView {
 			showNotification: true,
 			autoUpdate: true,
 			betaUpdate: false,
+			customCSS: false,
 			silent: false,
 			lastActiveTab: 0,
 			dnd: false,
@@ -134,6 +136,10 @@ class ServerManagerView {
 			settingOptions.dockBouncing = true;
 		}

+		if (process.platform !== 'darwin') {
+			settingOptions.autoHideMenubar = false;
+		}
+
 		for (const i in settingOptions) {
 			if (ConfigUtil.getConfigItem(i) === null) {
 				ConfigUtil.setConfigItem(i, settingOptions[i]);
@@ -168,18 +174,19 @@ class ServerManagerView {
 		this.tabs.push(new ServerTab({
 			role: 'server',
 			icon: server.icon,
+			name: server.alias,
 			$root: this.$tabsContainer,
 			onClick: this.activateLastTab.bind(this, index),
 			index,
 			tabIndex,
-			onHover: this.onHover.bind(this, index, server.alias),
+			onHover: this.onHover.bind(this, index),
 			onHoverOut: this.onHoverOut.bind(this, index),
 			webview: new WebView({
 				$root: this.$webviewsContainer,
 				index,
 				tabIndex,
 				url: server.url,
-				name: server.alias,
+				name: CommonUtil.decodeString(server.alias),
 				isActive: () => {
 					return index === this.activeTabIndex;
 				},
@@ -193,6 +200,24 @@ class ServerManagerView {

 	initActions() {
 		this.initDNDButton();
+		this.initServerActions();
+		this.initLeftSidebarEvents();
+	}
+
+	initServerActions() {
+		const $serverImgs = document.querySelectorAll('.server-icons');
+		$serverImgs.forEach(($serverImg, index) => {
+			this.addContextMenu($serverImg, index);
+			if ($serverImg.src.includes('img/icon.png')) {
+				this.displayInitialCharLogo($serverImg, index);
+			}
+			$serverImg.addEventListener('error', () => {
+				this.displayInitialCharLogo($serverImg, index);
+			});
+		});
+	}
+
+	initLeftSidebarEvents() {
 		this.$dndButton.addEventListener('click', () => {
 			const dndUtil = DNDUtil.toggle();
 			ipcRenderer.send('forward-message', 'toggle-dnd', dndUtil.dnd, dndUtil.newSettings);
@@ -210,13 +235,6 @@ class ServerManagerView {
 			this.tabs[this.activeTabIndex].webview.back();
 		});

-		const $serverImgs = document.querySelectorAll('.server-icons');
-		$serverImgs.forEach($serverImg => {
-			$serverImg.addEventListener('error', () => {
-				$serverImg.src = 'img/icon.png';
-			});
-		});
-
 		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip, true);
 		this.sidebarHoverEvent(this.$settingsButton, this.$settingsTooltip);
 		this.sidebarHoverEvent(this.$reloadButton, this.$reloadTooltip);
@@ -235,6 +253,34 @@ class ServerManagerView {
 		return currentIndex;
 	}

+	displayInitialCharLogo($img, index) {
+		/*
+			index parameter needed because webview[data-tab-id] can increment
+			beyond size of sidebar org array and throw error
+		*/
+
+		const $altIcon = document.createElement('div');
+		const $parent = $img.parentElement;
+		const $container = $parent.parentElement;
+		const webviewId = $container.dataset.tabId;
+		const $webview = document.querySelector(`webview[data-tab-id="${webviewId}"]`);
+		const realmName = $webview.getAttribute('name');
+
+		if (realmName === null) {
+			$img.src = '/img/icon.png';
+			return;
+		}
+
+		$altIcon.textContent = realmName.charAt(0) || 'Z';
+		$altIcon.classList.add('server-icon');
+		$altIcon.classList.add('alt-icon');
+
+		$parent.removeChild($img);
+		$parent.appendChild($altIcon);
+
+		this.addContextMenu($altIcon, index);
+	}
+
 	sidebarHoverEvent(SidebarButton, SidebarTooltip, addServer = false) {
 		SidebarButton.addEventListener('mouseover', () => {
 			SidebarTooltip.removeAttribute('style');
@@ -252,8 +298,9 @@ class ServerManagerView {
 		});
 	}

-	onHover(index, serverName) {
-		this.$serverIconTooltip[index].innerHTML = escape(serverName);
+	onHover(index) {
+		// this.$serverIconTooltip[index].innerHTML already has realm name, so we are just
+		// removing the style.
 		this.$serverIconTooltip[index].removeAttribute('style');
 		// To handle position of servers' tooltip due to scrolling of list of organizations
 		// This could not be handled using CSS, hence the top of the tooltip is made same
@@ -275,6 +322,7 @@ class ServerManagerView {
 		this.functionalTabs[tabProps.name] = this.tabs.length;

 		const tabIndex = this.getTabIndex();
+
 		this.tabs.push(new FunctionalTab({
 			role: 'function',
 			materialIcon: tabProps.materialIcon,
@@ -299,9 +347,11 @@ class ServerManagerView {
 				preload: false
 			})
 		}));
+
 		// To show loading indicator the first time a functional tab is opened, indicator is
 		// closed when the functional tab DOM is ready, handled in webview.js
 		this.$webviewsContainer.classList.remove('loaded');
+
 		this.activateTab(this.functionalTabs[tabProps.name]);
 	}

@@ -338,6 +388,25 @@ class ServerManagerView {
 		ConfigUtil.setConfigItem('lastActiveTab', index);
 	}

+	// returns this.tabs in an way that does
+	// not crash app when this.tabs is passed into
+	// ipcRenderer. Something about webview, and props.webview
+	// properties in ServerTab causes the app to crash.
+	get tabsForIpc() {
+		const tabs = [];
+		this.tabs.forEach(tab => {
+			const proto = Object.create(Object.getPrototypeOf(tab));
+			const tabClone = Object.assign(proto, tab);
+
+			tabClone.webview = { props: {} };
+			tabClone.webview.props.name = tab.webview.props.name;
+			delete tabClone.props.webview;
+			tabs.push(tabClone);
+		});
+
+		return tabs;
+	}
+
 	activateTab(index, hideOldTab = true) {
 		if (!this.tabs[index]) {
 			return;
@@ -364,54 +433,12 @@ class ServerManagerView {
 		this.tabs[index].activate();

 		ipcRenderer.send('update-menu', {
-			tabs: this.tabs,
-			activeTabIndex: this.activeTabIndex
-		});
-
-		ipcRenderer.on('toggle-sidebar', (event, state) => {
-			const selector = 'webview:not([class*=disabled])';
-			const webview = document.querySelector(selector);
-			const webContents = webview.getWebContents();
-			webContents.send('toggle-sidebar', state);
-		});
-
-		ipcRenderer.on('toggle-silent', (event, state) => {
-			const webviews = document.querySelectorAll('webview');
-			webviews.forEach(webview => {
-				try {
-					webview.setAudioMuted(state);
-				} catch (err) {
-					// webview is not ready yet
-					webview.addEventListener('dom-ready', () => {
-						webview.isAudioMuted();
-					});
-				}
-			});
-		});
-
-		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
-			this.toggleDNDButton(state);
-			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
-			const selector = 'webview:not([class*=disabled])';
-			const webview = document.querySelector(selector);
-			const webContents = webview.getWebContents();
-			webContents.send('toggle-dnd', state, newSettings);
-		});
-
-		ipcRenderer.on('update-realm-icon', (event, serverURL, iconURL) => {
-			DomainUtil.getDomains().forEach((domain, index) => {
-				if (domain.url.includes(serverURL)) {
-					DomainUtil.saveServerIcon(iconURL).then(localIconUrl => {
-						const serverImgsSelector = `.tab .server-icons`;
-						const serverImgs = document.querySelectorAll(serverImgsSelector);
-						serverImgs[index].src = localIconUrl;
-
-						domain.icon = localIconUrl;
-						DomainUtil.db.push(`/domains[${index}]`, domain, true);
-						DomainUtil.reloadDB();
-					});
-				}
-			});
+			// JSON stringify this.tabs to avoid a crash
+			// util.inspect is being used to handle circular references
+			tabs: this.tabsForIpc,
+			activeTabIndex: this.activeTabIndex,
+			// Following flag controls whether a menu item should be enabled or not
+			enableMenu: this.tabs[index].props.role === 'server'
 		});
 	}

@@ -453,6 +480,7 @@ class ServerManagerView {
 		// Destroy the current view and re-initiate it
 		this.destroyView();
 		this.initTabs();
+		this.initServerActions();
 	}

 	// This will trigger when pressed CTRL/CMD + R [WIP]
@@ -488,6 +516,32 @@ class ServerManagerView {
 		this.$dndButton.querySelector('i').textContent = alert ? 'notifications_off' : 'notifications';
 	}

+	addContextMenu($serverImg, index) {
+		$serverImg.addEventListener('contextmenu', e => {
+			e.preventDefault();
+			const template = [
+				{
+					label: 'Disconnect organization',
+					click: () => {
+						dialog.showMessageBox({
+							type: 'warning',
+							buttons: ['YES', 'NO'],
+							defaultId: 0,
+							message: 'Are you sure you want to disconnect this organization?'
+						}, response => {
+							if (response === 0) {
+								DomainUtil.removeDomain(index);
+								ipcRenderer.send('reload-full-app');
+							}
+						});
+					}
+				}
+			];
+			const contextMenu = Menu.buildFromTemplate(template);
+			contextMenu.popup({ window: remote.getCurrentWindow() });
+		});
+	}
+
 	registerIpcs() {
 		const webviewListeners = {
 			'webview-reload': 'reload',
@@ -533,6 +587,10 @@ class ServerManagerView {
 			this.activateLastTab(index);
 		});

+		ipcRenderer.on('open-org-tab', () => {
+			this.openSettings('AddServer');
+		});
+
 		ipcRenderer.on('reload-proxy', (event, showAlert) => {
 			this.loadProxy().then(() => {
 				if (showAlert) {
@@ -543,7 +601,74 @@ class ServerManagerView {
 		});

 		ipcRenderer.on('toggle-sidebar', (event, show) => {
+			// Toggle the left sidebar
 			this.toggleSidebar(show);
+
+			// Toggle sidebar switch in the general settings
+			const selector = 'webview:not([class*=disabled])';
+			const webview = document.querySelector(selector);
+			const webContents = webview.getWebContents();
+			webContents.send('toggle-sidebar-setting', show);
+		});
+
+		ipcRenderer.on('toggle-silent', (event, state) => {
+			const webviews = document.querySelectorAll('webview');
+			webviews.forEach(webview => {
+				try {
+					webview.setAudioMuted(state);
+				} catch (err) {
+					// webview is not ready yet
+					webview.addEventListener('dom-ready', () => {
+						webview.setAudioMuted(state);
+					});
+				}
+			});
+		});
+
+		ipcRenderer.on('toggle-dnd', (event, state, newSettings) => {
+			this.toggleDNDButton(state);
+			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
+			const selector = 'webview:not([class*=disabled])';
+			const webview = document.querySelector(selector);
+			const webContents = webview.getWebContents();
+			webContents.send('toggle-dnd', state, newSettings);
+		});
+
+		ipcRenderer.on('update-realm-name', (event, serverURL, realmName) => {
+			DomainUtil.getDomains().forEach((domain, index) => {
+				if (domain.url.includes(serverURL)) {
+					const serverTooltipSelector = `.tab .server-tooltip`;
+					const serverTooltips = document.querySelectorAll(serverTooltipSelector);
+					serverTooltips[index].innerHTML = escape(realmName);
+					this.tabs[index].props.name = escape(realmName);
+					this.tabs[index].webview.props.name = realmName;
+
+					domain.alias = escape(realmName);
+					DomainUtil.db.push(`/domains[${index}]`, domain, true);
+					DomainUtil.reloadDB();
+					// Update the realm name also on the Window menu
+					ipcRenderer.send('update-menu', {
+						tabs: this.tabsForIpc,
+						activeTabIndex: this.activeTabIndex
+					});
+				}
+			});
+		});
+
+		ipcRenderer.on('update-realm-icon', (event, serverURL, iconURL) => {
+			DomainUtil.getDomains().forEach((domain, index) => {
+				if (domain.url.includes(serverURL)) {
+					DomainUtil.saveServerIcon(iconURL).then(localIconUrl => {
+						const serverImgsSelector = `.tab .server-icons`;
+						const serverImgs = document.querySelectorAll(serverImgsSelector);
+						serverImgs[index].src = localIconUrl;
+
+						domain.icon = localIconUrl;
+						DomainUtil.db.push(`/domains[${index}]`, domain, true);
+						DomainUtil.reloadDB();
+					});
+				}
+			});
 		});

 		ipcRenderer.on('enter-fullscreen', () => {
--- a/app/renderer/js/notification/helpers.js
+++ b/app/renderer/js/notification/helpers.js
@@ -141,7 +141,8 @@ function parseReply(reply) {

 function setupReply(id) {
 	const { narrow } = window;
-	narrow.by_subject(id, { trigger: 'notification' });
+	const narrowByTopic = narrow.by_topic || narrow.by_subject;
+	narrowByTopic(id, { trigger: 'notification' });
 }

 module.exports = {
--- a/app/renderer/js/pages/preference/add-certificate.js
+++ b/app/renderer/js/pages/preference/add-certificate.js
@@ -1,6 +1,7 @@
 'use-strict';

 const { dialog } = require('electron').remote;
+const path = require('path');

 const BaseComponent = require(__dirname + '/../../components/base.js');
 const CertificateUtil = require(__dirname + '/../../utils/certificate-util.js');
@@ -14,15 +15,15 @@ class AddCertificate extends BaseComponent {
 	}

 	template() {
-		return `			
-			<div class="settings-card server-center certificates-card">
+		return `
+			<div class="settings-card certificates-card">
 				<div class="certificate-input">
-					<div>Organization URL :</div> 
+					<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>Certificate file</div>
+					<button class="green" id="add-certificate-button">Upload</button>
 				</div>
 			</div>
 		`;
@@ -41,7 +42,7 @@ class AddCertificate extends BaseComponent {
 		const serverUrl = this.serverUrl.value;
 		if (certificate !== '' && serverUrl !== '') {
 			const server = encodeURIComponent(DomainUtil.formatUrl(serverUrl));
-			const fileName = certificate.substring(certificate.lastIndexOf('/') + 1);
+			const fileName = path.basename(certificate);
 			const copy = CertificateUtil.copyCertificate(server, certificate, fileName);
 			if (!copy) {
 				return;
--- a/app/renderer/js/pages/preference/connected-org-section.js
+++ b/app/renderer/js/pages/preference/connected-org-section.js
@@ -17,7 +17,7 @@ class ConnectedOrgSection extends BaseSection {
 				<div class="page-title">Connected organizations</div>
 				<div class="title" id="existing-servers">All the connected orgnizations will appear here.</div>
 				<div id="server-info-container"></div>
-
+				<div id="new-org-button"><button class="green sea w-250">Connect to another organization</button></div>
 				<div class="page-title">Add Custom Certificates</div>
 				<div id="add-certificate-container"></div>
 			</div>
@@ -33,8 +33,11 @@ class ConnectedOrgSection extends BaseSection {

 		const servers = DomainUtil.getDomains();
 		this.props.$root.innerHTML = this.template();
+
 		this.$serverInfoContainer = document.getElementById('server-info-container');
 		this.$existingServers = document.getElementById('existing-servers');
+		this.$newOrgButton = document.getElementById('new-org-button');
+		this.$addCertificateContainer = document.getElementById('add-certificate-container');

 		const noServerText = 'All the connected orgnizations will appear here';
 		// Show noServerText if no servers are there otherwise hide it
@@ -49,7 +52,12 @@ class ConnectedOrgSection extends BaseSection {
 			}).init();
 		}

-		this.$addCertificateContainer = document.getElementById('add-certificate-container');
+		this.$newOrgButton.addEventListener('click', () => {
+			// We don't need to import this since it's already imported in other files
+			// eslint-disable-next-line no-undef
+			ipcRenderer.send('forward-message', 'open-org-tab');
+		});
+
 		this.initAddCertificate();
 	}

--- a/app/renderer/js/pages/preference/general-section.js
+++ b/app/renderer/js/pages/preference/general-section.js
@@ -23,8 +23,12 @@ class GeneralSection extends BaseSection {
 						<div class="setting-description">Show app icon in system tray</div>
 						<div class="setting-control"></div>
 					</div>
+					<div class="setting-row" id="menubar-option" style= "display:${process.platform === 'darwin' ? 'none' : ''}">
+						<div class="setting-description">Auto hide Menubar (Press Alt key to display)</div>
+						<div class="setting-control"></div>
+					</div>
 					<div class="setting-row" id="sidebar-option">
-						<div class="setting-description">Show sidebar (<span class="code">Cmd Or Ctrl+S</span>)</div>
+						<div class="setting-description">Show sidebar (<span class="code">${process.platform === 'darwin' ? 'Cmd+Shift+S' : 'Ctrl+Shift+S'}</span>)</div>
 						<div class="setting-control"></div>
 					</div>
 					<div class="setting-row" id="badge-option">
@@ -40,7 +44,7 @@ class GeneralSection extends BaseSection {
 						<div class="setting-control"></div>
 					</div>
 				</div>
-				<div class="title">Desktop Notification</div>
+				<div class="title">Desktop Notifications</div>
 				<div class="settings-card">
 					<div class="setting-row" id="show-notification-option">
 						<div class="setting-description">Show Desktop Notifications</div>
@@ -73,39 +77,36 @@ class GeneralSection extends BaseSection {
 						<div class="setting-control"></div>
 					</div>
 					<div class="setting-row" id="enable-spellchecker-option">
-						<div class="setting-description">Enable Spellchecker (requires restart)</div>
+						<div class="setting-description">Enable spellchecker (requires restart)</div>
 						<div class="setting-control"></div>
 					</div>
 				</div>
-				<div class="title">Add custom CSS</div>
-				<div class="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="show-download-folder">
-					<div class="setting-description">Show downloaded file in the file manager</div>
+					<div class="setting-description">Show downloaded files in file manager</div>
 					<div class="setting-control"></div>
 				</div>
+				<div class="setting-row" id="add-custom-css">
+				<div class="setting-description">
+					Add custom CSS
+				</div>
+				<button class="custom-css-button green">Upload</button>
+			</div>
+			<div class="setting-row" id="remove-custom-css">
+				<div class="setting-description">
+					<div class="selected-css-path" id="custom-css-path">${ConfigUtil.getConfigItem('customCSS')}</div>
+				</div>
+				<div class="action red" id="css-delete-action">
+					<i class="material-icons">indeterminate_check_box</i>
+					<span>Delete</span>
+				</div>
+			</div>
 					<div class="setting-row" id="download-folder">
 						<div class="setting-description">
 							Default download location
 						</div>
-						<button class="download-folder-button blue">Choose</button>
+						<button class="download-folder-button green">Change</button>
 					</div>
 					<div class="setting-row">
 						<div class="setting-description">
@@ -119,7 +120,7 @@ class GeneralSection extends BaseSection {
 					<div class="setting-row" id="resetdata-option">
 						<div class="setting-description">This will delete all application data including all added accounts and preferences
 						</div>
-						<button class="reset-data-button blue">Reset App Data</button>
+						<button class="reset-data-button green w-150">Reset App Data</button>
 					</div>
 				</div>
            </div>
@@ -155,6 +156,11 @@ class GeneralSection extends BaseSection {
 		if (process.platform === 'darwin') {
 			this.updateDockBouncing();
 		}
+
+		// Auto hide menubar on Windows and Linux
+		if (process.platform !== 'darwin') {
+			this.updateMenubarOption();
+		}
 	}

 	updateTrayOption() {
@@ -170,6 +176,19 @@ class GeneralSection extends BaseSection {
 		});
 	}

+	updateMenubarOption() {
+		this.generateSettingOption({
+			$element: document.querySelector('#menubar-option .setting-control'),
+			value: ConfigUtil.getConfigItem('autoHideMenubar', false),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('autoHideMenubar');
+				ConfigUtil.setConfigItem('autoHideMenubar', newValue);
+				ipcRenderer.send('toggle-menubar', newValue);
+				this.updateMenubarOption();
+			}
+		});
+	}
+
 	updateBadgeOption() {
 		this.generateSettingOption({
 			$element: document.querySelector('#badge-option .setting-control'),
@@ -214,6 +233,10 @@ class GeneralSection extends BaseSection {
 			clickHandler: () => {
 				const newValue = !ConfigUtil.getConfigItem('autoUpdate');
 				ConfigUtil.setConfigItem('autoUpdate', newValue);
+				if (!newValue) {
+					ConfigUtil.setConfigItem('betaUpdate', false);
+					this.betaUpdateOption();
+				}
 				this.autoUpdateOption();
 			}
 		});
@@ -225,8 +248,10 @@ class GeneralSection extends BaseSection {
 			value: ConfigUtil.getConfigItem('betaUpdate', false),
 			clickHandler: () => {
 				const newValue = !ConfigUtil.getConfigItem('betaUpdate');
-				ConfigUtil.setConfigItem('betaUpdate', newValue);
-				this.betaUpdateOption();
+				if (ConfigUtil.getConfigItem('autoUpdate')) {
+					ConfigUtil.setConfigItem('betaUpdate', newValue);
+					this.betaUpdateOption();
+				}
 			}
 		});
 	}
--- a/app/renderer/js/pages/preference/network-section.js
+++ b/app/renderer/js/pages/preference/network-section.js
@@ -38,8 +38,7 @@ class NetworkSection extends BaseSection {
 							<input class="setting-input-value" placeholder="e.g. foobar.com"/>
 						</div>
 						<div class="setting-row">
-							<div class="action blue" id="proxy-save-action">
-								<i class="material-icons">check_box</i>
+							<div class="action green" id="proxy-save-action">
 								<span>Save</span>
 							</div>
 						</div>
@@ -100,7 +99,7 @@ class NetworkSection extends BaseSection {
 				if (newValue === false) {
 					// Remove proxy system proxy settings
 					ConfigUtil.setConfigItem('proxyRules', '');
-					ipcRenderer.send('forward-message', 'reload-proxy', true);
+					ipcRenderer.send('forward-message', 'reload-proxy', false);
 				}
 				ConfigUtil.setConfigItem('useSystemProxy', newValue);
 				this.updateProxyOption();
--- a/app/renderer/js/pages/preference/preference.js
+++ b/app/renderer/js/pages/preference/preference.js
@@ -90,7 +90,7 @@ class PreferenceView extends BaseComponent {
 			this.handleNavigation(navItem);
 		});

-		ipcRenderer.on('toggle-sidebar', (event, state) => {
+		ipcRenderer.on('toggle-sidebar-setting', (event, state) => {
 			this.handleToggle('sidebar-option', state);
 		});

--- a/app/renderer/js/pages/preference/shortcuts-section.js
+++ b/app/renderer/js/pages/preference/shortcuts-section.js
@@ -14,6 +14,7 @@ class ShortcutsSection extends BaseSection {

 		return `
            <div class="settings-pane">
+            <div class="settings-card tip"><p><b><i class="material-icons md-14">settings</i>Tip:  </b>These desktop app shortcuts extend the Zulip webapp's <span id="open-hotkeys-link"> keyboard shortcuts</span>.</p></div>
              <div class="title">Application Shortcuts</div>
              <div class="settings-card">
                <table>
@@ -160,7 +161,6 @@ 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>
 		`;
 	}
--- a/app/renderer/js/tray.js
+++ b/app/renderer/js/tray.js
@@ -3,9 +3,9 @@ const path = require('path');

 const electron = require('electron');

-const {ipcRenderer, remote} = electron;
+const { ipcRenderer, remote } = electron;

-const {Tray, Menu, nativeImage, BrowserWindow} = remote;
+const { Tray, Menu, nativeImage, BrowserWindow } = remote;

 const APP_ICON = path.join(__dirname, '../../resources/tray', 'tray');

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

@@ -115,50 +117,36 @@ function sendAction(action) {

 const createTray = function () {
 	window.tray = new Tray(iconPath());
-	const contextMenu = Menu.buildFromTemplate([{
-		label: 'About',
-		click() {
-			// We need to focus the main window first
-			ipcRenderer.send('focus-app');
-			sendAction('open-about');
+	const contextMenu = Menu.buildFromTemplate([
+		{
+			label: 'Zulip',
+			click() {
+				ipcRenderer.send('focus-app');
+			}
+		},
+		{
+			label: 'Settings',
+			click() {
+				ipcRenderer.send('focus-app');
+				sendAction('open-settings');
+			}
+		},
+		{
+			type: 'separator'
+		},
+		{
+			label: 'Quit',
+			click() {
+				ipcRenderer.send('quit-app');
+			}
 		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Focus',
-		click() {
-			ipcRenderer.send('focus-app');
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Settings',
-		click() {
-			ipcRenderer.send('focus-app');
-			sendAction('open-settings');
-		}
-	},
-	{
-		type: 'separator'
-	},
-	{
-		label: 'Quit',
-		click() {
-			ipcRenderer.send('quit-app');
-		}
-	}
 	]);
 	window.tray.setContextMenu(contextMenu);
-	window.tray.on('click', () => {
-		// Click event only works on Windows
-		if (process.platform === 'win32') {
+	if (process.platform === 'linux' || process.platform === 'win32') {
+		window.tray.on('click', () => {
 			ipcRenderer.send('toggle-app');
-		}
-	});
+		});
+	}
 };

 ipcRenderer.on('destroytray', event => {
--- a/app/renderer/js/utils/common-util.js
+++ b/app/renderer/js/utils/common-util.js
@@ -0,0 +1,25 @@
+'use strict';
+
+let instance = null;
+
+class CommonUtil {
+	constructor() {
+		if (instance) {
+			return instance;
+		} else {
+			instance = this;
+		}
+		return instance;
+	}
+
+	// unescape already encoded/escaped strings
+	decodeString(string) {
+		const parser = new DOMParser();
+		const dom = parser.parseFromString(
+			'<!doctype html><body>' + string,
+			'text/html');
+		return dom.body.textContent;
+	}
+}
+
+module.exports = new CommonUtil();
--- a/app/renderer/js/utils/config-util.js
+++ b/app/renderer/js/utils/config-util.js
@@ -39,7 +39,12 @@ class ConfigUtil {
 	}

 	getConfigItem(key, defaultValue = null) {
-		this.reloadDB();
+		try {
+			this.db.reload();
+		} catch (err) {
+			logger.error('Error while reloading settings.json: ');
+			logger.error(err);
+		}
 		const value = this.db.getData('/')[key];
 		if (value === undefined) {
 			this.setConfigItem(key, defaultValue);
@@ -50,19 +55,24 @@ class ConfigUtil {
 	}
 	// This function returns whether a key exists in the configuration file (settings.json)
 	isConfigItemExists(key) {
-		this.reloadDB();
+		try {
+			this.db.reload();
+		} catch (err) {
+			logger.error('Error while reloading settings.json: ');
+			logger.error(err);
+		}
 		const value = this.db.getData('/')[key];
 		return (value !== undefined);
 	}

 	setConfigItem(key, value) {
 		this.db.push(`/${key}`, value, true);
-		this.reloadDB();
+		this.db.save();
 	}

 	removeConfigItem(key) {
 		this.db.delete(`/${key}`);
-		this.reloadDB();
+		this.db.save();
 	}

 	reloadDB() {
--- a/app/renderer/js/utils/domain-util.js
+++ b/app/renderer/js/utils/domain-util.js
@@ -10,6 +10,9 @@ const escape = require('escape-html');
 const Logger = require('./logger-util');

 const CertificateUtil = require(__dirname + '/certificate-util.js');
+const ProxyUtil = require(__dirname + '/proxy-util.js');
+const ConfigUtil = require(__dirname + '/config-util.js');
+const SystemUtil = require(__dirname + '/../utils/system-util.js');

 const logger = new Logger({
 	file: `domain-util.log`,
@@ -63,7 +66,7 @@ class DomainUtil {
 	addDomain(server) {
 		return new Promise(resolve => {
 			if (server.icon) {
-				this.saveServerIcon(server.icon).then(localIconUrl => {
+				this.saveServerIcon(server).then(localIconUrl => {
 					server.icon = localIconUrl;
 					this.db.push('/domains[]', server, true);
 					this.reloadDB();
@@ -119,8 +122,18 @@ class DomainUtil {
 				logger.warn('Error while trying to get certificate: ' + err);
 			}
 		}
+
+		const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
+
 		// If certificate for the domain exists add it as a ca key in the request's parameter else consider only domain as the parameter for request
-		const checkDomain = (certificateLocation) ? ({url: domain + '/static/audio/zulip.ogg', ca: certificateLocation}) : domain + '/static/audio/zulip.ogg';
+		// Add proxy as a parameter if it sbeing used.
+		const checkDomain = {
+			url: domain + '/static/audio/zulip.ogg',
+			ca: (certificateLocation) ? certificateLocation : '',
+			proxy: proxyEnabled ? ProxyUtil.getProxy(domain) : '',
+			ecdhCurve: 'auto',
+			headers: { 'User-Agent': SystemUtil.getUserAgent() }
+		};

 		const serverConf = {
 			icon: defaultIconUrl,
@@ -193,9 +206,28 @@ class DomainUtil {
 	}

 	getServerSettings(domain) {
-		const serverSettingsUrl = domain + '/api/v1/server_settings';
+		const certificate = CertificateUtil.getCertificate(encodeURIComponent(domain));
+		let certificateLocation = '';
+
+		if (certificate) {
+			// To handle case where certificate has been moved from the location in certificates.json
+			try {
+				certificateLocation = fs.readFileSync(certificate);
+			} catch (err) {
+				logger.warn('Error while trying to get certificate: ' + err);
+			}
+		}
+
+		const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
+		const serverSettingsOptions = {
+			url: domain + '/api/v1/server_settings',
+			ca: (certificateLocation) ? certificateLocation : '',
+			proxy: proxyEnabled ? ProxyUtil.getProxy(domain) : '',
+			ecdhCurve: 'auto',
+			headers: { 'User-Agent': SystemUtil.getUserAgent() }
+		};
 		return new Promise((resolve, reject) => {
-			request(serverSettingsUrl, (error, response) => {
+			request(serverSettingsOptions, (error, response) => {
 				if (!error && response.statusCode === 200) {
 					const data = JSON.parse(response.body);
 					if (data.hasOwnProperty('realm_icon') && data.realm_icon) {
@@ -214,13 +246,39 @@ class DomainUtil {
 		});
 	}

-	saveServerIcon(url) {
+	saveServerIcon(server) {
+		const url = server.icon;
+		const domain = server.url;
+
+		const certificate = CertificateUtil.getCertificate(encodeURIComponent(domain));
+		let certificateLocation = '';
+
+		if (certificate) {
+			// To handle case where certificate has been moved from the location in certificates.json
+			try {
+				certificateLocation = fs.readFileSync(certificate);
+			} catch (err) {
+				logger.warn('Error while trying to get certificate: ' + err);
+			}
+		}
+
+		const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
+
+		// Add proxy and certificate as a parameter if its being used.
+		const serverIconOptions = {
+			url,
+			ca: (certificateLocation) ? certificateLocation : '',
+			proxy: proxyEnabled ? ProxyUtil.getProxy(url) : '',
+			ecdhCurve: 'auto',
+			headers: { 'User-Agent': SystemUtil.getUserAgent() }
+		};
+
 		// The save will always succeed. If url is invalid, downgrade to default icon.
 		return new Promise(resolve => {
 			const filePath = this.generateFilePath(url);
 			const file = fs.createWriteStream(filePath);
 			try {
-				request(url).on('response', response => {
+				request(serverIconOptions).on('response', response => {
 					response.on('error', err => {
 						logger.log('Could not get server icon.');
 						logger.log(err);
@@ -248,7 +306,7 @@ class DomainUtil {
 	updateSavedServer(url, index) {
 		// Does not promise successful update
 		this.checkDomain(url, true).then(newServerConf => {
-			this.saveServerIcon(newServerConf.icon).then(localIconUrl => {
+			this.saveServerIcon(newServerConf).then(localIconUrl => {
 				newServerConf.icon = localIconUrl;
 				this.updateDomain(index, newServerConf);
 				this.reloadDB();
--- a/app/renderer/js/utils/link-util.js
+++ b/app/renderer/js/utils/link-util.js
@@ -34,6 +34,12 @@ class LinkUtil {
 		const isImageUrl = /\.(bmp|gif|jpg|jpeg|png|webp)\?*.*$/i;
 		return isImageUrl.test(url);
 	}
+
+	isPDF(url) {
+		// test for pdf extension
+		const isPDFUrl = /\.(pdf)\?*.*$/i;
+		return isPDFUrl.test(url);
+	}
 }

 module.exports = new LinkUtil();
--- a/app/renderer/js/utils/proxy-util.js
+++ b/app/renderer/js/utils/proxy-util.js
@@ -1,5 +1,6 @@
 'use strict';

+const url = require('url');
 const ConfigUtil = require('./config-util.js');

 let instance = null;
@@ -15,6 +16,39 @@ class ProxyUtil {
 		return instance;
 	}

+	// Return proxy to be used for a particular uri, to be used for request
+	getProxy(uri) {
+		uri = url.parse(uri);
+		const proxyRules = ConfigUtil.getConfigItem('proxyRules', '').split(';');
+		// If SPS is on and system uses no proxy then request should not try to use proxy from
+		// environment. NO_PROXY = '*' makes request ignore all environment proxy variables.
+		if (proxyRules[0] === '') {
+			process.env.NO_PROXY = '*';
+			return;
+		}
+
+		const proxyRule = {};
+		if (uri.protocol === 'http:') {
+			proxyRules.forEach(proxy => {
+				if (proxy.includes('http=')) {
+					proxyRule.hostname = proxy.split('http=')[1].trim().split(':')[0];
+					proxyRule.port = proxy.split('http=')[1].trim().split(':')[1];
+				}
+			});
+			return proxyRule;
+		}
+
+		if (uri.protocol === 'https:') {
+			proxyRules.forEach(proxy => {
+				if (proxy.includes('https=')) {
+					proxyRule.hostname = proxy.split('https=')[1].trim().split(':')[0];
+					proxyRule.port = proxy.split('https=')[1].trim().split(':')[1];
+				}
+			});
+			return proxyRule;
+		}
+	}
+
 	resolveSystemProxy(mainWindow) {
 		const page = mainWindow.webContents;
 		const ses = page.session;
--- a/app/renderer/js/utils/reconnect-util.js
+++ b/app/renderer/js/utils/reconnect-util.js
@@ -45,8 +45,8 @@ class ReconnectUtil {
 						const errMsgHolder = document.querySelector('#description');
 						if (errMsgHolder) {
 							errMsgHolder.innerHTML = `
-										<div>You internet connection does't seem to work properly!</div>
-										</div>Verify that it works and then click try again.</div>`;
+										<div>Your internet connection doesn't seem to work properly!</div>
+										<div>Verify that it works and then click try again.</div>`;
 						}
 						return resolve(false);
 					});
--- a/app/renderer/js/utils/sentry-util.js
+++ b/app/renderer/js/utils/sentry-util.js
@@ -5,6 +5,10 @@ const sentryInit = () => {
 	if (!isDev) {
 		init({
 			dsn: 'SENTRY_DSN',
+			// We should ignore this error since it's harmless and we know the reason behind this
+			// This error mainly comes from the console logs.
+			// This is a temp solution until Sentry supports disabling the console logs
+			ignoreErrors: ['does not appear to be a valid Zulip server'],
 			sendTimeout: 30 // wait 30 seconds before considering the sending capture to have failed, default is 1 second
 		});
 	}
--- a/changelog.md
+++ b/changelog.md
@@ -1,9 +1,78 @@
 # Version History

-
-
 All notable changes to the Zulip desktop app are documented in this file.

+### v2.3.82 --2018-09-25
+
+**New features**:
+* UI enhancements.
+* Updated some menu items.
+
+**Fixes**:
+* Fix about page not opening up.
+
+<hr>
+
+### v2.3.8 --2018-09-25
+
+**New features**:
+* Auto hide menubar on Windows/Linux. Add a setting option for the same.
+* Improve design of setting page.
+* Toggle app on clicking the tray icon (Linux).
+* Update sidebar realm name when it's changed in webapp.
+* left-sidebar: Add initial character of realm name instead of default icon.
+
+**Fixes**:
+* linux: Fix ALT+SHIFT opening menu items on Linux.
+* sentry: Add ignore errors to sentry configuration.
+* Linux: Add label for help menu item.
+* file-attachments: Allow multiple downloads of same file name.
+
+**Module Updates**
+* electron: Update electron to v2.0.9.
+
+
+<hr>
+
+
+### v2.3.7-beta --2018-09-03
+
+**New features**:
+* Add a feature to show and view pdf file in the app.
+
+**Fixes**:
+* Use package reload instead of custom reload. This is an experimental fix for setting files getting corrupted issue.
+* Unescape server name in window menu item.
+
+<hr>
+
+### v2.3.6 --2018-08-27
+
+**New features**:
+* Add proxy details while validating a server. This fixes the server validating issue for users who are using the proxy settings. 
+
+
+**Fixes**:
+
+* Fix youtube video not playing in lightbox. 
+* Fix realm name not escaped properly.
+
+<hr>
+
+### v2.3.5 --2018-08-03
+
+**New features**:
+* Add a setting option to show downloaded file in file manager.
+* Added electron bridge to communicate with webapp in real time.
+
+**Fixes**:
+
+* Fix failing attached file downloads.
+* Fix page_params error.
+* gulpfile: Update syntax and methods for gulp v4.x.
+
+<hr>
+
 ### v2.3.4-beta --2018-07-24

 **Fixes**:
--- a/help.md
+++ b/help.md
@@ -1,105 +0,0 @@
-# User Guide
-
-> Welcome! This guide will walk you through the basics of using Zulip Desktop.
-
-
-## Get Zulip Desktop
-
-
-
-## Connect to a Server
-
-### Connect through a proxy
-
-It's possible to connect to your server through a proxy. 
-You can enter the proxy settings in the `Network` section of App Settings. 
-There are three fields provided:
-* `PAC script` - The URL associated with the PAC file.
-* `Proxy rules` - Rules indicating which proxies to use.
-* `Proxy bypass rules` - Rules indicating which URLs should
-    bypass the proxy settings.
-	
-For a typical setup where internet access is required to use an HTTP proxy,
-but URLs on the local network should be accessed directly, configure as follows:
-
-`Proxy rules = proxy.example.com`
-
-Your HTTP proxy server
-`Proxy bypass rules = *.example.com;10.0.0.0/8`
-
-Directly connect to your own domain and private IP subnet
-for more complex setups, read below to configure complex proxy rules and proxy bypass rules.
-
-### Sets the proxy settings.
-
-When `PAC script` and `Proxy rules` are provided together, the `Proxy rules`
-option is ignored and `PAC script` configuration is applied.
-
-The `Proxy rules` has to follow the rules below:
-
-```
-proxyRules = schemeProxies[";"<schemeProxies>]
-schemeProxies = [<urlScheme>"="]<proxyURIList>
-urlScheme = "http" | "https" | "ftp" | "socks"
-proxyURIList = <proxyURL>[","<proxyURIList>]
-proxyURL = [<proxyScheme>"://"]<proxyHost>[":"<proxyPort>]
-```
-
-For example:
-
-* `http=foopy:80;ftp=foopy2` - Use HTTP proxy `foopy:80` for `http://` URLs, and
-  HTTP proxy `foopy2:80` for `ftp://` URLs.
-* `foopy:80` - Use HTTP proxy `foopy:80` for all URLs.
-* `foopy:80,bar,direct://` - Use HTTP proxy `foopy:80` for all URLs, failing
-  over to `bar` if `foopy:80` is unavailable, and after that using no proxy.
-* `socks4://foopy` - Use SOCKS v4 proxy `foopy:1080` for all URLs.
-* `http=foopy,socks5://bar.com` - Use HTTP proxy `foopy` for http URLs, and fail
-  over to the SOCKS5 proxy `bar.com` if `foopy` is unavailable.
-* `http=foopy,direct://` - Use HTTP proxy `foopy` for http URLs, and use no
-  proxy if `foopy` is unavailable.
-* `http=foopy;socks=foopy2` -  Use HTTP proxy `foopy` for http URLs, and use
-  `socks4://foopy2` for all other URLs.
-
-The `Proxy bypass rules` is a comma separated list of rules described below:
-
-* `[ URL_SCHEME "://" ] HOSTNAME_PATTERN [ ":" <port> ]`
-
-   Match all hostnames that match the pattern HOSTNAME_PATTERN.
-
-   Examples:
-     "foobar.com", "*foobar.com", "*.foobar.com", "*foobar.com:99",
-     "https://x.*.y.com:99"
-
- * `"." HOSTNAME_SUFFIX_PATTERN [ ":" PORT ]`
-
-   Match a particular domain suffix.
-
-   Examples:
-     ".google.com", ".com", "http://.google.com"
-
-* `[ SCHEME "://" ] IP_LITERAL [ ":" PORT ]`
-
-   Match URLs which are IP address literals.
-
-   Examples:
-     "127.0.1", "[0:0::1]", "[::1]", "http://[::1]:99"
-
-*  `IP_LITERAL "/" PREFIX_LENGHT_IN_BITS`
-
-   Match any URL that is to an IP literal that falls between the
-   given range. IP range is specified using CIDR notation.
-
-   Examples:
-     "192.168.1.1/16", "fefe:13::abc/33".
-
-*  `<local>`
-
-   Match local addresses. The meaning of `<local>` is whether the
-   host matches one of: "127.0.0.1", "::1", "localhost".
-
-
-## Change App Preferences
-
-
-
-## Reporting an Issue
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "2.3.5",
+  "version": "2.5.0-beta",
  "main": "./app/main",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
@@ -106,8 +106,6 @@
      "publisherName": "Kandra Labs, Inc."
    },
    "nsis": {
-      "perMachine": true,
-      "oneClick": false,
      "allowToChangeInstallationDirectory": true
    }
  },
@@ -123,8 +121,8 @@
    "assert": "1.4.1",
    "cp-file": "^5.0.0",
    "devtron": "1.4.0",
-    "electron": "2.0.1",
-    "electron-builder": "20.20.4",
+    "electron": "3.0.10",
+    "electron-builder": "20.38.4",
    "electron-connect": "0.6.2",
    "electron-debug": "1.4.0",
    "google-translate-api": "2.3.0",
@@ -133,7 +131,7 @@
    "is-ci": "^1.0.10",
    "nodemon": "^1.14.11",
    "pre-commit": "1.2.2",
-    "spectron": "3.8.0",
+    "spectron": "^5.0.0",
    "tap-colorize": "^1.2.0",
    "tape": "^4.8.0",
    "xo": "0.18.2"
@@ -153,7 +151,7 @@
          "max-lines": [
            "warn",
            {
-              "max": 500,
+              "max": 600,
              "skipBlankLines": true,
              "skipComments": true
            }
--- a/tests/e2e/package.json
+++ b/tests/e2e/package.json
@@ -1,185 +1,183 @@
 {
- "name": "zulip",
- "productName": "ZulipTest",
- "version": "2.3.3",
- "main": "../../app/main",
- "description": "Zulip Desktop App",
- "license": "Apache-2.0",
- "copyright": "Kandra Labs, Inc.",
- "author": {
-  "name": "Kandra Labs, Inc.",
-  "email": "support@zulipchat.com"
- },
- "repository": {
-  "type": "git",
-  "url": "https://github.com/zulip/zulip-electron.git"
- },
- "bugs": {
-  "url": "https://github.com/zulip/zulip-electron/issues"
- },
- "engines": {
-  "node": ">=6.0.0"
- },
- "scripts": {
-  "start": "electron app --disable-http-cache --no-electron-connect",
-  "reinstall": "node ./tools/reinstall-node-modules.js",
-  "postinstall": "electron-builder install-app-deps",
-  "test": "xo",
-  "test-e2e": "gulp test-e2e",
-  "dev": "gulp dev & nodemon --watch app/main --watch app/renderer --exec 'npm test' -e html,css,js",
-  "pack": "electron-builder --dir",
-  "dist": "electron-builder",
-  "mas": "electron-builder --mac mas",
-  "travis": "cd ./scripts && ./travis-build-test.sh",
-  "build-locales": "node tools/locale-helper"
- },
- "pre-commit": [
-  "test"
- ],
- "build": {
-  "appId": "org.zulip.zulip-electron",
-  "asar": true,
-  "files": [
-   "**/*",
-   "!docs${/*}",
-   "!node_modules/@paulcbetts/cld/deps/cld${/*}"
-  ],
-  "copyright": "©2017 Kandra Labs, Inc.",
-  "mac": {
-   "category": "public.app-category.productivity",
-   "artifactName": "${productName}-${version}-${arch}.${ext}"
-  },
-  "linux": {
-   "category": "Chat;GNOME;GTK;Network;InstantMessaging",
-   "packageCategory": "GNOME;GTK;Network;InstantMessaging",
-   "description": "Zulip Desktop Client for Linux",
-   "target": [
-    "deb",
-    "zip",
-    "AppImage",
-    "snap"
-   ],
-   "maintainer": "Akash Nimare <svnitakash@gmail.com>",
-   "artifactName": "${productName}-${version}-${arch}.${ext}"
-  },
-  "deb": {
-   "synopsis": "Zulip Desktop App",
-   "afterInstall": "./scripts/debian-add-repo.sh",
-   "afterRemove": "./scripts/debian-uninstaller.sh"
-  },
-  "snap": {
-   "synopsis": "Zulip Desktop App"
-  },
-  "dmg": {
-   "background": "build/appdmg.png",
-   "icon": "build/icon.icns",
-   "iconSize": 100,
-   "contents": [
-    {
-     "x": 380,
-     "y": 280,
-     "type": "link",
-     "path": "/Applications"
+    "name": "zulip",
+    "productName": "Zulip",
+    "version": "2.4.0",
+    "main": "../../app/main",
+    "description": "Zulip Desktop App",
+    "license": "Apache-2.0",
+    "copyright": "Kandra Labs, Inc.",
+    "author": {
+      "name": "Kandra Labs, Inc.",
+      "email": "support@zulipchat.com"
    },
-    {
-     "x": 110,
-     "y": 280,
-     "type": "file"
-    }
-   ],
-   "window": {
-    "width": 500,
-    "height": 500
-   }
-  },
-  "win": {
-   "target": [
-    {
-     "target": "nsis-web",
-     "arch": [
-      "x64",
-      "ia32"
-     ]
-    }
-   ],
-   "icon": "build/icon.ico",
-   "publisherName": "Kandra Labs, Inc."
-  },
-  "nsis": {
-   "perMachine": true,
-   "oneClick": false,
-   "allowToChangeInstallationDirectory": true
-  }
- },
- "keywords": [
-  "Zulip",
-  "Group Chat app",
-  "electron-app",
-  "electron",
-  "Desktop app",
-  "InstantMessaging"
- ],
- "devDependencies": {
-  "assert": "1.4.1",
-  "cp-file": "^5.0.0",
-  "devtron": "1.4.0",
-  "electron": "2.0.1",
-  "electron-builder": "20.20.4",
-  "electron-connect": "0.6.2",
-  "electron-debug": "1.4.0",
-  "google-translate-api": "2.3.0",
-  "gulp": "^4.0.0",
-  "gulp-tape": "0.0.9",
-  "is-ci": "^1.0.10",
-  "nodemon": "^1.14.11",
-  "pre-commit": "1.2.2",
-  "spectron": "3.8.0",
-  "tap-colorize": "^1.2.0",
-  "tape": "^4.8.0",
-  "xo": "0.18.2"
- },
- "xo": {
-  "parserOptions": {
-   "sourceType": "script",
-   "ecmaFeatures": {
-    "globalReturn": true
-   }
-  },
-  "esnext": true,
-  "overrides": [
-   {
-    "files": "app*/**/*.js",
-    "rules": {
-     "max-lines": [
-      "warn",
-      {
-       "max": 500,
-       "skipBlankLines": true,
-       "skipComments": true
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/zulip/zulip-electron.git"
+    },
+    "bugs": {
+      "url": "https://github.com/zulip/zulip-electron/issues"
+    },
+    "engines": {
+      "node": ">=6.0.0"
+    },
+    "scripts": {
+      "start": "electron app --disable-http-cache --no-electron-connect",
+      "reinstall": "node ./tools/reinstall-node-modules.js",
+      "postinstall": "electron-builder install-app-deps",
+      "test": "xo",
+      "test-e2e": "gulp test-e2e",
+      "dev": "gulp dev & nodemon --watch app/main --watch app/renderer --exec 'npm test' -e html,css,js",
+      "pack": "electron-builder --dir",
+      "dist": "electron-builder",
+      "mas": "electron-builder --mac mas",
+      "travis": "cd ./scripts && ./travis-build-test.sh",
+      "build-locales": "node tools/locale-helper"
+    },
+    "pre-commit": [
+      "test"
+    ],
+    "build": {
+      "appId": "org.zulip.zulip-electron",
+      "asar": true,
+      "files": [
+        "**/*",
+        "!docs${/*}",
+        "!node_modules/@paulcbetts/cld/deps/cld${/*}"
+      ],
+      "copyright": "©2017 Kandra Labs, Inc.",
+      "mac": {
+        "category": "public.app-category.productivity",
+        "artifactName": "${productName}-${version}-${arch}.${ext}"
+      },
+      "linux": {
+        "category": "Chat;GNOME;GTK;Network;InstantMessaging",
+        "packageCategory": "GNOME;GTK;Network;InstantMessaging",
+        "description": "Zulip Desktop Client for Linux",
+        "target": [
+          "deb",
+          "zip",
+          "AppImage",
+          "snap"
+        ],
+        "maintainer": "Akash Nimare <svnitakash@gmail.com>",
+        "artifactName": "${productName}-${version}-${arch}.${ext}"
+      },
+      "deb": {
+        "synopsis": "Zulip Desktop App",
+        "afterInstall": "./scripts/debian-add-repo.sh",
+        "afterRemove": "./scripts/debian-uninstaller.sh"
+      },
+      "snap": {
+        "synopsis": "Zulip Desktop App"
+      },
+      "dmg": {
+        "background": "build/appdmg.png",
+        "icon": "build/icon.icns",
+        "iconSize": 100,
+        "contents": [
+          {
+            "x": 380,
+            "y": 280,
+            "type": "link",
+            "path": "/Applications"
+          },
+          {
+            "x": 110,
+            "y": 280,
+            "type": "file"
+          }
+        ],
+        "window": {
+          "width": 500,
+          "height": 500
+        }
+      },
+      "win": {
+        "target": [
+          {
+            "target": "nsis-web",
+            "arch": [
+              "x64",
+              "ia32"
+            ]
+          }
+        ],
+        "icon": "build/icon.ico",
+        "publisherName": "Kandra Labs, Inc."
+      },
+      "nsis": {
+        "allowToChangeInstallationDirectory": true
      }
-     ],
-     "no-warning-comments": 0,
-     "object-curly-spacing": 0,
-     "capitalized-comments": 0,
-     "no-else-return": 0,
-     "no-path-concat": 0,
-     "no-alert": 0,
-     "guard-for-in": 0,
-     "prefer-promise-reject-errors": 0,
-     "import/no-unresolved": 0,
-     "import/no-extraneous-dependencies": 0,
-     "no-prototype-builtins": 0
+    },
+    "keywords": [
+      "Zulip",
+      "Group Chat app",
+      "electron-app",
+      "electron",
+      "Desktop app",
+      "InstantMessaging"
+    ],
+    "devDependencies": {
+      "assert": "1.4.1",
+      "cp-file": "^5.0.0",
+      "devtron": "1.4.0",
+      "electron": "3.0.10",
+      "electron-builder": "20.38.4",
+      "electron-connect": "0.6.2",
+      "electron-debug": "1.4.0",
+      "google-translate-api": "2.3.0",
+      "gulp": "^4.0.0",
+      "gulp-tape": "0.0.9",
+      "is-ci": "^1.0.10",
+      "nodemon": "^1.14.11",
+      "pre-commit": "1.2.2",
+      "spectron": "3.8.0",
+      "tap-colorize": "^1.2.0",
+      "tape": "^4.8.0",
+      "xo": "0.18.2"
+    },
+    "xo": {
+      "parserOptions": {
+        "sourceType": "script",
+        "ecmaFeatures": {
+          "globalReturn": true
+        }
+      },
+      "esnext": true,
+      "overrides": [
+        {
+          "files": "app*/**/*.js",
+          "rules": {
+            "max-lines": [
+              "warn",
+              {
+                "max": 600,
+                "skipBlankLines": true,
+                "skipComments": true
+              }
+            ],
+            "no-warning-comments": 0,
+            "object-curly-spacing": 0,
+            "capitalized-comments": 0,
+            "no-else-return": 0,
+            "no-path-concat": 0,
+            "no-alert": 0,
+            "guard-for-in": 0,
+            "prefer-promise-reject-errors": 0,
+            "import/no-unresolved": 0,
+            "import/no-extraneous-dependencies": 0,
+            "no-prototype-builtins": 0
+          }
+        }
+      ],
+      "ignore": [
+        "tests/*.js",
+        "tools/locale-helper/*.js"
+      ],
+      "envs": [
+        "node",
+        "browser",
+        "mocha"
+      ]
    }
-   }
-  ],
-  "ignore": [
-   "tests/e2e/*.js",
-   "tools/locale-helper/*.js"
-  ],
-  "envs": [
-   "node",
-   "browser",
-   "mocha"
-  ]
- }
-}
+  }
Author	SHA1	Message	Date
Akash Nimare	92f0e46927	New beta release v2.5.0.	2019-03-01 18:51:38 +05:30
Rhythm Sharma	a0dd3832c2	settings: Shorcut section horizontal alignment fix.	2019-02-18 17:11:27 +05:30
ViPuL	a2e84595c9	pdf-viewer: disable pdf-viewer window. Disable the pdf window for now since this is broken in v3 of electron. Fixes #640.	2019-02-09 14:04:50 +05:30
Kanishk Kakar	9e33ebae62	context-menu: Fix context menu indexing. Addresses a problem where the context menu would get the incorrect index of server in sidebar and cause a crash when attempting to remove the server. Add comment justifying extra index parameter.	2019-01-30 12:22:36 +05:30
Abhigyan Khaund	9bdc5dd9e4	certificate: Use path.basename to get certificate file name.	2019-01-24 11:15:40 +05:30
Puneeth Chaganti	ac89ac1cb4	Browser-window: Change the window title to contain active Realm's name.	2019-01-23 13:35:18 +05:30
Abhigyan Khaund	31da1131a4	certificate: Use path.sep for path separator to support Windows. Fixes the certificate path issue on Windows.	2019-01-21 21:44:23 +05:30
Priyank Patel	4980c71e5a	notification: Ensure backward compatibilty when using narrow.by_topic. We should ensure backward compatibilty when using narrow.by_topic since the recent rename in the webapp of the function narrow.by_subject to narrow.by_topic is only in master and not in any stable release yet it could break the notification function for many people. Furthermore this ensure general backward-compatibilty.	2019-01-08 21:57:13 +05:30
Akash Nimare	3e73511357	notification: Fix reply from notification. The function "by_subject" is now being updated to the "by_topic" in the webapp. Fixes: #624.	2019-01-08 11:30:57 +05:30
Akash Nimare	5f23c8570b	security: Update dependencies to fix minor dev security alerts.	2019-01-07 18:10:41 +05:30
Akash Nimare	12f79e18a1	test: Update test config files.	2019-01-07 12:27:20 +05:30
Akash Nimare	ad7f760444	windows: Install per user on Windows. The official docs of the electron-builder says to install the app per user on a particular system instead of all users.	2019-01-07 12:21:16 +05:30
Kanishk Kakar	7314c1f1dd	context-menu: Fix Context Menu not working properly. This fixes a case where the context menu doesn't work as expected. This used to happen when we show the character icon. Fixes: #608.	2018-12-30 20:48:38 +05:30
Akash Nimare	46c3d352a1	release: 🎉 new release v2.4.0.	2018-12-24 23:11:01 +05:30
Akash Nimare	cef8eadc8f	sentry: Update electron-sentry to v0.14.0.	2018-12-24 23:08:49 +05:30
Akash Nimare	d3f742719c	builder: Update electron builder to v20.38.4. Also, updated electron-updater to v4.0.6. Fixes: #618.	2018-12-24 20:17:18 +05:30
Priyank Patel	171d88755c	electron: Update electron to v3.0.10. * dependecies: Upgrade electron to v3.0.10. This also makes sure we don't pass properties on this.tabs that makes ipcRenderer crash on v3.x.x. * tray: Use new way for using nativeImage.createFromBuffer. The previous way of passing scaleFactor as a second argument is now deprecated and will be a breaking change in 4.0 * app: Use new requestSingleInstanceLock api and remove deceprated makeSingleInstance. * Update node-mac-notifier to v1.1.0.	2018-12-22 19:44:44 +05:30
ThePiyushGupta	09ac1bd338	setting: Minimize to tray on startup. This hides the taskbar icon if the start to minimized setting is turned on. Fixes: #565.	2018-12-22 19:19:24 +05:30
Akash Nimare	48dd12b738	request: Send user-agent with request. We now send the user-agent with the request. Fixes #611.	2018-12-19 12:23:18 +05:30
Akash Nimare	61bbd1cf22	electron: Update electron to v2.0.15.	2018-12-17 13:25:34 +05:30
Akash Nimare	bf722da390	git: Ignore unnecessary binary files.	2018-12-12 15:42:59 +05:30
Akash Nimare	c24f5b3e45	lint: Add eol for linebreaks on windows.	2018-12-10 18:36:44 +05:30
Akash Nimare	3d0f4d88af	settings: Increase width of add a new org button.	2018-12-07 15:05:11 +05:30
Akash Nimare	a2f412c3de	Improve wording of adding a new org button.	2018-12-06 18:14:55 +05:30
Akash Nimare	08559c2f4a	setting: Improve organization page. This adds a new button in the connected organization page by which a user can quickly add a new Zulip organization. Fixes: #607.	2018-12-05 23:00:07 +05:30
Akash Nimare	1f4509a6d2	codebase: Fix a typo.	2018-12-05 20:01:44 +05:30
Akash Nimare	06c8b2e8a2	context-menu: Fix context menu not working on adding new org. Two changes - * Fixes the context menu not working on adding a new org. This is because previously the context menu listner only called when loading the app. Updated the same to fix the issue. * Refactor the codebase for left-sidebar. Improves #599.	2018-12-05 19:55:56 +05:30
Kanishk Kakar	2aa15ee11a	context-menu: Add context menu in left sidebar. This adds a context menu in the left sidebar. For now, there is one sub-item called - Disconnect organization by which a user can delete an added org from the app. Fixes: #599.	2018-12-05 19:42:47 +05:30
Akash Nimare	3c676672ec	shortcut: Document show sidebar shortcut properly. Fixes: #606.	2018-12-05 13:42:40 +05:30
Abhigyan Khaund	c937317ecf	domain-util: Include certificates in all requests for icon. Fixes: #463.	2018-12-05 12:43:34 +05:30
Akash Nimare	44dceda50e	dependency: Update electron-window-state to v5.0.3. Fixes: #231.	2018-11-30 21:37:02 +05:30
Akash Nimare	e1407cb6f7	dependency: Update electron-window-state to v5.0.2.	2018-11-22 20:37:19 +05:30
Michel Tomas	6899a6bc20	network: Fix `request` ecdhCurve mismatch errors. The HTTP Node now uses auto for ecdhCurve for SSL connections. This fixes the SSL handshake error while connecting to some Zulip instances. Setting the ecdhCurve to auto is the recommended method for Node > 8.5, more info here - https://github.com/nodejs/node/issues/16196 Fixes: #594.	2018-11-19 16:11:23 +05:30
Akash Nimare	925fec71d5	Add release notes for v2.3.82.	2018-11-05 00:24:25 +05:30
Akash Nimare	f847c565f9	menu: Update menu items on setting page. This PR adds a functionality to update the menu items. Some menu items like logout, shortcut etc are not needed on setting page. We can control the same using this flag. Fixes: #587.	2018-10-28 15:11:40 +05:30
Kanishk Kakar	c2a380d308	setting: Disable beta updates if auto updates disabled. * Disable beta updates if auto updates disabled	2018-10-27 23:22:14 +05:30
Akash Nimare	ac6b206583	sentry: Update sentry to v0.12.1.	2018-10-24 19:27:38 +05:30
Akash Nimare	988405c665	dependency: Update node-json-db to v0.9.1.	2018-10-24 14:07:07 +05:30
Akash Nimare	a209804692	setting: Set custom css to false by default.	2018-10-23 15:09:28 +05:30
Akash Nimare	95c4df1898	network: Fix typo in network error message.	2018-10-23 14:56:56 +05:30
Rishi Gupta	1048c91d9e	about: Remove Found bug button.	2018-10-21 05:05:44 +05:30
Akash Nimare	d723c5cd1c	proxy: Do not reload app when turning off the SPS setting.	2018-10-17 16:58:26 +05:30
Akash Nimare	dcc7cd118c	release: 🎉 new release v2.3.82.	2018-10-11 21:53:25 +05:30
Abhigyan Khaund	d2649dd5d7	native-menus: Add tools submenu and reword a few options. Check for Updates → Move to Tools Reset App Settings → Move to Tools, rename “Factory reset” Both Dev Tools → Move to Tools Download App Logs → Move to Tools What’s new → Move to Tools, and rename “Release notes”.	2018-10-10 13:53:25 +05:30
Akash Nimare	25e6f6d482	sentry: Update Sentry to v0.11.0. This could potentially fix #577 since the issue is caused by Sentry.	2018-10-09 13:51:12 +05:30
Akash Nimare	bd805b8324	native-menus: Rename a few options of the submenus.	2018-10-07 19:17:31 +05:30
Abhigyan Khaund	e1d98e0d8e	native-menus: Rename a few options of the submenus.	2018-10-07 17:41:57 +05:30
Akash Nimare	89e5d2892b	readme: Replace the word team with organizations.	2018-10-04 00:37:49 +05:30
Akash Nimare	ab28b56377	tray: Remove about menu item and rename focus.	2018-10-03 20:47:24 +05:30
Abhigyan Khaund	71aa7e28ba	readme: Replace word team with organizations.	2018-10-02 13:50:57 +05:30
Akash Nimare	ba2bfba459	settings: Rename custom css section.	2018-10-01 18:10:40 +05:30
Akash Nimare	d181b0c2e5	settings: Move custom css section to advanced.	2018-10-01 18:07:20 +05:30
Akash Nimare	bda5c62928	settings: Put shortcut tip on the top.	2018-10-01 17:53:11 +05:30
Akash Nimare	b2b4fd1003	settings: UI fixes in general settings.	2018-09-28 21:03:49 +05:30
Akash Nimare	19770f5fbf	settings: Update wordings of org settings.	2018-09-28 13:28:47 +05:30
Akash Nimare	4592396c4b	settings: Update wordings of general settings.	2018-09-28 13:18:06 +05:30
Akash Nimare	19d3c0f5b5	left-sidebar: Update the border-radius of org icon. Org icon now have rounded squares. Fixes: #574.	2018-09-28 13:06:19 +05:30
Akash Nimare	af87789c7f	feedback: Upgrade send feedback to latest.	2018-09-27 19:43:18 +05:30
Priyank Patel	36e710dbfe	gitattributes: Mark package-lock.json files binary. So they don't show up during `git diff`.	2018-09-26 20:46:36 -04:00
Priyank Patel	a6e1c93d81	dependencies: Upgrade send-feedback module to v1.0.8. Fixes: https://github.com/zulip/zulip-electron/issues/569	2018-09-26 20:46:36 -04:00
Akash Nimare	684d88dd7f	menus: Rename a few menu items.	2018-09-26 13:44:51 +05:30
Akash Nimare	45aedbd9db	tray: Add a separator in tray before quit item.	2018-09-26 13:44:01 +05:30
Akash Nimare	6f411a819c	menu: Remove whitespace from app version.	2018-09-26 12:27:09 +05:30
Rishi Gupta	097738332b	tray: Remove separators.	2018-09-25 12:43:32 -07:00
Rishi Gupta	b777f8a50f	menus: Rename a few menu items.	2018-09-25 09:51:01 -07:00
Akash Nimare	50f06239bb	Add release notes for v2.3.8.	2018-09-25 18:58:19 +05:30
Akash Nimare	94cbc786d6	release: 🎉 new release v2.3.8.	2018-09-24 16:45:50 +05:30
Akash Nimare	75abf38515	sentry: Update Sentry to v0.10.1.	2018-09-24 16:45:50 +05:30
Akash Nimare	c1af019182	sentry: Add ignore errors to sentry configuration. We could ignore the validate realm error since it's harmless and we know the reason behind this. It mostly comes from the console logs. This is a temp solution until Sentry supports disabling the console logs.	2018-09-24 16:43:32 +05:30
Akash Nimare	1ea8aea22a	sentry: Update Sentry to v0.9.0.	2018-09-21 14:50:47 +05:30
Akash Nimare	a7e418885a	Merge branch 'master' of github.com:zulip/zulip-electron	2018-09-20 23:11:19 +05:30
Akash Nimare	0ac823c85b	Update package-lock.json.	2018-09-20 23:10:47 +05:30
Akash Nimare	1096188ddf	Add v2.3.7-beta release notes.	2018-09-20 23:06:49 +05:30
Akash Nimare	8d0b68316c	menubar: Auto hide menubar on Windows/Linux. Fixes: #563.	2018-09-19 15:09:39 +05:30
Akash Nimare	c45ad7096f	menubar: Document auto-hide menubar setting.	2018-09-18 17:59:51 +05:30
Akash Nimare	5ca7937e52	menubar: Fix menubar not hiding properly.	2018-09-18 17:36:55 +05:30
Akash Nimare	481b99a2ab	menubar: Fix a bug in menubar settings.	2018-09-18 13:47:16 +05:30
Akash Nimare	7eb4adf722	menubar: Update menubar on changing the autoHideMenubar setting.	2018-09-18 13:41:47 +05:30
Akash Nimare	4d21a8f8d8	menubar: Auto hide menubar on Windows/Linux. This PR adds a setting option to auto hide the menubar. Fixes: #563.	2018-09-18 12:32:23 +05:30
Akash Nimare	94270af265	settings: Minor changes in font-color.	2018-09-17 21:30:50 +05:30
Akash Nimare	177bff6113	UI: Clean up design of setting page. This commit cleans up the design of setting page and remove the inconsistency in the page design. Few changes - * Update the border-radius to 4px for all the buttons * Better button UI * Improve the layout of the setting page * Cleaner toggle switch	2018-09-17 16:42:23 +05:30
Akash Nimare	b4fa4cacb6	electron: Update electron to v2.0.9.	2018-09-14 22:47:38 +05:30
Akash Nimare	06abf6716a	Add dev into master.	2018-09-14 19:19:19 +05:30
Priyank Patel	0ad4ea4fdf	left-sidebar: Add initial character of Realm Name instead of default icon. This PR adds a feature for showing the first char of realm name as the server icon when the icon fails to load for some reasons.	2018-09-14 18:18:45 +05:30
Akash Nimare	2ece432d19	Linux: Add label for help menu item.	2018-09-13 14:31:36 +05:30
Akash Nimare	10cd7850ca	linux: Fix ALT+SHIFT opening menu items on Linux. It's an upstream bug where if you press ALT+SHIFT on Linux, it opens up the app menu items. The fix is adding the & to all the menu labels. Fixes: #528.	2018-09-13 13:13:18 +05:30
bemyak	86e3d06e52	Improve tray icon behavior.	2018-09-12 18:25:55 +05:30
Abhigyan Khaund	6ebc9acbf4	realm name: Update sidebar realm name when it's changed in webapp. This commit updates the realm name in the sidebar tooltip, domains.json and Window menu when it is updated in the server through electron_bridge. This commit also removes the server.alias parameter from the tooltip onHover function and inserts it in the innerHTML of the tooltip DOM. Fixes: #425	2018-09-11 21:03:33 +05:30
Akash Nimare	278dc686e1	file-attachments: Allow multiple downloads of same file name. Previous flow used to overwrite the file if it has the same name. Current flow is same as what Chrome uses (though we use timestamp in the file name rather than increaments). Fixes: #558.	2018-09-10 17:49:09 +05:30
Akash Nimare	cec98c030e	lint-xo: Update the max lines in a file.	2018-09-07 01:26:05 +05:30
Akash Nimare	f10d6eb115	setting: Update silent setting option. Correctly update the audio of the webview on toogle-silent event.	2018-09-07 01:23:17 +05:30
Akash Nimare	8c5e928e9c	settings: Clean up toggle sidebar setting. This removes the two copies of the same toggle-sidebar ipc event.	2018-09-07 01:20:49 +05:30
Akash Nimare	8d142c8c3f	ipc: Move IPC listners to different function. Those IPCs were wrongly put in the activateTab function.	2018-09-07 00:56:19 +05:30
Akash Nimare	a09769c560	release: 🎉 new beta release v2.3.7-beta.	2018-09-03 15:30:35 +05:30
Abhigyan Khaund	bb99015fd2	config-util: Use package reload instead of custom reload. This is a WIP commit to fix the errors while saving settings that occur from reloadDB function.	2018-09-03 15:25:07 +05:30
Akash Nimare	24f5c9b226	builder: Update electron-builder to v20.28.3.	2018-09-03 15:25:07 +05:30
Akash Nimare	dc6c4be5fe	updater: Update electron-updater to v3.1.2.	2018-09-03 15:25:07 +05:30
Akash Nimare	50647e330b	server-name: Unescape server name in window menu item. Escaping is necessary to avoid any security risk but we need to unescape those strings in order to show them in the frontend otherwise it will have ugly special characters. We already escape server name in the db and unesacoe it in the left-sidebar. This PR adds the decodeString function in order to unescape strings in the menu items. Fixes: #554.	2018-09-03 15:20:02 +05:30
Rishi Gupta	73dc3db436	readme: Add tray/dock integration to features.	2018-09-01 23:15:39 +05:30
Akash Nimare	09cf21bf49	pdf-viewer: Hide menubar in pdf window. We don't want to show the menubar in a pdf window so setting it to null.	2018-08-30 21:32:31 +05:30
Akash Nimare	c30d0cc77b	Add Zulip chat badge.	2018-08-30 17:40:42 +05:30
Rishi Gupta	872ad4d3e7	Update README.md.	2018-08-30 17:38:07 +05:30
Akash Nimare	6fd9e1be8b	pdf-viewer: Add a feature to show the pdf files. This adds a feature of showing the pdf attachments in a new window so that a user can quickly view the same. Fixes: #547.	2018-08-29 23:19:38 +05:30
Harmon	76c7f24161	settings: Update reference to toggle sidebar shortcut in general section.	2018-08-27 08:49:48 -07:00
Akash Nimare	f9c270492c	Fix a typo in changelog.	2018-08-27 15:00:09 +05:30
Akash Nimare	371c580934	Add v2.3.6 release notes.	2018-08-27 14:59:11 +05:30
Akash Nimare	3eec4c2209	release: 🎉 new release v2.3.6.	2018-08-23 20:10:18 +05:30
Akash Nimare	debbfb6b7d	electron: Update electron to v2.0.8.	2018-08-23 18:56:36 +05:30
Akash Nimare	8bd1492586	left-sidebar: Do not escape realm name. We escape the realm name whenever user adds a realm + on app startup. That's why we don't need to do the double escaping for already added servers. Fixes: #541.	2018-08-23 18:48:06 +05:30
Akash Nimare	1115c6d5c3	docs: Remove help docs from the repo. Content is now maintained in the /help docs. Fixes: #543.	2018-08-23 12:32:25 +05:30
Abhigyan Khaund	9ba279213c	proxy: Add proxy details in request module parameters. This commit adds proxy details to request module paramters from the proxyRules so that the request module can use these rules while sending a request. In case of no system proxy, set environment variable NO_PROXY to handle all links. Fixes: #534.	2018-08-21 00:26:37 +05:30
Akash Nimare	89c35cb1d4	electron: Update electron to v2.0.7.	2018-08-17 14:16:00 +05:30
Akash Nimare	21d6eb52c5	sentry: Update Sentry to v0.8.1. This fixes the youtube video not playing in the lightbox issue. Youtube video stopped playing in the lightbox when we added the Sentry support. The exact reason behind the issue is still unknown but we're guessing that previous version of Sentry doesn't exit process on oncaught errors which might have caused lightbox to break. The issue was fixed in the latest release of the Sentry v0.8.1. Fixes: #537.	2018-08-14 18:02:10 +05:30
Akash Nimare	aa1538837b	Add v2.3.5 release notes.	2018-08-03 17:39:48 +05:30