Merge branch 'unstable' into userconfig_disappearingmessage

CONTRIBUTING.md

@@ -34,22 +34,12 @@ Then you need `git`, if you don't have that yet: https://git-scm.com/
 
 ### Windows
 
-Building on Windows versions 8+ is supported out of the box
+Building on Windows is a pain, but is possible see our CI/Windows build machine prerequisites here [Windows-2022 GH image](https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md)
 
 ### Linux
 
-1.  Pick your favorite package manager.
+1.  Install build tools `apt install build-essential cmake` (this installs make, g++, gcc)
-1.  Install `python`
+2.  Depending on your distro, you might need to install `hunspell` and `hunspell-<lan>` (e.g. `hunspell-en-au`)
-1.  Install `gcc`
-1.  Install `g++`
-1.  Install `make`
-1.  Depending on your distro, you might need to install `hunspell` and `hunspell-<lan>` (e.g. `hunspell-en-au`)
-
-If you are using a Debian based Linux distribution gcc, g++ and make can be installed as part of the `build-essential` package using
-
-```
-apt install build-essential
-```
 
 ### All platforms
 

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",
@@ -175,7 +175,7 @@
     "cross-env": "^6.0.3",
     "css-loader": "^6.7.2",
     "dmg-builder": "23.6.0",
-    "electron": "25.3.0",
+    "electron": "^25.8.1",
     "electron-builder": "23.0.8",
     "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",

yarn.lock

@@ -2980,10 +2980,10 @@ electron@*:
     "@types/node" "^18.11.18"
     extract-zip "^2.0.1"
 
-electron@25.3.0:
+electron@^25.8.1:
-  version "25.3.0"
+  version "25.8.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.0.tgz#e818ab3ebd3e7a45f8fca0f47e607c9af2dc92c7"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.1.tgz#092fab5a833db4d9240d4d6f36218cf7ca954f86"
-  integrity sha512-cyqotxN+AroP5h2IxUsJsmehYwP5LrFAOO7O7k9tILME3Sa1/POAg3shrhx4XEnaAMyMqMLxzGvkzCVxzEErnA==
+  integrity sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"