Merge branch 'vector-im:develop' into libsqlcipher0-depends

element-hq · Oct 4, 2023 · 139967d · 139967d
2 parents 93d0ccb + 00c27c4
commit 139967d
Show file tree

Hide file tree

Showing 5 changed files with 611 additions and 515 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -41,13 +41,13 @@ jobs:
 
             - name: "Get modified files"
               id: changed_files
-              uses: tj-actions/changed-files@6ee9cdc5816333acda68e01cf12eedc619e28316 # v39
+              uses: tj-actions/changed-files@41960309398d165631f08c5df47a11147e14712b # v39
               with:
                   files: |
                       dockerbuild/*
             - name: Log in to the Container registry
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/login-action@a5609cb39f57be157c39b77359abfaa43aeaeb8f
+              uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -63,7 +63,7 @@ jobs:
 
             - name: Build and push Docker image
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/build-push-action@4e4ee680f69700760d5620a94c020aef883043aa
+              uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0
               with:
                   context: dockerbuild
                   push: true

diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
@@ -20,22 +20,22 @@ jobs:
             - uses: actions/checkout@v3
 
             - name: Log in to the Container registry
-              uses: docker/login-action@a5609cb39f57be157c39b77359abfaa43aeaeb8f
+              uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Extract metadata for Docker
               id: meta
-              uses: docker/metadata-action@b67fef219a3c5542bf1d0948862a08152653b4d4
+              uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |
                       type=ref,event=branch
 
             - name: Build and push Docker image
-              uses: docker/build-push-action@4e4ee680f69700760d5620a94c020aef883043aa
+              uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0
               with:
                   context: dockerbuild
                   push: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,38 @@
+Changes in [1.11.45](https://github.com/vector-im/element-desktop/releases/tag/v1.11.45) (2023-09-29)
+=====================================================================================================
+
+## 🔒 Security
+ * Upgrade electron to 26.2.4 to fix CVE-2023-5217 ([\#1254](https://github.com/vector-im/element-desktop/pull/1254)). Contributed by @andybalaam.
+
+## 🐛 Bug Fixes
+ * Fix Emoji font on Safari 17 ([\#11673](https://github.com/matrix-org/matrix-react-sdk/pull/11673)).
+
+Changes in [1.11.44](https://github.com/vector-im/element-desktop/releases/tag/v1.11.44) (2023-09-26)
+=====================================================================================================
+
+## ✨ Features
+ * Make video & voice call buttons pin conference widget if unpinned ([\#11576](https://github.com/matrix-org/matrix-react-sdk/pull/11576)). Fixes vector-im/customer-retainer#72.
+ * OIDC: persist refresh token ([\#11249](https://github.com/matrix-org/matrix-react-sdk/pull/11249)). Contributed by @kerryarchibald.
+ * ElementR: Cross user verification ([\#11364](https://github.com/matrix-org/matrix-react-sdk/pull/11364)). Fixes vector-im/element-web#25752. Contributed by @florianduros.
+ * Default intentional mentions ([\#11602](https://github.com/matrix-org/matrix-react-sdk/pull/11602)).
+ * Notify users about denied access on ask-to-join  rooms ([\#11480](https://github.com/matrix-org/matrix-react-sdk/pull/11480)). Contributed by @nurjinjafar.
+ * Allow setting knock room directory visibility ([\#11529](https://github.com/matrix-org/matrix-react-sdk/pull/11529)). Contributed by @charlynguyen.
+
+## 🐛 Bug Fixes
+ * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](https://github.com/matrix-org/matrix-react-sdk/pull/11634)). Fixes vector-im/element-web#26209.
+ * upgrade electron to 26.2.1 to fix CVE-2023-4863 ([\#1226](https://github.com/vector-im/element-desktop/pull/1226)). Contributed by @selfisekai.
+ * Improve edge cases around macOS drag handles ([\#1219](https://github.com/vector-im/element-desktop/pull/1219)). Fixes #1199 and #1188.
+ * Escape placeholder before injecting it into the style ([\#11607](https://github.com/matrix-org/matrix-react-sdk/pull/11607)).
+ * Move ViewUser action callback to RoomView ([\#11495](https://github.com/matrix-org/matrix-react-sdk/pull/11495)). Fixes vector-im/element-web#26040.
+ * Fix room timeline search toggling behaviour edge case ([\#11605](https://github.com/matrix-org/matrix-react-sdk/pull/11605)). Fixes vector-im/element-web#26105.
+ * Avoid rendering view-message link in RoomKnocksBar unnecessarily ([\#11598](https://github.com/matrix-org/matrix-react-sdk/pull/11598)). Contributed by @charlynguyen.
+ * Use knock rooms sync to reflect the knock state ([\#11596](https://github.com/matrix-org/matrix-react-sdk/pull/11596)). Fixes vector-im/element-web#26043 and vector-im/element-web#26044. Contributed by @charlynguyen.
+ * Fix avatar in right panel not using the correct font ([\#11593](https://github.com/matrix-org/matrix-react-sdk/pull/11593)). Fixes vector-im/element-web#26061. Contributed by @MidhunSureshR.
+ * Add waits in Spotlight Cypress tests, hoping this unflakes them ([\#11590](https://github.com/matrix-org/matrix-react-sdk/pull/11590)). Fixes vector-im/element-web#26053, vector-im/element-web#26140 vector-im/element-web#26139 and vector-im/element-web#26138. Contributed by @andybalaam.
+ * Fix vertical alignment of default avatar font ([\#11582](https://github.com/matrix-org/matrix-react-sdk/pull/11582)). Fixes vector-im/element-web#26081.
+ * Fix avatars in public room & space search being flex shrunk ([\#11580](https://github.com/matrix-org/matrix-react-sdk/pull/11580)). Fixes vector-im/element-web#26133.
+ * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](https://github.com/matrix-org/matrix-react-sdk/pull/11558)). Fixes vector-im/element-web#26075.
+
 Changes in [1.11.43](https://github.com/vector-im/element-desktop/releases/tag/v1.11.43) (2023-09-15)
 =====================================================================================================
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "element-desktop",
     "productName": "Element",
     "main": "lib/electron-main.js",
-    "version": "1.11.43",
+    "version": "1.11.45",
     "description": "A feature-rich client for Matrix.org",
     "author": "Element",
     "homepage": "https://element.io",
@@ -80,20 +80,20 @@
         "@types/jest": "^29.0.0",
         "@types/minimist": "^1.2.1",
         "@types/mkdirp": "^1.0.2",
-        "@types/node": "16.18.48",
+        "@types/node": "16.18.52",
         "@types/pacote": "^11.1.1",
         "@types/tar": "^6.1.3",
         "@types/uuid": "^9.0.2",
         "@typescript-eslint/eslint-plugin": "^5.42.0",
         "@typescript-eslint/parser": "^5.42.0",
         "allchange": "^1.0.6",
-        "app-builder-lib": "24.6.4",
+        "app-builder-lib": "24.6.5",
         "babel-jest": "^29.0.0",
         "chokidar": "^3.5.2",
         "detect-libc": "^1.0.3",
         "electron": "^26.2.1",
         "electron-builder": "24.6.4",
-        "electron-builder-squirrel-windows": "24.6.4",
+        "electron-builder-squirrel-windows": "24.6.5",
         "electron-devtools-installer": "^3.2.0",
         "eslint": "^8.26.0",
         "eslint-config-google": "^0.14.0",
@@ -123,7 +123,7 @@
         "keytar": "^7.9.0"
     },
     "resolutions": {
-        "@types/node": "16.18.48"
+        "@types/node": "16.18.52"
     },
     "build": {
         "appId": "im.riot.app",