release: 🎉 v2.3.3.

tools: Add scripts to push/reset to pull request.
crash-reporter: Remove crash-reporter file and its use, as it is replaced by sentry.
2025-10-24 00:23:36 +00:00 · 2018-07-13 18:18:25 +05:30 · 2018-07-13 17:05:46 +05:30 · 2018-07-13 12:57:48 +05:30 · 2018-07-13 12:57:48 +05:30 · 2018-07-13 10:38:01 +05:30
18 changed files with 569 additions and 140 deletions
--- a/app/main/crash-reporter.js
+++ b/app/main/crash-reporter.js
@@ -1,16 +0,0 @@
-'use strict';
-
-const { crashReporter } = require('electron');
-
-const crashHandler = () => {
-	crashReporter.start({
-		productName: 'zulip-electron',
-		companyName: 'Kandra Labs, Inc.',
-		submitURL: 'https://zulip-sentry.herokuapp.com/crashreport',
-		uploadToServer: true
-	});
-};
-
-module.exports = {
-	crashHandler
-};
--- a/app/main/index.js
+++ b/app/main/index.js
@@ -5,7 +5,6 @@ const windowStateKeeper = require('electron-window-state');
 const isDev = require('electron-is-dev');
 const appMenu = require('./menu');
 const { appUpdater } = require('./autoupdater');
-const { crashHandler } = require('./crash-reporter');

 const { setAutoLaunch } = require('./startup');

@@ -14,6 +13,7 @@ const { app, ipcMain } = electron;
 const BadgeSettings = require('./../renderer/js/pages/preference/badge-settings.js');
 const ConfigUtil = require('./../renderer/js/utils/config-util.js');
 const ProxyUtil = require('./../renderer/js/utils/proxy-util.js');
+const { sentryInit } = require('./../renderer/js/utils/sentry-util.js');

 // Adds debug features like hotkeys for triggering dev tools and reload
 // in development mode
@@ -155,6 +155,9 @@ app.on('ready', () => {
 	});
 	mainWindow = createMainWindow();

+	// Initialize sentry for main process
+	sentryInit();
+
 	const isSystemProxy = ConfigUtil.getConfigItem('useSystemProxy');

 	if (isSystemProxy) {
@@ -176,7 +179,6 @@ app.on('ready', () => {
 		if (ConfigUtil.getConfigItem('autoUpdate')) {
 			appUpdater();
 		}
-		crashHandler();
 	});

 	// Temporarily remove this event
@@ -238,6 +240,17 @@ app.on('ready', () => {
 	ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
 		setAutoLaunch(AutoLaunchValue);
 	});
+
+	ipcMain.on('downloadFile', (event, url, downloadPath) => {
+		page.downloadURL(url);
+		page.session.once('will-download', (event, item) => {
+			const filePath = path.join(downloadPath, item.getFilename());
+			item.setSavePath(filePath);
+			item.once('done', () => {
+				page.send('downloadFileCompleted', filePath, item.getFilename());
+			});
+		});
+	});
 });

 app.on('before-quit', () => {
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -7,7 +7,7 @@
    "@electron-elements/send-feedback": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/@electron-elements/send-feedback/-/send-feedback-1.0.7.tgz",
-      "integrity": "sha512-3VS5JlAkZi0Ik2xHPdO0ZT3VvtLH7fqY8UXKHiR4BJxJPdoqlPM9Z0YT0uQxSz/xfBjcfCRV1DlnuJ/S3J99ow==",
+      "integrity": "sha1-HmTsFMvNkmZAngeu1BDoUi45deA=",
      "requires": {
        "@electron-elements/utils": "1.0.3"
      }
@@ -15,7 +15,7 @@
    "@electron-elements/utils": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/@electron-elements/utils/-/utils-1.0.3.tgz",
-      "integrity": "sha512-SMIKfu0UrmslHVKDQhOJDE2OeynWnuznkZlhgB5X2V2h+0t00Pq+ekusxBAAXIdZSdnLPlMcH3zZ6TfDq6mbPA=="
+      "integrity": "sha1-23sB2Zzaay/sNM+XuJcJCWnznII="
    },
    "@paulcbetts/cld": {
      "version": "2.4.6",
@@ -31,16 +31,73 @@
    "@paulcbetts/spellchecker": {
      "version": "4.0.6",
      "resolved": "https://registry.npmjs.org/@paulcbetts/spellchecker/-/spellchecker-4.0.6.tgz",
-      "integrity": "sha512-9lhLEvWfAB00n2oOM/S08sna9AuFk+b+bPk8ficpSa2X0Ll40PahMwfFS3G54nqQBIFFZgTPrhoHtCLAao0xmg==",
+      "integrity": "sha1-ee8fnBnFoxVpIcyqn/3D77vuR+M=",
      "requires": {
        "nan": "^2.0.0"
      }
    },
+    "@sentry/browser": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-0.5.4.tgz",
+      "integrity": "sha1-Yh/5chgrc7YoVlhLkvxl/elpBMw=",
+      "requires": {
+        "@sentry/core": "0.5.4",
+        "@sentry/shim": "0.5.4"
+      }
+    },
+    "@sentry/core": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-0.5.4.tgz",
+      "integrity": "sha1-mwqEK0QhMbOAG65wviyk6cUQV04=",
+      "requires": {
+        "@sentry/shim": "0.5.4"
+      }
+    },
+    "@sentry/electron": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-0.5.5.tgz",
+      "integrity": "sha1-kInWNC22xr1sCSpTdHcIAx1ft8M=",
+      "requires": {
+        "@sentry/browser": "0.5.4",
+        "@sentry/core": "0.5.4",
+        "@sentry/node": "0.5.4",
+        "@sentry/shim": "0.5.4",
+        "@sentry/utils": "0.5.4",
+        "electron-fetch": "^1.1.0",
+        "form-data": "^2.3.2",
+        "util.promisify": "^1.0.0"
+      }
+    },
+    "@sentry/node": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-0.5.4.tgz",
+      "integrity": "sha1-s+c0nRs2EjmVkDbqrhnOvzVkw9M=",
+      "requires": {
+        "@sentry/core": "0.5.4",
+        "@sentry/shim": "0.5.4",
+        "raven": "^2.6.0"
+      }
+    },
+    "@sentry/shim": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@sentry/shim/-/shim-0.5.4.tgz",
+      "integrity": "sha1-y4JrGjR2WuXhsh5h3y3vL42pHcE="
+    },
+    "@sentry/utils": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-0.5.4.tgz",
+      "integrity": "sha1-jt54rOlgIW3WMv1WHIP1AGLlruE="
+    },
    "@sindresorhus/is": {
      "version": "0.7.0",
      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
    },
+    "adm-zip": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
+      "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA=="
+    },
    "aggregate-error": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz",
@@ -69,7 +126,7 @@
    "argparse": {
      "version": "1.0.10",
      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
      "requires": {
        "sprintf-js": "~1.0.2"
      }
@@ -109,7 +166,7 @@
    "aws4": {
      "version": "1.7.0",
      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
-      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
+      "integrity": "sha1-1NDpudv8p3vwjusKikcVUP454ok="
    },
    "balanced-match": {
      "version": "1.0.0",
@@ -139,12 +196,12 @@
    "bluebird": {
      "version": "3.5.1",
      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+      "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk="
    },
    "bluebird-lst": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.5.tgz",
-      "integrity": "sha512-Ey0bDNys5qpYPhZ/oQ9vOEvD0TYQDTILMXWP2iGfvMg7rSDde+oV4aQQgqRH+CvBFNz2BSDQnPGMUl6LKBUUQA==",
+      "integrity": "sha1-vryDAmt+kqcocaPcWZ4hnL+wAqk=",
      "requires": {
        "bluebird": "^3.5.1"
      }
@@ -160,7 +217,7 @@
    "brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
      "requires": {
        "balanced-match": "^1.0.0",
        "concat-map": "0.0.1"
@@ -223,6 +280,11 @@
      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
    },
+    "charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+    },
    "clean-stack": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz",
@@ -254,6 +316,11 @@
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+    },
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -267,6 +334,11 @@
        "capture-stack-trace": "^1.0.0"
      }
    },
+    "crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
+    },
    "cryptiles": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
@@ -296,7 +368,7 @@
    "debug": {
      "version": "2.6.9",
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
      "requires": {
        "ms": "2.0.0"
      }
@@ -319,6 +391,15 @@
      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "requires": {
+        "foreach": "^2.0.5",
+        "object-keys": "^1.0.8"
+      }
+    },
    "delayed-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -327,7 +408,7 @@
    "dns-packet": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "integrity": "sha1-EqpCaYEHW+UAuRDu3NC0fdfe2lo=",
      "requires": {
        "ip": "^1.1.0",
        "safe-buffer": "^5.0.1"
@@ -355,6 +436,14 @@
        "jsbn": "~0.1.0"
      }
    },
+    "electron-fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.1.0.tgz",
+      "integrity": "sha512-eBtqbB522c/RJwC5v1yF/Y0SMVLiwel98BWGx050GucWbKlejHtPkfpq/vfMxCjg0SGpHGUISYUaMfu65QH+xg==",
+      "requires": {
+        "encoding": "^0.1.12"
+      }
+    },
    "electron-is-dev": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz",
@@ -368,7 +457,7 @@
    "electron-remote": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/electron-remote/-/electron-remote-1.2.0.tgz",
-      "integrity": "sha512-Fo2wnwK2tzd81Ux4pfNhz9DwHBoooZahdWBqOh9HtESYh2jrcsjc6FAibIu2oIOk71T1USyC7OBcqE8BZw3FGQ==",
+      "integrity": "sha1-DwDB04A852URF/b7bydNJnge+b0=",
      "requires": {
        "debug": "^2.5.1",
        "hashids": "^1.1.1",
@@ -381,7 +470,7 @@
    "electron-spellchecker": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/electron-spellchecker/-/electron-spellchecker-1.1.2.tgz",
-      "integrity": "sha512-AdzD/Q82Svk9EDTc65vRr271UPLVIxsruKJM0iwqxEG9Y/CogNhEAJz/asV0BFWom4tpdB6cHcLbYePb11Musw==",
+      "integrity": "sha1-X74eZdJGt35udDPuI4fZ0mAQ96g=",
      "requires": {
        "@paulcbetts/cld": "^2.4.6",
        "@paulcbetts/spellchecker": "^4.0.6",
@@ -440,6 +529,36 @@
        }
      }
    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "~0.4.13"
+      }
+    },
+    "es-abstract": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "requires": {
+        "es-to-primitive": "^1.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "requires": {
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
+      }
+    },
    "escape-html": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -448,12 +567,12 @@
    "esprima": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+      "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ="
    },
    "event-kit": {
      "version": "2.4.0",
      "resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.4.0.tgz",
-      "integrity": "sha512-ZXd9jxUoc/f/zdLdR3OUcCzT84WnpaNWefquLyE125akIC90sDs8S3T/qihliuVsaj7Osc0z8lLL2fjooE9Z4A=="
+      "integrity": "sha1-cYqvIt92ZwAkrWaSJIPhu6BUTzM="
    },
    "event-target-shim": {
      "version": "1.1.1",
@@ -481,6 +600,11 @@
      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
+    },
    "forever-agent": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -529,6 +653,11 @@
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
    "get-stream": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
@@ -591,6 +720,14 @@
        "har-schema": "^2.0.0"
      }
    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
    "has-symbol-support-x": {
      "version": "1.4.2",
      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
@@ -607,7 +744,7 @@
    "hashids": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/hashids/-/hashids-1.1.4.tgz",
-      "integrity": "sha512-U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="
+      "integrity": "sha1-5P+SrWa2hKO9aqznwX1mYY7l+iE="
    },
    "hawk": {
      "version": "6.0.2",
@@ -640,6 +777,14 @@
        "sshpk": "^1.7.0"
      }
    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
    "indent-string": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
@@ -678,6 +823,21 @@
      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+    },
    "is-ip": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz",
@@ -712,6 +872,14 @@
      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
    "is-retry-allowed": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
@@ -722,6 +890,11 @@
      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
+    },
    "is-typedarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -803,7 +976,7 @@
    "keyboard-layout": {
      "version": "2.0.13",
      "resolved": "https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz",
-      "integrity": "sha512-WxVc3bBITttHozSyEYPsyr5rN2KQuXtEaXMlQfQjEze1JrkLw30yH/bcNn1IGx48b+tdOdybpnq++JFLU2FaZg==",
+      "integrity": "sha1-W09cJYNeXSIae52ol2YxANiXSH0=",
      "requires": {
        "event-kit": "^2.0.0",
        "nan": "^2.0.0"
@@ -820,7 +993,7 @@
    "lazy-val": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.3.tgz",
-      "integrity": "sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg=="
+      "integrity": "sha1-u5eyAO8AgB2UwxfincbtOeMcXtw="
    },
    "lodash.assign": {
      "version": "4.2.0",
@@ -840,7 +1013,7 @@
    "lowercase-keys": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+      "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8="
    },
    "lru-cache": {
      "version": "4.1.3",
@@ -851,15 +1024,25 @@
        "yallist": "^2.1.2"
      }
    },
+    "md5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+      "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
+      "requires": {
+        "charenc": "~0.0.1",
+        "crypt": "~0.0.1",
+        "is-buffer": "~1.1.1"
+      }
+    },
    "mime-db": {
      "version": "1.33.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+      "integrity": "sha1-o0kgUKXLm2NFBUHjnZeI0icng9s="
    },
    "mime-types": {
      "version": "2.1.18",
      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+      "integrity": "sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g=",
      "requires": {
        "mime-db": "~1.33.0"
      }
@@ -872,7 +1055,7 @@
    "minimatch": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
      "requires": {
        "brace-expansion": "^1.1.7"
      }
@@ -898,7 +1081,7 @@
    "nan": {
      "version": "2.10.0",
      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+      "integrity": "sha1-ltDNYQ69WNS03pzAxoKM2pnHVI8="
    },
    "node-json-db": {
      "version": "0.7.3",
@@ -952,6 +1135,20 @@
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
    },
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
    "once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1112,6 +1309,18 @@
        "strict-uri-encode": "^1.0.0"
      }
    },
+    "raven": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/raven/-/raven-2.6.3.tgz",
+      "integrity": "sha512-bKre7qlDW+y1+G2bUtCuntdDYc8o5v1T233t0vmJfbj8ttGOgLrGRlYB8saelVMW9KUAJNLrhFkAKOwFWFJonw==",
+      "requires": {
+        "cookie": "0.3.1",
+        "md5": "^2.2.1",
+        "stack-trace": "0.0.10",
+        "timed-out": "4.0.1",
+        "uuid": "3.0.0"
+      }
+    },
    "readable-stream": {
      "version": "2.3.6",
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
@@ -1158,7 +1367,7 @@
        "uuid": {
          "version": "3.2.1",
          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+          "integrity": "sha1-EsUou51Y0LkmXZovbw/ovhf/HxQ="
        }
      }
    },
@@ -1173,7 +1382,7 @@
    "rimraf": {
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
      "requires": {
        "glob": "^7.0.5"
      },
@@ -1181,7 +1390,7 @@
        "glob": {
          "version": "7.1.2",
          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
          "requires": {
            "fs.realpath": "^1.0.0",
            "inflight": "^1.0.4",
@@ -1196,7 +1405,7 @@
    "rxjs": {
      "version": "5.5.8",
      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz",
-      "integrity": "sha512-Bz7qou7VAIoGiglJZbzbXa4vpX5BmTTN2Dj/se6+SwADtw4SihqBIiEa7VmTXJ8pynvq0iFr5Gx9VLyye1rIxQ==",
+      "integrity": "sha1-srCAmldhStYlTAPXRG3qDYPKN5E=",
      "requires": {
        "symbol-observable": "1.0.1"
      }
@@ -1214,15 +1423,20 @@
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
    "sax": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
    },
    "semver": {
      "version": "5.4.1",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
    },
    "sntp": {
      "version": "2.1.0",
@@ -1243,7 +1457,7 @@
    "source-map": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
    },
    "source-map-support": {
      "version": "0.5.6",
@@ -1257,7 +1471,7 @@
    "spawn-rx": {
      "version": "2.0.12",
      "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
-      "integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
+      "integrity": "sha1-tihSlEmUJgib7qDDwewy1/xXo3Y=",
      "requires": {
        "debug": "^2.5.1",
        "lodash.assign": "^4.2.0",
@@ -1284,6 +1498,11 @@
        "tweetnacl": "~0.14.0"
      }
    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
+    },
    "strict-uri-encode": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -1315,7 +1534,7 @@
    "tough-cookie": {
      "version": "2.3.4",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+      "integrity": "sha1-7GDO44rGdQY//JelwYlwV47oNlU=",
      "requires": {
        "punycode": "^1.4.1"
      }
@@ -1372,6 +1591,20 @@
      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "uuid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz",
+      "integrity": "sha1-Zyj8BFnEUNeWqZwxg3VpvfZy1yg="
+    },
    "verror": {
      "version": "1.10.0",
      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "2.3.2",
+  "version": "2.3.3",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
  "copyright": "Kandra Labs, Inc.",
@@ -27,13 +27,15 @@
  ],
  "dependencies": {
    "@electron-elements/send-feedback": "1.0.7",
-    "escape-html": "1.0.3",
+    "@sentry/electron": "0.5.5",
+    "adm-zip": "0.4.11",
    "auto-launch": "5.0.5",
    "electron-is-dev": "0.3.0",
    "electron-log": "2.2.14",
    "electron-spellchecker": "1.1.2",
    "electron-updater": "2.23.3",
    "electron-window-state": "4.1.1",
+    "escape-html": "1.0.3",
    "is-online": "7.0.0",
    "node-json-db": "0.7.3",
    "request": "2.85.0",
--- a/app/renderer/css/preference.css
+++ b/app/renderer/css/preference.css
@@ -364,7 +364,8 @@ i.open-tab-button {
 }

 .reset-data-button,
-.custom-css-button {
+.custom-css-button,
+.download-folder-button {
    display: inline-block;
    border: none;
    padding: 10px;
@@ -384,7 +385,8 @@ i.open-tab-button {
    color: #fff;
 }

-.selected-css-path {
+.selected-css-path,
+.download-folder-path {
    background: #eeeeee;
    padding: 10px;
    margin-top: 10px;
@@ -602,7 +604,8 @@ input.toggle-round:checked+label:after {
 /* responsive grid */

@media (max-width: 650px) {
-    .selected-css-path {
+    .selected-css-path,
+    .download-folder-path  {
        margin-right: 15px;
    }
    #css-delete-action {
--- a/app/renderer/js/components/handle-external-link.js
+++ b/app/renderer/js/components/handle-external-link.js
@@ -1,11 +1,15 @@
-const { shell } = require('electron').remote;
+const { ipcRenderer } = require('electron');
+const { shell, app } = require('electron').remote;
 const LinkUtil = require('../utils/link-util');
 const DomainUtil = require('../utils/domain-util');
+const ConfigUtil = require('../utils/config-util');
+
+const dingSound = new Audio('../resources/sounds/ding.ogg');

 function handleExternalLink(event) {
 	const { url } = event;
 	const domainPrefix = DomainUtil.getDomain(this.props.index).url;
-
+	const downloadPath = ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`);
  // Whitelist URLs which are allowed to be opened in the app
 	const {
    isInternalUrl: isWhiteListURL,
@@ -20,7 +24,22 @@ function handleExternalLink(event) {
    // and not trigger webview reload while image in webview will
    // do nothing and will not save it
 		if (!LinkUtil.isImage(url) && isUploadsURL) {
-			this.$el.downloadURL(url);
+			ipcRenderer.send('downloadFile', url, downloadPath);
+			ipcRenderer.once('downloadFileCompleted', (event, filePath, fileName) => {
+				const downloadNotification = new Notification('Download Complete', {
+					body: `Click to open ${fileName}`,
+					silent: true // We'll play our own sound - ding.ogg
+				});
+
+				// Play sound to indicate download complete
+				if (!ConfigUtil.getConfigItem('silent')) {
+					dingSound.play();
+				}
+
+				downloadNotification.onclick = () => {
+					shell.openItem(filePath);
+				};
+			});
 			return;
 		}

--- a/app/renderer/js/components/webview.js
+++ b/app/renderer/js/components/webview.js
@@ -75,11 +75,16 @@ class WebView extends BaseComponent {

 		this.$el.addEventListener('page-favicon-updated', event => {
 			const { favicons } = event;
+
 			// This returns a string of favicons URL. If there is a PM counts in unread messages then the URL would be like
 			// https://chat.zulip.org/static/images/favicon/favicon-pms.png
 			if (favicons[0].indexOf('favicon-pms') > 0 && process.platform === 'darwin') {
 				// This api is only supported on macOS
 				app.dock.setBadge('●');
+				// bounce the dock
+				if (ConfigUtil.getConfigItem('dockBouncing')) {
+					app.dock.bounce();
+				}
 			}
 		});

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

-const { session } = remote;
+const { session, app } = remote;

 require(__dirname + '/js/tray.js');
 const DomainUtil = require(__dirname + '/js/utils/domain-util.js');
@@ -116,7 +116,8 @@ class ServerManagerView {
 			dndPreviousSettings: {
 				showNotification: true,
 				silent: false
-			}
+			},
+			downloadsPath: `${app.getPath('downloads')}`
 		};

 		// Platform specific settings
@@ -127,6 +128,11 @@ class ServerManagerView {
 			settingOptions.dndPreviousSettings.flashTaskbarOnMessage = true;
 		}

+		if (process.platform === 'darwin') {
+			// Only available on macOS
+			settingOptions.dockBouncing = true;
+		}
+
 		for (const i in settingOptions) {
 			if (ConfigUtil.getConfigItem(i) === null) {
 				ConfigUtil.setConfigItem(i, settingOptions[i]);
--- a/app/renderer/js/pages/preference/general-section.js
+++ b/app/renderer/js/pages/preference/general-section.js
@@ -31,6 +31,10 @@ class GeneralSection extends BaseSection {
 						<div class="setting-description">Show app unread badge</div>
 						<div class="setting-control"></div>
 					</div>
+					<div class="setting-row" id="dock-bounce-option" style= "display:${process.platform === 'darwin' ? '' : 'none'}">
+						<div class="setting-description">Bounce dock on new private message</div>
+						<div class="setting-control"></div>
+					</div>
 					<div class="setting-row" id="flash-taskbar-option" style= "display:${process.platform === 'win32' ? '' : 'none'}">
 						<div class="setting-description">Flash taskbar on new message</div>
 						<div class="setting-control"></div>
@@ -91,6 +95,20 @@ class GeneralSection extends BaseSection {
 						</div>
 					</div>
 				</div>
+				<div class="title">Advanced</div>
+				<div class="settings-card">
+					<div class="setting-row" id="download-folder">
+						<div class="setting-description">
+							Default download location
+						</div>
+						<button class="download-folder-button blue">Choose</button>
+					</div>
+					<div class="setting-row">
+						<div class="setting-description">
+							<div class="download-folder-path">${ConfigUtil.getConfigItem('downloadsPath')}</div>
+						</div>
+					</div>
+				</div>
 				<div class="title">Reset Application Data</div>
                <div class="settings-card">
 					<div class="setting-row" id="resetdata-option">
@@ -119,12 +137,18 @@ class GeneralSection extends BaseSection {
 		this.addCustomCSS();
 		this.showCustomCSSPath();
 		this.removeCustomCSS();
+		this.downloadFolder();

 		// Platform specific settings
+
 		// Flashing taskbar on Windows
 		if (process.platform === 'win32') {
 			this.updateFlashTaskbar();
 		}
+		// Dock bounce on macOS
+		if (process.platform === 'darwin') {
+			this.updateDockBouncing();
+		}
 	}

 	updateTrayOption() {
@@ -153,6 +177,18 @@ class GeneralSection extends BaseSection {
 		});
 	}

+	updateDockBouncing() {
+		this.generateSettingOption({
+			$element: document.querySelector('#dock-bounce-option .setting-control'),
+			value: ConfigUtil.getConfigItem('dockBouncing', true),
+			clickHandler: () => {
+				const newValue = !ConfigUtil.getConfigItem('dockBouncing');
+				ConfigUtil.setConfigItem('dockBouncing', newValue);
+				this.updateDockBouncing();
+			}
+		});
+	}
+
 	updateFlashTaskbar() {
 		this.generateSettingOption({
 			$element: document.querySelector('#flash-taskbar-option .setting-control'),
@@ -327,6 +363,28 @@ class GeneralSection extends BaseSection {
 		});
 	}

+	downloadFolderDialog() {
+		const showDialogOptions = {
+			title: 'Select Download Location',
+			defaultId: 1,
+			properties: ['openDirectory']
+		};
+
+		dialog.showOpenDialog(showDialogOptions, selectedFolder => {
+			if (selectedFolder) {
+				ConfigUtil.setConfigItem('downloadsPath', selectedFolder[0]);
+				const downloadFolderPath = document.querySelector('.download-folder-path');
+				downloadFolderPath.innerText = selectedFolder[0];
+			}
+		});
+	}
+	downloadFolder() {
+		const downloadFolder = document.querySelector('#download-folder .download-folder-button');
+		downloadFolder.addEventListener('click', () => {
+			this.downloadFolderDialog();
+		});
+	}
+
 }

 module.exports = GeneralSection;
--- a/app/renderer/js/utils/config-util.js
+++ b/app/renderer/js/utils/config-util.js
@@ -79,6 +79,7 @@ class ConfigUtil {
 				);
 				logger.error('Error while JSON parsing settings.json: ');
 				logger.error(err);
+				logger.reportSentry(err);
 			}
 		}
 		this.db = new JsonDB(settingsJsonPath, true, true);
--- a/app/renderer/js/utils/domain-util.js
+++ b/app/renderer/js/utils/domain-util.js
@@ -155,6 +155,9 @@ class DomainUtil {
 							resolve(serverConf);
 						});
 					} else {
+						// Report error to sentry to get idea of possible certificate errors
+						// users get when adding the servers
+						logger.reportSentry(new Error(error));
 						const certErrorMessage = `Do you trust certificate from ${domain}? \n ${error}`;
 						const certErrorDetail = `The organization you're connecting to is either someone impersonating the Zulip server you entered, or the server you're trying to connect to is configured in an insecure way.
 						\nIf you have a valid certificate please add it from Settings>Organizations and try to add the organization again.
@@ -164,7 +167,7 @@ class DomainUtil {
 						dialog.showMessageBox({
 							type: 'warning',
 							buttons: ['Yes', 'No'],
-							defaultId: 0,
+							defaultId: 1,
 							message: certErrorMessage,
 							detail: certErrorDetail
 						}, response => {
@@ -221,6 +224,7 @@ class DomainUtil {
 					response.on('error', err => {
 						logger.log('Could not get server icon.');
 						logger.log(err);
+						logger.reportSentry(err);
 						resolve(defaultIconUrl);
 					});
 					response.pipe(file).on('finish', () => {
@@ -229,11 +233,13 @@ class DomainUtil {
 				}).on('error', err => {
 					logger.log('Could not get server icon.');
 					logger.log(err);
+					logger.reportSentry(err);
 					resolve(defaultIconUrl);
 				});
 			} catch (err) {
 				logger.log('Could not get server icon.');
 				logger.log(err);
+				logger.reportSentry(err);
 				resolve(defaultIconUrl);
 			}
 		});
@@ -265,6 +271,7 @@ class DomainUtil {
 				);
 				logger.error('Error while JSON parsing domain.json: ');
 				logger.error(err);
+				logger.reportSentry(err);
 			}
 		}
 		this.db = new JsonDB(domainJsonPath, true, true);
--- a/app/renderer/js/utils/logger-util.js
+++ b/app/renderer/js/utils/logger-util.js
@@ -2,8 +2,10 @@ const NodeConsole = require('console').Console;
 const fs = require('fs');
 const isDev = require('electron-is-dev');
 const { initSetUp } = require('./default-util');
+const { sentryInit, captureException } = require('./sentry-util');

 initSetUp();
+sentryInit();
 let app = null;
 if (process.type === 'renderer') {
 	app = require('electron').remote.app;
@@ -82,6 +84,10 @@ class Logger {
 			`${date.getMinutes()}:${date.getSeconds()}`;
 		return timestamp;
 	}
+
+	reportSentry(err) {
+		captureException(err);
+	}
 }

 module.exports = Logger;
--- a/app/renderer/js/utils/sentry-util.js
+++ b/app/renderer/js/utils/sentry-util.js
@@ -0,0 +1,16 @@
+const { init, captureException } = require('@sentry/electron');
+const isDev = require('electron-is-dev');
+
+const sentryInit = () => {
+	if (!isDev) {
+		init({
+			dsn: 'SENTRY_DSN',
+			sendTimeout: 30 // wait 30 seconds before considering the sending capture to have failed, default is 1 second
+		});
+	}
+};
+
+module.exports = {
+	sentryInit,
+	captureException
+};
--- a/app/resources/sounds/ding.ogg
+++ b/app/resources/sounds/ding.ogg
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
    "7zip-bin": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-4.0.2.tgz",
-      "integrity": "sha1-arvcIvM8q3QgU3d6JtsuJcpScXk=",
+      "integrity": "sha512-XtGk+IF57pr852UK1AhQJXqmm1WmSgS5uISL+LPs0z/iAxXouMvdlLJrHPeukP6gd7yR2rDTMSMkHNODgwIq7A==",
      "dev": true
    },
    "@types/node": {
@@ -51,11 +51,6 @@
        }
      }
    },
-    "adm-zip": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
-      "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA=="
-    },
    "ajv": {
      "version": "5.5.2",
      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
@@ -178,9 +173,9 @@
      }
    },
    "app-builder-bin": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.10.3.tgz",
-      "integrity": "sha512-DQva42HxatQkic4T2ybHpELsBlesj3ftMmSJkaSRP9N5q9qiQHjQO7t8o6j6nTKyKSNF7xr1jQtevyVvAPq9Wg==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.11.1.tgz",
+      "integrity": "sha512-EYzPq59A3AMAD0/a6QSSBGzrXvKCm19t5utO5qeMTSAeWx0HDZxMyUBRUoOZIFd6+uJRF1HMTofIAushLu7PhQ==",
      "dev": true
    },
    "append-buffer": {
@@ -519,7 +514,7 @@
    "async-exit-hook": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
-      "integrity": "sha1-i9iwJLDsmxwBzMua+dspvXF9+vM=",
+      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
      "dev": true
    },
    "async-limiter": {
@@ -766,13 +761,13 @@
    "bluebird": {
      "version": "3.5.1",
      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk=",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
      "dev": true
    },
    "bluebird-lst": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.5.tgz",
-      "integrity": "sha1-vryDAmt+kqcocaPcWZ4hnL+wAqk=",
+      "integrity": "sha512-Ey0bDNys5qpYPhZ/oQ9vOEvD0TYQDTILMXWP2iGfvMg7rSDde+oV4aQQgqRH+CvBFNz2BSDQnPGMUl6LKBUUQA==",
      "dev": true,
      "requires": {
        "bluebird": "^3.5.1"
@@ -927,13 +922,13 @@
      "dev": true
    },
    "builder-util": {
-      "version": "5.13.2",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.13.2.tgz",
-      "integrity": "sha512-pdt5hkCS69Hhy6b8VuZbLi9fYtjkhah2QPB7Rwg7/475kFOhMEkbYhGckfDPcdT64Vk+1RHtZd2oiNiZNyaZ3w==",
+      "version": "5.16.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.16.0.tgz",
+      "integrity": "sha512-HN7EyZF+WPcncty4fy7AVZxfR8TMkX/ZxxQfsji4dWyzDZ8nAqMadXKZlqySfLr5ckEjwEsOrDqO2ZsqkVoCtg==",
      "dev": true,
      "requires": {
        "7zip-bin": "~4.0.2",
-        "app-builder-bin": "1.10.3",
+        "app-builder-bin": "1.11.1",
        "bluebird-lst": "^1.0.5",
        "builder-util-runtime": "^4.4.0",
        "chalk": "^2.4.1",
@@ -1171,7 +1166,7 @@
    "cliui": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-      "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=",
+      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
      "dev": true,
      "requires": {
        "string-width": "^2.1.1",
@@ -1194,7 +1189,7 @@
        "string-width": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
          "dev": true,
          "requires": {
            "is-fullwidth-code-point": "^2.0.0",
@@ -1939,14 +1934,14 @@
      }
    },
    "dmg-builder": {
-      "version": "4.11.6",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-4.11.6.tgz",
-      "integrity": "sha512-y9zc4oCp0kdXaXZxOvTbMdWv5Mmwu0NHEDQVT4AkZyufnaC+xt8YdMcsZfM9NLkMlryGVjM7+1t0oFbvqIyXzQ==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-4.14.0.tgz",
+      "integrity": "sha512-zTlb3VFkOGqCzsSSEVkfzCRl0Gd3LINMfplI6mCvTSU825OVG7W1IvZSp2gikLT5OJIgJzx2YuomKntWhXOJWA==",
      "dev": true,
      "requires": {
        "bluebird-lst": "^1.0.5",
-        "builder-util": "^5.13.2",
-        "electron-builder-lib": "~20.19.1",
+        "builder-util": "~5.16.0",
+        "electron-builder-lib": "~20.20.4",
        "fs-extra-p": "^4.6.1",
        "iconv-lite": "^0.4.23",
        "js-yaml": "^3.12.0",
@@ -2107,46 +2102,46 @@
      }
    },
    "electron-builder": {
-      "version": "20.19.1",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.19.1.tgz",
-      "integrity": "sha512-izEIgCjkwHjlSsdD6hC6GUzX7jdtW7pUPfsVnYEbEuTy6899A3thmCz6U0I06yo5N/JHoqeWmEBAxmoEfUFgoQ==",
+      "version": "20.20.4",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.20.4.tgz",
+      "integrity": "sha512-6X2T21/v35dvt9Rd+L9Dlb3EbIVGiqePh2sirngPa2wT6QnmVdVJsvnlxKsWWYrsQzowVSGxkho5FGiCwanDiw==",
      "dev": true,
      "requires": {
        "bluebird-lst": "^1.0.5",
-        "builder-util": "5.13.2",
+        "builder-util": "5.16.0",
        "builder-util-runtime": "4.4.0",
        "chalk": "^2.4.1",
-        "dmg-builder": "4.11.6",
-        "electron-builder-lib": "20.19.1",
+        "dmg-builder": "4.14.0",
+        "electron-builder-lib": "20.20.4",
        "fs-extra-p": "^4.6.1",
        "is-ci": "^1.1.0",
        "lazy-val": "^1.0.3",
-        "read-config-file": "3.0.2",
+        "read-config-file": "3.1.0",
        "sanitize-filename": "^1.6.1",
        "update-notifier": "^2.5.0",
        "yargs": "^12.0.1"
      }
    },
    "electron-builder-lib": {
-      "version": "20.19.1",
-      "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.19.1.tgz",
-      "integrity": "sha512-1grL7EXtbjMQl/bjKF6X3kxaF2E3PYHuQur7mF6nLY/AVfwT/AJZNZe2j6pp4jp7FRitvPgvYs4jf92SzDICFA==",
+      "version": "20.20.4",
+      "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.20.4.tgz",
+      "integrity": "sha512-84n1ELXP/leF1IuDIsx2pyUJuz889Um3sb2tjBxDbEhq0oaLnp1ifB3j5iO+OV7ZfGnXKyvds6nPcNt1AYQy7A==",
      "dev": true,
      "requires": {
        "7zip-bin": "~4.0.2",
-        "app-builder-bin": "1.10.3",
+        "app-builder-bin": "1.11.1",
        "async-exit-hook": "^2.0.1",
        "bluebird-lst": "^1.0.5",
-        "builder-util": "5.13.2",
+        "builder-util": "5.16.0",
        "builder-util-runtime": "4.4.0",
        "chromium-pickle-js": "^0.2.0",
        "debug": "^3.1.0",
        "ejs": "^2.6.1",
        "electron-osx-sign": "0.4.10",
-        "electron-publish": "20.19.0",
+        "electron-publish": "20.22.0",
        "env-paths": "^1.0.0",
        "fs-extra-p": "^4.6.1",
-        "hosted-git-info": "^2.6.1",
+        "hosted-git-info": "^2.7.1",
        "is-ci": "^1.1.0",
        "isbinaryfile": "^3.0.2",
        "js-yaml": "^3.12.0",
@@ -2154,10 +2149,9 @@
        "minimatch": "^3.0.4",
        "normalize-package-data": "^2.4.0",
        "plist": "^3.0.1",
-        "read-config-file": "3.0.2",
+        "read-config-file": "3.1.0",
        "sanitize-filename": "^1.6.1",
        "semver": "^5.5.0",
-        "stream-json": "^1.1.0",
        "sumchecker": "^2.0.2",
        "temp-file": "^3.1.3"
      },
@@ -2172,9 +2166,9 @@
          }
        },
        "hosted-git-info": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz",
-          "integrity": "sha512-Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==",
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+          "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
          "dev": true
        },
        "js-yaml": {
@@ -2354,13 +2348,13 @@
      }
    },
    "electron-publish": {
-      "version": "20.19.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.19.0.tgz",
-      "integrity": "sha512-S9+o2Z0PYpdVLqTZkUGYvvO/HiGpkh3k12ecHNvUDGuVir9lJkYqCxxO46iIvgRRj4yyxE/cxoRl3nS8w51KOw==",
+      "version": "20.22.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.22.0.tgz",
+      "integrity": "sha512-ZF6GV1y5l1+auMBdISOk3yrltkGxOo1DQaGXVpABuenfgXgrHen6EgkgMy6wHhvBm1tOTZnANJSUV4zDBIFewQ==",
      "dev": true,
      "requires": {
        "bluebird-lst": "^1.0.5",
-        "builder-util": "^5.13.1",
+        "builder-util": "^5.14.0",
        "builder-util-runtime": "^4.4.0",
        "chalk": "^2.4.1",
        "fs-extra-p": "^4.6.1",
@@ -4361,7 +4355,7 @@
      "dev": true,
      "requires": {
        "configstore": "^2.0.0",
-        "google-translate-token": "^1.0.0",
+        "google-translate-token": "latest",
        "got": "^6.3.0",
        "safe-eval": "^0.3.0"
      },
@@ -5657,7 +5651,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==",
      "dev": true
    },
    "lazystream": {
@@ -6088,7 +6082,7 @@
    "mime": {
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
-      "integrity": "sha1-sWIcVNY7l8R9PP5/chX31kUXw2k=",
+      "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==",
      "dev": true
    },
    "mime-db": {
@@ -6601,7 +6595,7 @@
    "os-locale": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
      "dev": true,
      "requires": {
        "execa": "^0.7.0",
@@ -6918,7 +6912,7 @@
    "plist": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha1-qbkx0XwwTokS7wujvdYYK68uH4w=",
+      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
      "dev": true,
      "requires": {
        "base64-js": "^1.2.3",
@@ -6929,7 +6923,7 @@
        "base64-js": {
          "version": "1.3.0",
          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-          "integrity": "sha1-yrHmEY8FEJXli1KBrqjBzSK/wOM=",
+          "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
          "dev": true
        },
        "xmlbuilder": {
@@ -7135,12 +7129,12 @@
      }
    },
    "read-config-file": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.0.2.tgz",
-      "integrity": "sha512-FZRUejsiKH0adwfAIdaaBn+vI0j75iVMCmgXP5vB5ma9XP4AHlzMOZFwtConmSR/W97wcOpSJh8DSk/OePszEw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.1.0.tgz",
+      "integrity": "sha512-z3VTrR9fgFu+Ll6MhTdtxbPFBKNGKgzYYnRjOcZvQeE/zwJTjPYVrps0ATgaSWU2/BnucUg3knP+Oz4zo9vEoA==",
      "dev": true,
      "requires": {
-        "ajv": "^6.5.1",
+        "ajv": "^6.5.2",
        "ajv-keywords": "^3.2.0",
        "bluebird-lst": "^1.0.5",
        "dotenv": "^6.0.0",
@@ -7673,7 +7667,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==",
      "dev": true
    },
    "semver": {
@@ -7928,7 +7922,7 @@
    "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==",
      "dev": true
    },
    "source-map-resolve": {
@@ -8111,12 +8105,6 @@
        }
      }
    },
-    "stream-chain": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stream-chain/-/stream-chain-2.0.3.tgz",
-      "integrity": "sha512-uCjJTDTAOgBrM2dLkS3mJGICUV3fL0eiTsGQ0bXiKU6et6/7dkTzZCp0eP1d8ZIwiWjthvQZlSx7NxMt7t1aFQ==",
-      "dev": true
-    },
    "stream-combiner": {
      "version": "0.0.4",
      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
@@ -8132,15 +8120,6 @@
      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
      "dev": true
    },
-    "stream-json": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.1.0.tgz",
-      "integrity": "sha512-m3J6fpe0KYw3zxkNOq3618tNMdIHvxZbyTcAtdmRTdhMFi/tKdV+PucSNMkpvDGSl5AAscIN3G67DaXIp+h+oQ==",
-      "dev": true,
-      "requires": {
-        "stream-chain": "^2.0.3"
-      }
-    },
    "stream-shift": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
@@ -9002,7 +8981,7 @@
    "uri-js": {
      "version": "4.2.2",
      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
      "dev": true,
      "requires": {
        "punycode": "^2.1.0"
@@ -9011,7 +8990,7 @@
        "punycode": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
          "dev": true
        }
      }
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "2.3.2",
+  "version": "2.3.3",
  "main": "./app/main",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
@@ -124,7 +124,7 @@
    "cp-file": "^5.0.0",
    "devtron": "1.4.0",
    "electron": "2.0.1",
-    "electron-builder": "20.19.1",
+    "electron-builder": "20.20.4",
    "electron-connect": "0.6.2",
    "electron-debug": "1.4.0",
    "google-translate-api": "2.3.0",
@@ -181,8 +181,5 @@
      "browser",
      "mocha"
    ]
-  },
-  "dependencies": {
-    "adm-zip": "^0.4.11"
  }
 }
--- a/tools/push-to-pull-request
+++ b/tools/push-to-pull-request
@@ -0,0 +1,81 @@
+#!/bin/bash
+set -e
+
+usage () {
+    cat >&2 <<EOF
+usage: $0 PULL_REQUEST_ID [REMOTE]
+
+Force-push our HEAD to the given GitHub pull request branch.
+
+Useful for a maintainer to run just before pushing to master,
+after tweaking the branch and/or rebasing to latest.  This causes
+GitHub to see the subsequent push to master as representing a
+merge of the PR, rather than requiring the PR to be manually
+(and to the casual observer misleadingly) closed instead.
+
+REMOTE defaults to the value of the Git config variable
+\`zulip.zulipRemote\` if set, else to \`upstream\`.
+
+See also \`reset-to-pull-request\`.
+EOF
+    exit 1
+}
+
+remote_default="$(git config zulip.zulipRemote || echo upstream)"
+
+pr_id="$1"
+remote="${2:-"$remote_default"}"
+
+if [ -z "$pr_id" ]; then
+    usage
+fi
+
+remote_url="$(git config remote."$remote".url)"
+repo_fq="$(echo "$remote_url" | perl -lne 'print $1 if (
+    m, ^ git\@github\.com:
+         ([^/]+ / [^/]+?)
+         (?:\.git)?
+       $ ,x )')"
+
+if [ -z "$repo_fq" ]; then
+    # We're pretty specific about what we expect the URL to look like;
+    # there are probably more cases we could legitimately cover, which
+    # we can add if/when they come up for someone.
+    echo "error: couldn't parse remote URL as GitHub repo" >&2
+    exit 1
+fi
+
+# See https://developer.github.com/v3/pulls/#get-a-single-pull-request .
+# This is the old REST API; the new GraphQL API does look neat, but it
+# seems to require authentication even for simple lookups of public data,
+# and that'd be a pain for a simple script like this.
+pr_url=https://api.github.com/repos/"${repo_fq}"/pulls/"${pr_id}"
+pr_details="$(curl -s "$pr_url")"
+
+pr_jq () {
+    echo "$pr_details" | jq "$@"
+}
+
+if [ "$(pr_jq -r .message)" = "Not Found" ]; then
+    echo "Invalid PR URL: $pr_url"
+    exit 1
+fi
+
+if [ "$(pr_jq .maintainer_can_modify)" != "true" ]; then
+    # This happens when the PR has already been merged or closed, or
+    # if the contributor has turned off the (default) setting to allow
+    # maintainers of the target repo to push to their PR branch.
+    #
+    # The latter seems to be rare (in Greg's experience doing the
+    # manual equivalent of this script for many different
+    # contributors, none have ever chosen this setting), but give a
+    # decent error message if it does happen.
+    echo "error: PR already closed, or contributor has disallowed pushing to branch" >&2
+    exit 1
+fi
+
+pr_head_repo_fq="$(pr_jq -r .head.repo.full_name)"
+pr_head_refname="$(pr_jq -r .head.ref)"
+
+set -x
+exec git push git@github.com:"$pr_head_repo_fq" +@:"$pr_head_refname"
--- a/tools/reset-to-pull-request
+++ b/tools/reset-to-pull-request
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+if ! git diff-index --quiet HEAD; then
+    set +x
+    echo "There are uncommitted changes:"
+    git status --short
+    echo "Doing nothing to avoid losing your work."
+    exit 1
+fi
+
+remote_default="$(git config zulip.zulipRemote || echo upstream)"
+
+request_id="$1"
+remote=${2:-"$remote_default"}
+
+set -x
+git fetch "$remote" "pull/$request_id/head"
+git reset --hard FETCH_HEAD
Author	SHA1	Message	Date
Akash Nimare	c52bfd6a45	release: 🎉 v2.3.3.	2018-07-13 18:18:25 +05:30
Akash Nimare	428087110a	tools: Add scripts to push/reset to pull request.	2018-07-13 17:05:46 +05:30
Abhigyan Khaund	781883a898	crash-reporter: Remove crash-reporter file and its use, as it is replaced by sentry.	2018-07-13 12:57:48 +05:30
Abhigyan Khaund	7299cd51e6	sentry: Initialize sentry for main and renderer process using logger-util. captureExceptions are used to report expected exceptions from domain-util.js and config-util.js. All files that include logger-util automatically includes sentry for those files and report unexpected exceptions to sentry.	2018-07-13 12:57:48 +05:30
Akash Nimare	a45254cff0	builder: Update electron-builder to v20.20.4.	2018-07-13 10:38:01 +05:30
Abhigyan Khaund	4095c121ba	certificates: Make default option "No" on enter key press to reject certificate.	2018-07-12 20:32:33 +05:30
Abhigyan Khaund	6787b8d557	file-attachments: Download file-attachments to Downloads folder. This PR adds a feature to download file-attachments to "Downloads" folder and shows a notification when the download is complete. On clicking the notification user can open the downloaded file with system default app. A user can set/change the download location from the settings > general.	2018-07-12 18:39:43 +05:30
Akash Nimare	306e0f3b5e	macOS: Add dock bouncing effect on macOS. This PR adds a new setting option of controlling the dock bouncing feature on macOS. Fixes: #510.	2018-07-10 10:01:36 +05:30
Abhigyan Khaund	f030d5d56b	package.json: Move adm dependecy to app package.json.	2018-07-06 17:00:57 +05:30