echo commit range on travis.

ci: Add commit linter and clean up code.
gitlint: Setup commit linter.
2025-10-27 01:53:45 +00:00 · 2018-01-30 22:46:52 +05:30 · 2018-01-30 11:07:41 -05:00 · 2018-01-30 08:58:19 -05:00
35 changed files with 1031 additions and 3958 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,13 @@ cache:
  - app/node_modules

 script:
- npm run travis
+  - echo $TRAVIS_COMMIT_RANGE
+  - echo ${TRAVIS_COMMIT_RANGE/.../..}
+  - echo "test"
+  - git log -4
+  - node ./tools/gitlint --ci-mode
+  - npm run travis
+
 notifications:
  webhooks:
    urls:
--- a/app/main/autoupdater.js
+++ b/app/main/autoupdater.js
@@ -11,12 +11,6 @@ function appUpdater() {
 		return;
 	}

-	if (process.platform === 'linux' && !process.env.APPIMAGE) {
-		const { linuxUpdateNotification } = require('./linuxupdater');
-		linuxUpdateNotification();
-		return;
-	}
-
 	// Create Logs directory
 	const LogsDir = `${app.getPath('userData')}/Logs`;

--- a/app/main/index.js
+++ b/app/main/index.js
@@ -166,11 +166,10 @@ app.on('ready', () => {
 		crashHandler();
 	});

-	// Temporarily remove this event
-	// electron.powerMonitor.on('resume', () => {
-	// 	mainWindow.reload();
-	// 	page.send('destroytray');
-	// });
+	electron.powerMonitor.on('resume', () => {
+		mainWindow.reload();
+		page.send('destroytray');
+	});

 	ipcMain.on('focus-app', () => {
 		mainWindow.show();
@@ -222,6 +221,11 @@ app.on('ready', () => {
 		appMenu.setMenu(props);
 	});

+	ipcMain.on('register-server-tab-shortcut', (event, index) => {
+		// Array index == Shown index - 1
+		page.send('switch-server-tab', index - 1);
+	});
+
 	ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
 		setAutoLaunch(AutoLaunchValue);
 	});
--- a/app/main/linuxupdater.js
+++ b/app/main/linuxupdater.js
@@ -1,42 +0,0 @@
-const { app } = require('electron');
-const { Notification } = require('electron');
-
-const request = require('request');
-const semver = require('semver');
-const ConfigUtil = require('../renderer/js/utils/config-util');
-const LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
-
-function linuxUpdateNotification() {
-	let	url = 'https://api.github.com/repos/zulip/zulip-electron/releases';
-	url = ConfigUtil.getConfigItem('betaUpdate') ? url : url + '/latest';
-
-	const options = {
-		url,
-		headers: {'User-Agent': 'request'}
-	};
-
-	request(options, (error, response, body) => {
-		if (error) {
-			console.log('Error:', error);
-			return;
-		}
-		if (response.statusCode < 400) {
-			const data = JSON.parse(body);
-			const latestVersion = ConfigUtil.getConfigItem('betaUpdate') ? data[0].tag_name : data.tag_name;
-
-			if (semver.gt(latestVersion, app.getVersion())) {
-				const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
-				if (notified === null) {
-					new Notification({title: 'Zulip Update', body: 'A new version ' + latestVersion + ' is available. Please update using your package manager.'}).show();
-					LinuxUpdateUtil.setUpdateItem(latestVersion, true);
-				}
-			}
-		} else {
-			console.log('Status:', response.statusCode);
-		}
-	});
-}
-
-module.exports = {
-	linuxUpdateNotification
-};
--- a/app/main/menu.js
+++ b/app/main/menu.js
@@ -10,8 +10,6 @@ const ConfigUtil = require(__dirname + '/../renderer/js/utils/config-util.js');

 const appName = app.getName();

-const i18n = require(__dirname + '/../translations/i18n');
-
 class AppMenu {
 	getHistorySubmenu() {
 		return [{
@@ -117,33 +115,26 @@ class AppMenu {
 	}

 	getHelpSubmenu() {
-		return [
-			{
-				label: `${appName + ' Desktop-'} v${app.getVersion()}`,
-				enabled: false
-			},
-			{
-				label: `${appName} Help`,
-				click() {
-					shell.openExternal('https://zulipchat.com/help/');
-				}
-			}, {
-				label: 'Show App Logs',
-				click() {
-					shell.openItem(app.getPath('userData'));
-				}
-			}, {
-				label: 'Report an Issue...',
-				click() {
-					const body = `
+		return [{
+			label: `${appName} Website`,
+			click() {
+				shell.openExternal('https://zulipchat.com/help/');
+			}
+		}, {
+			label: `${appName + ' Desktop'} - ${app.getVersion()}`,
+			enabled: false
+		}, {
+			label: 'Report an Issue...',
+			click() {
+				const body = `
 					<!-- Please succinctly describe your issue and steps to reproduce it. -->
 					-
 					${app.getName()} ${app.getVersion()}
 					Electron ${process.versions.electron}
 					${process.platform} ${process.arch} ${os.release()}`;
-					shell.openExternal(`https://github.com/zulip/zulip-electron/issues/new?body=${encodeURIComponent(body)}`);
-				}
-			}];
+				shell.openExternal(`https://github.com/zulip/zulip-electron/issues/new?body=${encodeURIComponent(body)}`);
+			}
+		}];
 	}

 	getWindowSubmenu(tabs, activeTabIndex) {
@@ -159,11 +150,6 @@ class AppMenu {
 				type: 'separator'
 			});
 			for (let i = 0; i < tabs.length; i++) {
-				// Do not add functional tab settings to list of windows in menu bar
-				if (tabs[i].props.role === 'function' && tabs[i].webview.props.name === 'Settings') {
-					continue;
-				}
-
 				initialSubmenu.push({
 					label: tabs[i].webview.props.name,
 					accelerator: tabs[i].props.role === 'function' ? '' : `${ShortcutKey} + ${tabs[i].props.index + 1}`,
@@ -173,7 +159,7 @@ class AppMenu {
 							AppMenu.sendAction('switch-server-tab', tabs[i].props.index);
 						}
 					},
-					type: 'checkbox'
+					type: 'radio'
 				});
 			}
 		}
@@ -196,7 +182,7 @@ class AppMenu {
 			}, {
 				type: 'separator'
 			}, {
-				label: 'Desktop App Settings',
+				label: 'Settings',
 				accelerator: 'Cmd+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -205,7 +191,7 @@ class AppMenu {
 				}
 			}, {
 				label: 'Keyboard Shortcuts',
-				accelerator: 'Cmd+Shift+K',
+				accelerator: 'Cmd+K',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -248,15 +234,15 @@ class AppMenu {
 		}, {
 			label: 'Edit',
 			submenu: [{
-				role: 'undo', label: i18n._('Undo')
+				role: 'undo'
 			}, {
-				role: 'redo', label: i18n._('Redo')
+				role: 'redo'
 			}, {
 				type: 'separator'
 			}, {
-				role: 'cut', label: i18n._('Cut')
+				role: 'cut'
 			}, {
-				role: 'copy', label: i18n._('Copy')
+				role: 'copy'
 			}, {
 				role: 'paste'
 			}, {
@@ -296,7 +282,7 @@ class AppMenu {
 			}, {
 				type: 'separator'
 			}, {
-				label: 'Desktop App Settings',
+				label: 'Settings',
 				accelerator: 'Ctrl+,',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
@@ -307,7 +293,7 @@ class AppMenu {
 				type: 'separator'
 			}, {
 				label: 'Keyboard Shortcuts',
-				accelerator: 'Ctrl+Shift+K',
+				accelerator: 'Ctrl+K',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						AppMenu.sendAction('shortcut');
@@ -336,11 +322,11 @@ class AppMenu {
 				accelerator: 'Ctrl+Q'
 			}]
 		}, {
-			label: i18n.__('Edit'),
+			label: 'Edit',
 			submenu: [{
-				role: 'undo', label: i18n.__('Undo')
+				role: 'undo'
 			}, {
-				role: 'redo', label: i18n.__('Redo')
+				role: 'redo'
 			}, {
 				type: 'separator'
 			}, {
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "zulip",
-  "version": "1.8.1",
+  "version": "1.7.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -23,20 +23,6 @@
        "nan": "2.8.0"
      }
    },
-    "@sindresorhus/is": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
-    },
-    "aggregate-error": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz",
-      "integrity": "sha1-iINE2tAiCnLjr1CQYRf0h3GSX6w=",
-      "requires": {
-        "clean-stack": "1.3.0",
-        "indent-string": "3.2.0"
-      }
-    },
    "ajv": {
      "version": "4.11.8",
      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
@@ -151,43 +137,32 @@
        "concat-map": "0.0.1"
      }
    },
-    "cacheable-request": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
-      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+    "builder-util-runtime": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-3.2.0.tgz",
+      "integrity": "sha512-VRvyyLiZZSBjcUTqEsHlBJSK0s6uVQChO7kbmVeU6QmSJ7TtsotNQELO6lbahwZMAQ4Z/haCKhlLBDdhW+3aqA==",
      "requires": {
-        "clone-response": "1.0.2",
-        "get-stream": "3.0.0",
-        "http-cache-semantics": "3.8.1",
-        "keyv": "3.0.0",
-        "lowercase-keys": "1.0.0",
-        "normalize-url": "2.0.1",
-        "responselike": "1.0.2"
+        "bluebird-lst": "1.0.5",
+        "debug": "3.1.0",
+        "fs-extra-p": "4.4.4",
+        "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==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
      }
    },
-    "capture-stack-trace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
-    },
    "caseless": {
      "version": "0.12.0",
      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
    },
-    "clean-stack": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz",
-      "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE="
-    },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "requires": {
-        "mimic-response": "1.0.0"
-      }
-    },
    "co": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -211,14 +186,6 @@
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
    },
-    "create-error-class": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-      "requires": {
-        "capture-stack-trace": "1.0.0"
-      }
-    },
    "cryptiles": {
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
@@ -250,19 +217,6 @@
        "ms": "2.0.0"
      }
    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
-    },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "requires": {
-        "mimic-response": "1.0.0"
-      }
-    },
    "deep-equal": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
@@ -273,28 +227,6 @@
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
    },
-    "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-      "requires": {
-        "ip": "1.1.5",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "dns-socket": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz",
-      "integrity": "sha512-/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng==",
-      "requires": {
-        "dns-packet": "1.3.1"
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
-    },
    "ecc-jsbn": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -347,63 +279,19 @@
      }
    },
    "electron-updater": {
-      "version": "2.18.2",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.18.2.tgz",
-      "integrity": "sha512-Kl7zK2E5R/EBYZapDUxWEHDE/ybD+Gw9gheqIy4uVSeKWjkkQkit/QpPOK8LaQwbXD5vDawp6lrB7Z0Yoacd2A==",
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-2.16.2.tgz",
+      "integrity": "sha512-gv1kezjdXR6sw266aTzfs7HgPO5vaf5TsBFh7kMi47JABAIJSO3n+U79pSBperPVtGdqWQ4WfM6+2irrFvYXLw==",
      "requires": {
        "bluebird-lst": "1.0.5",
-        "builder-util-runtime": "4.0.5",
+        "builder-util-runtime": "3.2.0",
        "electron-is-dev": "0.3.0",
-        "fs-extra-p": "4.5.0",
+        "fs-extra-p": "4.4.4",
        "js-yaml": "3.10.0",
-        "lazy-val": "1.0.3",
+        "lazy-val": "1.0.2",
        "lodash.isequal": "4.5.0",
-        "semver": "5.4.1"
-      },
-      "dependencies": {
-        "builder-util-runtime": {
-          "version": "4.0.5",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz",
-          "integrity": "sha512-NT8AxWH6miZQHnZzaTVjVp1uc6C/mWlxi6GQXKpd4CwyTQd3rT7+poOGrcOhtIiHYCL9VEbRsVfxUAPPsgqJdg==",
-          "requires": {
-            "bluebird-lst": "1.0.5",
-            "debug": "3.1.0",
-            "fs-extra-p": "4.5.0",
-            "sax": "1.2.4"
-          }
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "fs-extra": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.1"
-          }
-        },
-        "fs-extra-p": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.5.0.tgz",
-          "integrity": "sha512-V/sdZmV+Yx3+nfXmjRTdBP4mVWCt7hZ0+ZOv+IZo+6fdkBxafaGsI7mYeNv/J3rWyz+mIToCFQORFSwt1bZw8Q==",
-          "requires": {
-            "bluebird-lst": "1.0.5",
-            "fs-extra": "5.0.0"
-          }
-        },
-        "lazy-val": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.3.tgz",
-          "integrity": "sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg=="
-        }
+        "semver": "5.4.1",
+        "source-map-support": "0.5.0"
      }
    },
    "electron-window-state": {
@@ -467,13 +355,23 @@
        "mime-types": "2.1.17"
      }
    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+    "fs-extra": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
+      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.4"
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.1"
+      }
+    },
+    "fs-extra-p": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.4.4.tgz",
+      "integrity": "sha512-zHsMNJWhXD184QfHKEIFSQSgAFNV7v9J+Nt2XpaLZp2nTz6WxZNV+R4G2uYeGeLTMaKvUZiqGKrH/4iFCupcUA==",
+      "requires": {
+        "bluebird-lst": "1.0.5",
+        "fs-extra": "4.0.2"
      }
    },
    "fs.realpath": {
@@ -481,11 +379,6 @@
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-    },
    "getpass": {
      "version": "0.1.7",
      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -513,24 +406,6 @@
        "path-is-absolute": "1.0.1"
      }
    },
-    "got": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-      "requires": {
-        "create-error-class": "3.0.2",
-        "duplexer3": "0.1.4",
-        "get-stream": "3.0.0",
-        "is-redirect": "1.0.0",
-        "is-retry-allowed": "1.1.0",
-        "is-stream": "1.1.0",
-        "lowercase-keys": "1.0.0",
-        "safe-buffer": "5.1.1",
-        "timed-out": "4.0.1",
-        "unzip-response": "2.0.1",
-        "url-parse-lax": "1.0.0"
-      }
-    },
    "graceful-fs": {
      "version": "4.1.11",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -550,19 +425,6 @@
        "har-schema": "1.0.5"
      }
    },
-    "has-symbol-support-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
-      "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA=="
-    },
-    "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",
-      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-      "requires": {
-        "has-symbol-support-x": "1.4.1"
-      }
-    },
    "hashids": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/hashids/-/hashids-1.1.4.tgz",
@@ -584,11 +446,6 @@
      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
    },
-    "http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
-    },
    "http-signature": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
@@ -599,11 +456,6 @@
        "sshpk": "1.13.1"
      }
    },
-    "indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok="
-    },
    "inflight": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -618,93 +470,16 @@
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
    },
-    "into-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
-      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
-      "requires": {
-        "from2": "2.3.0",
-        "p-is-promise": "1.1.0"
-      }
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
-    },
-    "is-ip": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz",
-      "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=",
-      "requires": {
-        "ip-regex": "2.1.0"
-      }
-    },
-    "is-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA="
-    },
-    "is-online": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-online/-/is-online-7.0.0.tgz",
-      "integrity": "sha1-fiQIwK4efje6jVC9sjcmDTK/2W4=",
-      "requires": {
-        "got": "6.7.1",
-        "p-any": "1.1.0",
-        "p-timeout": "1.2.1",
-        "public-ip": "2.4.0"
-      }
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
-    },
-    "is-redirect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
-    },
-    "is-retry-allowed": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
    "is-typedarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
    "isstream": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
    },
-    "isurl": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
-      "requires": {
-        "has-to-string-tag-x": "1.4.1",
-        "is-object": "1.0.1"
-      }
-    },
    "js-yaml": {
      "version": "3.10.0",
      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
@@ -720,11 +495,6 @@
      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
      "optional": true
    },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
-    },
    "json-schema": {
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -783,13 +553,10 @@
        "nan": "2.8.0"
      }
    },
-    "keyv": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
-      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
-      "requires": {
-        "json-buffer": "3.0.0"
-      }
+    "lazy-val": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.2.tgz",
+      "integrity": "sha512-2BaSu6qVnicKdWQPysrffZVFAKcPcZQ/q2YyeSjAxWaJlvCvKSrkcvsSHlleeIfA//fW2goTcYDTy2cBLN7+PQ=="
    },
    "lodash.assign": {
      "version": "4.2.0",
@@ -806,11 +573,6 @@
      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
    },
-    "lowercase-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY="
-    },
    "lru-cache": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
@@ -833,11 +595,6 @@
        "mime-db": "1.30.0"
      }
    },
-    "mimic-response": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz",
-      "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4="
-    },
    "minimatch": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -896,33 +653,11 @@
        }
      }
    },
-    "normalize-url": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
-      "requires": {
-        "prepend-http": "2.0.0",
-        "query-string": "5.1.0",
-        "sort-keys": "2.0.0"
-      },
-      "dependencies": {
-        "prepend-http": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
-        }
-      }
-    },
    "oauth-sign": {
      "version": "0.8.2",
      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
    "once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -931,45 +666,6 @@
        "wrappy": "1.0.2"
      }
    },
-    "p-any": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz",
-      "integrity": "sha512-Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g==",
-      "requires": {
-        "p-some": "2.0.1"
-      }
-    },
-    "p-cancelable": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
-      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw=="
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-is-promise": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4="
-    },
-    "p-some": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz",
-      "integrity": "sha1-Zdh8ixVO289SIdFnd4ttLhUPbwY=",
-      "requires": {
-        "aggregate-error": "1.0.0"
-      }
-    },
-    "p-timeout": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
-      "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
-      "requires": {
-        "p-finally": "1.0.0"
-      }
-    },
    "path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -985,84 +681,11 @@
      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
    },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
-    },
-    "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
-    },
    "pseudomap": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
    },
-    "public-ip": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/public-ip/-/public-ip-2.4.0.tgz",
-      "integrity": "sha512-74cIy+T2cDmt+Z71AfVipH2q6qqZITPyNGszKV86OGDYIRvti1m8zg4GOaiTPCLgEIWnToKYXbhEnMiZWHPEUA==",
-      "requires": {
-        "dns-socket": "1.6.3",
-        "got": "8.1.0",
-        "is-ip": "2.0.0",
-        "pify": "3.0.0"
-      },
-      "dependencies": {
-        "got": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/got/-/got-8.1.0.tgz",
-          "integrity": "sha512-clILMRaLB1Ase3NWiSgTUrhpc951Z5V2IMtcFp8SKwu2aY+aeZZUuv/KKQmix+pz+Ov9SugLry6+JsBezHa9Vw==",
-          "requires": {
-            "@sindresorhus/is": "0.7.0",
-            "cacheable-request": "2.1.4",
-            "decompress-response": "3.3.0",
-            "duplexer3": "0.1.4",
-            "get-stream": "3.0.0",
-            "into-stream": "3.1.0",
-            "is-retry-allowed": "1.1.0",
-            "isurl": "1.0.0",
-            "lowercase-keys": "1.0.0",
-            "mimic-response": "1.0.0",
-            "p-cancelable": "0.3.0",
-            "p-timeout": "2.0.1",
-            "pify": "3.0.0",
-            "safe-buffer": "5.1.1",
-            "timed-out": "4.0.1",
-            "url-parse-lax": "3.0.0",
-            "url-to-options": "1.0.1"
-          }
-        },
-        "p-timeout": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
-          "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
-          "requires": {
-            "p-finally": "1.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-        },
-        "prepend-http": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
-        },
-        "url-parse-lax": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-          "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-          "requires": {
-            "prepend-http": "2.0.0"
-          }
-        }
-      }
-    },
    "punycode": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -1073,30 +696,6 @@
      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
    },
-    "query-string": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.0.tgz",
-      "integrity": "sha512-F3DkxxlY0AqD/rwe4YAwjRE2HjOkKW7TxsuteyrS/Jbwrxw887PqYBL4sWUJ9D/V1hmFns0SCD6FDyvlwo9RCQ==",
-      "requires": {
-        "decode-uri-component": "0.2.0",
-        "object-assign": "4.1.1",
-        "strict-uri-encode": "1.1.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-      "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==",
-      "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "2.0.0",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
-      }
-    },
    "request": {
      "version": "2.81.0",
      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
@@ -1126,14 +725,6 @@
        "uuid": "3.1.0"
      }
    },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "requires": {
-        "lowercase-keys": "1.0.0"
-      }
-    },
    "rimraf": {
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
@@ -1186,7 +777,7 @@
    "semver": {
      "version": "5.4.1",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
    },
    "sntp": {
      "version": "1.0.9",
@@ -1196,12 +787,17 @@
        "hoek": "2.16.3"
      }
    },
-    "sort-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-      "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-support": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz",
+      "integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==",
      "requires": {
-        "is-plain-obj": "1.1.0"
+        "source-map": "0.6.1"
      }
    },
    "spawn-rx": {
@@ -1241,19 +837,6 @@
        }
      }
    },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
-    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
    "stringstream": {
      "version": "0.0.5",
      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -1264,11 +847,6 @@
      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
      "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
    },
-    "timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
-    },
    "tough-cookie": {
      "version": "2.3.3",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
@@ -1306,29 +884,6 @@
      "resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz",
      "integrity": "sha1-fx8wIFWz/qDz6B3HjrNnZstl4/E="
    },
-    "unzip-response": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
-    },
-    "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "requires": {
-        "prepend-http": "1.0.4"
-      }
-    },
-    "url-to-options": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
-      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
    "uuid": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "1.8.2",
+  "version": "1.8.1",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
  "copyright": "Kandra Labs, Inc.",
@@ -32,10 +32,8 @@
    "electron-spellchecker": "1.1.2",
    "electron-updater": "2.18.2",
    "electron-window-state": "4.1.1",
-    "is-online": "7.0.0",
    "node-json-db": "0.7.3",
    "request": "2.81.0",
-    "semver": "5.4.1",
    "wurl": "2.5.0"
  },
  "optionalDependencies": {
--- a/app/renderer/css/main.css
+++ b/app/renderer/css/main.css
@@ -13,7 +13,7 @@ body {
 #content {
    display: flex;
    height: 100%;
-    background: #fff url(../img/ic_loading.gif) no-repeat;
+    background: #eee url(../img/ic_loading.gif) no-repeat;
    background-size: 60px 60px;
    background-position: center;
 }
@@ -81,18 +81,11 @@ body {
    text-rendering: optimizeLegibility;
 }

-#actions-container {
-    display: flex;
-    flex-direction: column;
-    position: fixed;
-    bottom: 0;
-    width: inherit;
-}
-
 .action-button {
    display: flex;
    flex-direction: column;
-    padding: 12px;
+    align-items: center;
+    padding: 10px;
 }

 .action-button:hover {
@@ -108,26 +101,6 @@ body {
    color: #98a9b3;
 }

-.action-button.disable {
-    opacity: 0.6;
-}
-
-.action-button.disable:hover {
-    cursor: not-allowed;
-}
-
-.action-button.disable:hover i {
-    color: #6c8592;
-}
-
-.action-button.active {
-    background-color: rgba(255, 255, 255, 0.25);
-}
-
-.action-button.active i {
-    color: #eee;
-}
-
 .tab:first-child {
    margin-top: 8px;
 }
@@ -250,7 +223,7 @@ body {

 webview {
    opacity: 1;
-    /* transition: opacity 0.3s ease-in; */
+    transition: opacity 0.3s ease-in;
    flex-grow: 1;
 }

@@ -273,7 +246,6 @@ webview:focus {

 /* Tooltip styling */

-#back-tooltip,
 #reload-tooltip,
 #setting-tooltip {
    font-family: sans-serif;
@@ -290,7 +262,6 @@ webview:focus {
    font-size: 14px;
 }

-#back-tooltip:after,
 #reload-tooltip:after,
 #setting-tooltip:after {
    content: " ";
@@ -391,4 +362,4 @@ webview:focus {
        overflow: hidden;
        opacity: 1;
    }
-}
+}
--- a/app/renderer/css/preference.css
+++ b/app/renderer/css/preference.css
@@ -12,19 +12,16 @@ body {
 }

 kbd {
-    display: inline-block;
-    border: 1px solid #ccc ;
-    border-radius: 3px;
+    padding: 0.3em 0.8em;
+    border: 1px solid #ccc;
    font-size: 15px;
    font-family: Courier New, Courier, monospace;
+    background-color: #383430;
+    color: #ededed;
+    display: inline-block;
+    margin: 0 0.1em;
    font-weight: bold;
    white-space: nowrap;
-    background-color: #f7f7f7;
-    color: #333;
-    margin: 0 0.1em;
-    padding: 0.3em 0.8em;
-    text-shadow: 0 1px 0 #fff;
-    line-height: 1.4;
 }

 table,
@@ -41,11 +38,11 @@ table {
 }

 table tr:nth-child(even) {
-    background-color: #fafafa;
+    background-color: #f7eee6;
 }

 table tr:nth-child(odd) {
-    background-color: #fff;
+    background-color: #fff8ef;
 }

 td {
@@ -337,11 +334,13 @@ i.open-tab-button {
 }

 #server-info-container {
-    min-height: calc(100% - 260px);
+    min-height: calc(100% - 235px);
 }

 #create-organization-container {
    font-size: 1.15em;
+    position: fixed;
+    bottom: 15px;
 }

 #create-organization-container i {
@@ -397,6 +396,7 @@ input.toggle-round+label:before {
    right: 2px;
    background-color: #f1f1f1;
    border-radius: 25px;
+    transition: background 0.4s;
 }

 input.toggle-round+label:after {
@@ -404,6 +404,7 @@ input.toggle-round+label:after {
    height: 25px;
    background-color: #fff;
    border-radius: 100%;
+    transition: margin 0.4s;
 }

 input.toggle-round:checked+label:before {
--- a/app/renderer/js/components/functional-tab.js
+++ b/app/renderer/js/components/functional-tab.js
@@ -16,11 +16,10 @@ class FunctionalTab extends Tab {

 	init() {
 		this.$el = this.generateNodeFromTemplate(this.template());
-		if (this.props.name !== 'Settings') {
-			this.props.$root.appendChild(this.$el);
-			this.$closeButton = this.$el.getElementsByClassName('server-tab-badge')[0];
-			this.registerListeners();
-		}
+		this.props.$root.appendChild(this.$el);
+
+		this.$closeButton = this.$el.getElementsByClassName('server-tab-badge')[0];
+		this.registerListeners();
 	}

 	registerListeners() {
--- a/app/renderer/js/components/server-tab.js
+++ b/app/renderer/js/components/server-tab.js
@@ -50,8 +50,7 @@ class ServerTab extends Tab {
 			shortcutText = `Ctrl+${shownIndex}`;
 		}

-		// Array index == Shown index - 1
-		ipcRenderer.send('switch-server-tab', shownIndex - 1);
+		ipcRenderer.send('register-server-tab-shortcut', shownIndex);

 		return shortcutText;
 	}
--- a/app/renderer/js/components/webview.js
+++ b/app/renderer/js/components/webview.js
@@ -69,18 +69,6 @@ class WebView extends BaseComponent {
 			this.props.onTitleChange();
 		});

-		this.$el.addEventListener('did-navigate-in-page', event => {
-			const isSettingPage = event.url.includes('renderer/preference.html');
-			if (isSettingPage) {
-				return;
-			}
-			this.canGoBackButton();
-		});
-
-		this.$el.addEventListener('did-navigate', () => {
-			this.canGoBackButton();
-		});
-
 		this.$el.addEventListener('page-favicon-updated', event => {
 			const { favicons } = event;
 			// This returns a string of favicons URL. If there is a PM counts in unread messages then the URL would be like
@@ -195,15 +183,6 @@ class WebView extends BaseComponent {
 		}
 	}

-	canGoBackButton() {
-		const $backButton = document.querySelector('#actions-container #back-action');
-		if (this.$el.canGoBack()) {
-			$backButton.classList.remove('disable');
-		} else {
-			$backButton.classList.add('disable');
-		}
-	}
-
 	forward() {
 		if (this.$el.canGoForward()) {
 			this.$el.goForward();
--- a/app/renderer/js/main.js
+++ b/app/renderer/js/main.js
@@ -1,7 +1,6 @@
 'use strict';

 const { ipcRenderer, remote } = require('electron');
-const isDev = require('electron-is-dev');

 const { session } = remote;

@@ -11,7 +10,6 @@ const WebView = require(__dirname + '/js/components/webview.js');
 const ServerTab = require(__dirname + '/js/components/server-tab.js');
 const FunctionalTab = require(__dirname + '/js/components/functional-tab.js');
 const ConfigUtil = require(__dirname + '/js/utils/config-util.js');
-const ReconnectUtil = require(__dirname + '/js/utils/reconnect-util.js');

 class ServerManagerView {
 	constructor() {
@@ -22,13 +20,11 @@ class ServerManagerView {
 		this.$reloadButton = $actionsContainer.querySelector('#reload-action');
 		this.$settingsButton = $actionsContainer.querySelector('#settings-action');
 		this.$webviewsContainer = document.getElementById('webviews-container');
-		this.$backButton = $actionsContainer.querySelector('#back-action');

 		this.$addServerTooltip = document.getElementById('add-server-tooltip');
 		this.$reloadTooltip = $actionsContainer.querySelector('#reload-tooltip');
 		this.$settingsTooltip = $actionsContainer.querySelector('#setting-tooltip');
 		this.$serverIconTooltip = document.getElementsByClassName('server-tooltip');
-		this.$backTooltip = $actionsContainer.querySelector('#back-tooltip');

 		this.$sidebar = document.getElementById('sidebar');

@@ -119,8 +115,6 @@ class ServerManagerView {
 			}
 			// Open last active tab
 			this.activateTab(ConfigUtil.getConfigItem('lastActiveTab'));
-			// Remove focus from the settings icon at sidebar bottom
-			this.$settingsButton.classList.remove('active');
 		} else {
 			this.openSettings('Servers');
 		}
@@ -164,9 +158,6 @@ class ServerManagerView {
 		this.$settingsButton.addEventListener('click', () => {
 			this.openSettings('General');
 		});
-		this.$backButton.addEventListener('click', () => {
-			this.tabs[this.activeTabIndex].webview.back();
-		});

 		const $serverImgs = document.querySelectorAll('.server-icons');
 		$serverImgs.forEach($serverImg => {
@@ -178,7 +169,6 @@ class ServerManagerView {
 		this.sidebarHoverEvent(this.$addServerButton, this.$addServerTooltip);
 		this.sidebarHoverEvent(this.$settingsButton, this.$settingsTooltip);
 		this.sidebarHoverEvent(this.$reloadButton, this.$reloadTooltip);
-		this.sidebarHoverEvent(this.$backButton, this.$backTooltip);
 	}

 	getTabIndex() {
@@ -217,7 +207,6 @@ class ServerManagerView {
 		this.tabs.push(new FunctionalTab({
 			role: 'function',
 			materialIcon: tabProps.materialIcon,
-			name: tabProps.name,
 			$root: this.$tabsContainer,
 			index: this.functionalTabs[tabProps.name],
 			tabIndex,
@@ -238,6 +227,7 @@ class ServerManagerView {
 				preload: false
 			})
 		}));
+
 		this.activateTab(this.functionalTabs[tabProps.name]);
 	}

@@ -247,7 +237,6 @@ class ServerManagerView {
 			materialIcon: 'settings',
 			url: `file://${__dirname}/preference.html#${nav}`
 		});
-		this.$settingsButton.classList.add('active');
 		this.tabs[this.functionalTabs.Settings].webview.send('switch-settings-nav', nav);
 	}

@@ -283,19 +272,10 @@ class ServerManagerView {
 			if (this.activeTabIndex === index) {
 				return;
 			} else if (hideOldTab) {
-				// If old tab is functional tab Settings, remove focus from the settings icon at sidebar bottom
-				if (this.tabs[this.activeTabIndex].props.role === 'function' && this.tabs[this.activeTabIndex].props.name === 'Settings') {
-					this.$settingsButton.classList.remove('active');
-				}
 				this.tabs[this.activeTabIndex].deactivate();
 			}
 		}

-		try {
-			this.tabs[index].webview.canGoBackButton();
-		} catch (err) {
-		}
-
 		this.activeTabIndex = index;
 		this.tabs[index].activate();

@@ -432,7 +412,7 @@ class ServerManagerView {
 		});

 		ipcRenderer.on('switch-server-tab', (event, index) => {
-			this.activateLastTab(index);
+			this.activateTab(index);
 		});

 		ipcRenderer.on('reload-proxy', (event, showAlert) => {
@@ -501,24 +481,9 @@ class ServerManagerView {

 window.onload = () => {
 	const serverManagerView = new ServerManagerView();
-	const reconnectUtil = new ReconnectUtil(serverManagerView);
 	serverManagerView.init();
+
 	window.addEventListener('online', () => {
-		reconnectUtil.pollInternetAndReload();
+		serverManagerView.reloadView();
 	});
-
-	window.addEventListener('offline', () => {
-		reconnectUtil.clearState();
-		console.log('No internet connection, you are offline.');
-	});
-
-	// only start electron-connect (auto reload on change) when its ran
-	// from `npm run dev` or `gulp dev` and not from `npm start` when
-	// app is started `npm start` main process's proces.argv will have
-	// `--no-electron-connect`
-	const mainProcessArgv = remote.getGlobal('process').argv;
-	if (isDev && !mainProcessArgv.includes('--no-electron-connect')) {
-		const electronConnect = require('electron-connect');
-		electronConnect.client.create();
-	}
 };
--- a/app/renderer/js/notification/helpers.js
+++ b/app/renderer/js/notification/helpers.js
@@ -3,39 +3,6 @@ const { remote } = require('electron');
 // Do not change this
 const appId = 'org.zulip.zulip-electron';

-const botsList = [];
-let botsListLoaded = false;
-
-// this function load list of bots from the server
-// sync=True for a synchronous getJSON request
-// in case botsList isn't already completely loaded when required in parseRely
-function loadBots(sync = false) {
-	const { $ } = window;
-	botsList.length = 0;
-	if (sync) {
-		$.ajaxSetup({async: false});
-	}
-	$.getJSON('/json/users')
-		.done(data => {
-			const members = data.members;
-			members.forEach(membersRow => {
-				if (membersRow.is_bot) {
-					const bot = `@${membersRow.full_name}`;
-					const mention = `@**${bot.replace(/^@/, '')}**`;
-					botsList.push([bot, mention]);
-				}
-			});
-			botsListLoaded = true;
-		})
-		.fail(error => {
-			console.log('Request failed: ', error.responseText);
-			console.log('Request status: ', error.statusText);
-		});
-	if (sync) {
-		$.ajaxSetup({async: true});
-	}
-}
-
 function checkElements(...elements) {
 	let status = true;
 	elements.forEach(element => {
@@ -74,6 +41,7 @@ const webContentsId = webContents.id;
 function focusCurrentServer() {
 	currentWindow.send('focus-webview-with-id', webContentsId);
 }
+
 // this function parses the reply from to notification
 // making it easier to reply from notification eg
 // @username in reply will be converted to @**username**
@@ -115,20 +83,6 @@ function parseReply(reply) {
 		reply = reply.replace(regex, streamMention);
 	});

-	// If botsList isn't completely loaded yet, make a synchronous getJSON request for list
-	if (botsListLoaded === false) {
-		loadBots(true);
-	}
-
-	// Iterate for every bot name and replace in reply
-	// @botname with @**botname**
-	botsList.forEach(([bot, mention]) => {
-		if (reply.includes(bot)) {
-			const regex = new RegExp(bot, 'g');
-			reply = reply.replace(regex, mention);
-		}
-	});
-
 	reply = reply.replace(/\\n/, '\n');
 	return reply;
 }
@@ -144,6 +98,5 @@ module.exports = {
 	customReply,
 	parseReply,
 	setupReply,
-	focusCurrentServer,
-	loadBots
+	focusCurrentServer
 };
--- a/app/renderer/js/notification/index.js
+++ b/app/renderer/js/notification/index.js
@@ -5,23 +5,14 @@ const {
 } = require('electron');

 const DefaultNotification = require('./default-notification');
-const { appId, loadBots } = require('./helpers');
+const { appId } = require('./helpers');

 // From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
 // On windows 8 we have to explicitly set the appUserModelId otherwise notification won't work.
 app.setAppUserModelId(appId);

 window.Notification = DefaultNotification;
-
 if (process.platform === 'darwin') {
 	const DarwinNotification = require('./darwin-notifications');
 	window.Notification = DarwinNotification;
 }
-
-window.addEventListener('load', () => {
-	// Call this function only when user is logged in
-	// eslint-disable-next-line no-undef, camelcase
-	if (page_params.realm_uri) {
-		loadBots();
-	}
-});
--- a/app/renderer/js/pages/preference/shortcuts-section.js
+++ b/app/renderer/js/pages/preference/shortcuts-section.js
@@ -109,7 +109,7 @@ class ShortcutsSection extends BaseSection {
                    <td>Enter Full Screen</td>
                  </tr>
                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>+</kbd></td>
+                    <td><kbd>${userOSKey}</kbd><kbd>=</kbd></td>
                    <td>Zoom In</td>
                  </tr>
                  <tr>
--- a/app/renderer/js/preload.js
+++ b/app/renderer/js/preload.js
@@ -41,7 +41,6 @@ document.addEventListener('DOMContentLoaded', () => {
 	if (serverLanguage) {
 		// Set spellcheker language
 		ConfigUtil.setConfigItem('spellcheckerLanguage', serverLanguage);
-
 		// Init spellchecker
 		SetupSpellChecker.init();
 	}
--- a/app/renderer/js/utils/linux-update-util.js
+++ b/app/renderer/js/utils/linux-update-util.js
@@ -1,74 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const process = require('process');
-const remote =
-	process.type === 'renderer' ? require('electron').remote : require('electron');
-const JsonDB = require('node-json-db');
-const Logger = require('./logger-util');
-
-const logger = new Logger({
-	file: 'linux-update-util.log',
-	timestamp: true
-});
-
-/* To make the util runnable in both main and renderer process */
-const { dialog, app } = remote;
-
-let instance = null;
-
-class LinuxUpdateUtil {
-	constructor() {
-		if (instance) {
-			return instance;
-		} else {
-			instance = this;
-		}
-
-		this.reloadDB();
-		return instance;
-	}
-
-	getUpdateItem(key, defaultValue = null) {
-		this.reloadDB();
-		const value = this.db.getData('/')[key];
-		if (value === undefined) {
-			this.setUpdateItem(key, defaultValue);
-			return defaultValue;
-		} else {
-			return value;
-		}
-	}
-
-	setUpdateItem(key, value) {
-		this.db.push(`/${key}`, value, true);
-		this.reloadDB();
-	}
-
-	removeUpdateItem(key) {
-		this.db.delete(`/${key}`);
-		this.reloadDB();
-	}
-
-	reloadDB() {
-		const linuxUpdateJsonPath = path.join(app.getPath('userData'), '/updates.json');
-		try {
-			const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
-			JSON.parse(file);
-		} catch (err) {
-			if (fs.existsSync(linuxUpdateJsonPath)) {
-				fs.unlinkSync(linuxUpdateJsonPath);
-				dialog.showErrorBox(
-					'Error saving update notifications.',
-					'We encountered error while saving update notifications.'
-				);
-				logger.error('Error while JSON parsing updates.json: ');
-				logger.error(err);
-			}
-		}
-		this.db = new JsonDB(linuxUpdateJsonPath, true, true);
-	}
-}
-
-module.exports = new LinuxUpdateUtil();
--- a/app/renderer/js/utils/reconnect-util.js
+++ b/app/renderer/js/utils/reconnect-util.js
@@ -1,52 +0,0 @@
-const isOnline = require('is-online');
-
-class ReconnectUtil {
-	constructor(serverManagerView) {
-		this.serverManagerView = serverManagerView;
-		this.alreadyReloaded = false;
-	}
-
-	clearState() {
-		this.alreadyReloaded = false;
-	}
-
-	pollInternetAndReload() {
-		const pollInterval = setInterval(() => {
-			this._checkAndReload()
-			.then(status => {
-				if (status) {
-					this.alreadyReloaded = true;
-					clearInterval(pollInterval);
-				}
-			});
-		}, 1500);
-	}
-
-	_checkAndReload() {
-		return new Promise(resolve => {
-			if (!this.alreadyReloaded) { // eslint-disable-line no-negated-condition
-				isOnline()
-				.then(online => {
-					if (online) {
-						if (!this.alreadyReloaded) {
-							this.serverManagerView.reloadView();
-						}
-						console.log('You\'re back online.');
-						return resolve(true);
-					}
-
-					console.log('There is no internet connection, try checking network cables, modem and router.');
-					const errMsgHolder = document.querySelector('#description');
-					errMsgHolder.innerHTML = `
-										<div>You internet connection does't seem to work properly!</div>
-										</div>Verify that it works and then click try again.</div>`;
-					return resolve(false);
-				});
-			} else {
-				return resolve(true);
-			}
-		});
-	}
-}
-
-module.exports = ReconnectUtil;
--- a/app/renderer/main.html
+++ b/app/renderer/main.html
@@ -28,10 +28,6 @@
        <i class="material-icons md-48">refresh</i>
        <span id="reload-tooltip" style="display:none">Reload</span>
      </div>
-      <div class="action-button disable" id="back-action">
-        <i class="material-icons md-48">arrow_back</i>
-        <span id="back-tooltip" style="display:none">Go Back</span>
-      </div>
      <div class="action-button" id="settings-action">
        <i class="material-icons md-48">settings</i>
        <span id="setting-tooltip" style="display:none">Settings</span>
@@ -44,4 +40,14 @@
  </div>
 </body>
 <script src="js/main.js"></script>
+
+<!-- To trigger electron.reload on changes in renderer from gulp -->
+<script>
+  window.addEventListener('load', () => {
+    const isDev = require('electron-is-dev');
+    if (isDev) {
+      require('electron-connect').client.create();
+    }
+  });
+</script>
 </html>
--- a/app/translations/de.json
+++ b/app/translations/de.json
@@ -1,4 +0,0 @@
-{
-    "Edit": "Redigera",
-    "Undo": "Ångra"
-}
--- a/app/translations/en.json
+++ b/app/translations/en.json
@@ -1,4 +0,0 @@
-{
-    "Edit": "Edit",
-    "Undo": "Undo"
-   }
--- a/app/translations/i18n.js
+++ b/app/translations/i18n.js
@@ -1,34 +0,0 @@
-const path = require('path');
-const electron = require('electron');
-const fs = require('fs');
-
-const ConfigUtil = require(__dirname + '/../renderer/js/utils/config-util.js');
-
-class i18n {
-	constructor() {
-		this.app = electron.app ? electron.app : electron.remote.app;
-		this.appLanguage = ConfigUtil.getConfigItem('spellcheckerLanguage');
-		this.appLocale = path.join(__dirname, this.appLanguage + '.json');
-
-		if (fs.existsSync(this.appLocale)) {
-			this.loadedLanguage = JSON.parse(fs.readFileSync(this.appLocale, 'utf8'));
-			console.log('translate into', this.appLanguage);
-			console.log(this.loadedLanguage);
-		} else {
-			this.loadedLanguage = JSON.parse(fs.readFileSync(path.join(__dirname, 'en.json'), 'utf8'));
-			console.log('no lang found');
-			console.log(this.loadedLanguage);
-		}
-	}
-
-	_(phrase) {
-		let translation = this.loadedLanguage[phrase];
-		if (translation === undefined) {
-			translation = phrase;
-		}
-		return translation;
-	}
-}
-
-// eslint-disable-next-line new-cap
-module.exports = new i18n();
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ os: Previous Visual Studio 2015

 cache:
  - node_modules
-  
+
 install:
  - ps: Install-Product node 6 x64
  - git reset --hard HEAD
@@ -20,5 +20,6 @@ install:
 build: off

 test_script:
+  - node ./tools/gitlint --ci-mode
  - npm run test
  - npm run test-e2e
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "1.8.2",
+  "version": "1.8.1",
  "main": "./app/main",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
@@ -17,12 +17,9 @@
  "bugs": {
    "url": "https://github.com/zulip/zulip-electron/issues"
  },
-  "engines": {
-    "node": ">=8.0.0"
-  },
  "scripts": {
-    "start": "electron app --disable-http-cache --no-electron-connect",
-    "reinstall": "./tools/reinstall-node-modules",
+    "start": "electron app --disable-http-cache",
+    "reinstall": "rm -rf node_modules; rm -rf app/node_modules; npm install",
    "postinstall": "electron-builder install-app-deps",
    "test": "xo",
    "test-e2e": "gulp test-e2e",
@@ -30,6 +27,8 @@
    "pack": "electron-builder --dir",
    "dist": "electron-builder",
    "mas": "electron-builder --mac mas",
+    "setup-gitlint-hooks": "node ./tools/gitlint/setup-gitlint-hook",
+    "lint-commits": "node ./tools/gitlint --all-commits",
    "travis": "cd ./scripts && ./travis-build-test.sh"
  },
  "pre-commit": [
@@ -110,9 +109,10 @@
  ],
  "devDependencies": {
    "assert": "1.4.1",
+    "chalk": "^2.3.0",
    "cp-file": "^5.0.0",
    "devtron": "1.4.0",
-    "electron": "1.8.2",
+    "electron": "1.7.10",
    "electron-builder": "19.53.6",
    "electron-connect": "0.6.2",
    "electron-debug": "1.4.0",
@@ -140,11 +140,7 @@
        "rules": {
          "max-lines": [
            "warn",
-            {
-              "max": 500,
-              "skipBlankLines": true,
-              "skipComments": true
-            }
+            500
          ],
          "no-warning-comments": 0,
          "object-curly-spacing": 0,
@@ -158,6 +154,12 @@
          "import/no-extraneous-dependencies": 0,
          "no-prototype-builtins": 0
        }
+      },
+      {
+        "files": "scripts/gitlint/*.js",
+        "rules": {
+          "unicorn/no-process-exit": 1
+        }
      }
    ],
    "ignore": [
--- a/scripts/travis-build-test.sh
+++ b/scripts/travis-build-test.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash

-# exit script if fails
-set -e;
-
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
    export {no_proxy,NO_PROXY}="127.0.0.1,localhost"
    export DISPLAY=:99.0
--- a/tools/fetch-pull-request.cmd
+++ b/tools/fetch-pull-request.cmd
@@ -1,23 +0,0 @@
-@echo off
-git diff-index --quiet HEAD
-if %ERRORLEVEL% NEQ 0 (
-    echo "There are uncommitted changes:"
-    git status --short
-    echo "Doing nothing to avoid losing your work."
-    exit /B 1
-)
-
-if "%~1"=="" (
-    echo "Error you must specify the PR number"
-)
-
-if "%~2"=="" ( 
-    set remote="upstream"
-) else (
-    set remote=%2
-)
-
-set request_id="%1"
-git fetch "%remote%" "pull/%request_id%/head"
-git checkout -B "review-%request_id%"
-git reset --hard FETCH_HEAD
--- a/tools/fetch-rebase-pull-request.cmd
+++ b/tools/fetch-rebase-pull-request.cmd
@@ -1,24 +0,0 @@
-@echo off
-git diff-index --quiet HEAD
-if %errorlevel% neq 0 (
-    echo "There are uncommitted changes:"
-    git status --short
-    echo "Doing nothing to avoid losing your work."
-    exit \B 1
-)
-
-if "%~1"=="" (
-    echo "Error you must specify the PR number"
-)
-
-if "%~2"=="" ( 
-    set remote="upstream"
-) else (
-    set remote=%2
-)
-
-set request_id="%1"
-git fetch "%remote%" "pull/%request_id%/head"
-git checkout -B "review-%request_id%" %remote%/master
-git reset --hard FETCH_HEAD
-git pull --rebase
--- a/tools/gitlint/ci.js
+++ b/tools/gitlint/ci.js
@@ -0,0 +1,31 @@
+const {run} = require('./helpers');
+
+module.exports = () => {
+	if (process.argv.TRAVIS !== undefined) {
+		return travis();
+	}
+
+	return appveyor();
+};
+
+function travis() {
+	if (!process.env.TRAVIS_PULL_REQUEST) {
+    // Building against master last commit
+		return run('git log -1 HEAD');
+	}
+
+	const cmd = `git log ${process.env.TRAVIS_COMMIT_RANGE}`;
+	const commitRange = run(`git diff --name-only ${process.env.TRAVIS_COMMIT_RANGE}`);
+	process.stdout.write(`COMMIT_RANGE: ${commitRange}`, 'utf8');
+	return run(cmd);
+}
+
+function appveyor() {
+	if (!process.env.APPVEYOR_PULL_REQUEST_NUMBER) {
+		return run('git log -1 HEAD');
+	}
+
+	const cmd =
+    `git log origin/master...${process.env.APPVEYOR_PULL_REQUEST_HEAD_COMMIT}`;
+	return run(cmd);
+}
--- a/tools/gitlint/helpers.js
+++ b/tools/gitlint/helpers.js
@@ -0,0 +1,91 @@
+const {spawnSync} = require('child_process');
+const chalk = require('chalk');
+
+const commitMsgRegex = /[A-Z]+.*\.$/;
+const isFullCommitRegex = /(\w|\W){1,}:\s{1}/;
+const fullCommitRegex = /(\w|\W){1,}:\s{1}[A-Z]+.*\.$/;
+
+function run(script) {
+	script = script.split(' ');
+	const cmd = script.splice(0, 1)[0];
+	const args = script;
+	const output = spawnSync(cmd, args, {
+		cwd: process.cwd(),
+		encoding: 'utf8',
+		windowsHide: true
+	}).stdout;
+
+	return output;
+}
+
+function garbageCollect(a) {
+	a.forEach((content, index) => {
+		if (content === '' || content === undefined) {
+			a.splice(index, 1);
+		}
+	});
+	return a;
+}
+
+function getAllCommits(output) {
+	output = output.split('\ncommits');
+	if (!output.length > 1) {
+		exports.error('There are no commits to lint.');
+		process.exit(1);
+	}
+
+	output = garbageCollect(output);
+	output.forEach((commit, index) => {
+		output[index] = 'commit' + commit;
+	});
+
+	return output;
+}
+
+function parseCommit(output) {
+	output = output.split('\n\n');
+
+	let commit = output[0].replace('commit ', '');
+	commit = commit.replace(/\n.*/g, '');
+	let commitHash = commit.split('');
+	commitHash = commitHash.slice(commitHash.length - 7);
+	commitHash = commitHash.join('');
+
+	const fullCommit = output[1].split('\n');
+	const commitMsg = fullCommit[0];
+	let lintingStatus = commitMsgRegex.test(commitMsg);
+	lintingStatus = (commitMsg.length <= 72);
+
+	if (lintingStatus && isFullCommitRegex(commitMsg)) {
+		lintingStatus = fullCommitRegex.test(commitMsg);
+	}
+
+	const result = {
+		failed: !lintingStatus,
+		commitHash
+	};
+	return result;
+}
+
+function logSuccess() {
+	console.log(chalk`{green commit linter:} commit linter passed.`);
+	process.exit(0);
+}
+
+function error(...args) {
+	args.unshift(chalk.red('ERROR! '));
+	console.error.apply(this, args);
+}
+
+function warn() {
+	// console.error(chalk`{yellow ${msg}}`);
+}
+
+module.exports = {
+	run,
+	getAllCommits,
+	parseCommit,
+	logSuccess,
+	error,
+	warn
+};
--- a/tools/gitlint/index.js
+++ b/tools/gitlint/index.js
@@ -0,0 +1,44 @@
+const helpers = require('./helpers');
+const getCICmd = require('./ci');
+
+let checkAllCommits = false;
+let ciMode = false;
+if (process.argv[2]) {
+	checkAllCommits = process.argv[2].includes('-a');
+	ciMode = process.argv[2] === '--ci-mode';
+}
+
+let cmd;
+if (ciMode) {
+	cmd = getCICmd();
+} else {
+	cmd =
+    checkAllCommits ? 'git log upstream/master...HEAD' : 'git log -1 HEAD';
+}
+
+const commits = helpers.run(cmd);
+const commitsArray = helpers.getAllCommits(commits);
+let lintFailed = false;
+commitsArray.forEach(commit => {
+	const res = helpers.parseCommit(commit);
+	if (res.failed) {
+		const {commitHash} = res;
+		helpers.error(`commit ${commitHash} does not pass our commit style.`);
+		lintFailed = true;
+	} else {
+		helpers.logSuccess('Commit[s] follow the zulip-electron commit rules.');
+	}
+});
+
+if (lintFailed) {
+	helpers.warn(`
+  commit msg linting failed
+  -------------------------------
+  Reasons it does not have:
+    a) capitial latter at start of message
+		b) period at the end of commit or
+		c) Commit msg length is more than 72 charaters
+	`);
+	helpers.warn('Run with --no-verify flag to skip the commit-linter');
+	process.exit(1);
+}
--- a/tools/gitlint/setup-gitlint-hook.js
+++ b/tools/gitlint/setup-gitlint-hook.js
@@ -0,0 +1,73 @@
+// This script sets up the pre-push
+// git hook which will be used to lint
+// commits
+
+const fs = require('fs');
+const path = require('path');
+
+const gitHooks = '../../.git/hooks';
+const postCommitPath = path.resolve(__dirname, `${gitHooks}/post-commit`);
+const prePushPath = path.resolve(__dirname, `${gitHooks}/pre-push`);
+
+function scriptTemplate(cmds) {
+	cmds = cmds.join('');
+	const script = [
+		'#!/bin/sh',
+		'set -e',
+		'echo running gitlint...',
+		cmds,
+		'exit $?'
+	];
+
+	return script.join('\n');
+}
+
+const postCommitFile = scriptTemplate`node scripts/gitlint`;
+const prePushFile = scriptTemplate`node scripts/gitlint --all-commits`;
+
+function writeAndChmod(file, data) {
+	fs.writeFile(file, data, err => {
+		if (err) {
+			throw err;
+		}
+
+		fs.chmod(file, '777', err => {
+			if (err) {
+				const msg =
+					'chmod post-commit, pre-push hooks, at .git/hooks 0777 so they work!';
+				console.error(msg);
+			}
+		});
+	});
+}
+
+[postCommitPath, prePushPath].forEach((file, index) => {
+	fs.open(file, 'w+', err => {
+		if (err && err.code !== 'EEXIST') {
+			throw err;
+		}
+
+		const data = index === 0 ? postCommitFile : prePushFile;
+		writeAndChmod(file, data);
+	});
+});
+
+// Remove .sample files since
+// sometimes the hooks do not work
+const postCommitSampleFile = `${postCommitPath}.sample`;
+const prePushSampleFile = `${prePushPath}.sample`;
+function removeSampleFile(file) {
+	fs.unlink(file, err => {
+		if (err) {
+			throw err;
+		}
+	});
+}
+
+[postCommitSampleFile, prePushSampleFile].forEach(file => {
+	fs.exists(file, exists => {
+		if (exists) {
+			removeSampleFile(file);
+		}
+	});
+});
--- a/tools/reinstall-node-modules
+++ b/tools/reinstall-node-modules
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-echo "Removing node_modules and app/node_modules"
-rm -rf node_modules
-rm -rf app/node_modules
-
-echo "node_modules removed reinstalling npm packages"
-npm i
--- a/tools/reinstall-node-modules.cmd
+++ b/tools/reinstall-node-modules.cmd
@@ -1,8 +0,0 @@
-@echo off
-
-echo "Removing node_modules and app/node_modules"
-rmdir /s /q node_modules
-rmdir /s /q app/node_modules
-
-echo "node_modules removed reinstalling npm packages"
-npm i
Author	SHA1	Message	Date
akashnimare	9e3cfbd887	echo commit range on travis.	2018-01-30 22:46:52 +05:30
cPhost	720f42ca80	ci: Add commit linter and clean up code.	2018-01-30 11:07:41 -05:00
cPhost	e18ba5dab6	gitlint: Setup commit linter. This will setup a commit hook that will check the commit msg run `npm run lint-commits` to check all the commits. Additionaly setup git hooks by running `npm run setup-gitlint-hooks`.	2018-01-30 08:58:19 -05:00