CringeStudios/sekur-chat
5
0
Fork 0
forked from CringeStudios/element-desktop
Code Pull Requests Actions Activity

Merge branch 'develop' of https://github.com/vector-im/element-desktop into t3chguy/electron-35

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
Michael Telatynski 2025-02-27 17:49:05 +00:00
commit aa1bf5c212
No known key found for this signature in database
GPG Key ID: A2B008A5F49F5D0D
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,3 +1,13 @@
Changes in [1.11.94](https://github.com/element-hq/element-desktop/releases/tag/v1.11.94) (2025-02-27)
======================================================================================================
* No changes
## 🐛 Bug Fixes
* [Backport staging] fix: /tmp/element-web-config may already exist preventing the container from booting up ([#29377](https://github.com/element-hq/element-web/pull/29377)). Contributed by @RiotRobot.
Changes in [1.11.93](https://github.com/element-hq/element-desktop/releases/tag/v1.11.93) (2025-02-25)
======================================================================================================
## ✨ Features

8
package.json
View File

@ -3,7 +3,7 @@
"productName": "Element",
"main": "lib/electron-main.js",
"exports": "./lib/electron-main.js",
"version": "1.11.93",
"version": "1.11.94",
"description": "Element: the future of secure communication",
"author": "Element",
"homepage": "https://element.io",
@ -82,12 +82,12 @@
"@types/pacote": "^11.1.1",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"app-builder-lib": "26.0.7",
"app-builder-lib": "26.0.8",
"chokidar": "^4.0.0",
"detect-libc": "^2.0.0",
"electron": "35.0.0-beta.10",
"electron-builder": "26.0.7",
"electron-builder-squirrel-windows": "26.0.7",
"electron-builder": "26.0.8",
"electron-builder-squirrel-windows": "26.0.8",
"electron-devtools-installer": "^4.0.0",
"eslint": "^8.26.0",
"eslint-config-google": "^0.14.0",

40
yarn.lock
View File

@ -2522,10 +2522,10 @@ app-builder-bin@5.0.0-alpha.12:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80"
integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==
app-builder-lib@26.0.7:
version "26.0.7"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.7.tgz#c930a624c8184b39c1974b27505f84eaf89d17b7"
integrity sha512-Sa6qGtt2l9of+KEA2fxdRBNLcWld74xgaP+U3Zr3A0R529Z2jPfUTmLi0dDY3jwRF6uOrsQAEkN+JWWvw5WpPw==
app-builder-lib@26.0.8:
version "26.0.8"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.8.tgz#a809f60fb6d371743214893e0feab89c598bed99"
integrity sha512-inISmbUzsWJcKUHEzANHvh4Z3Tqld3lcGa6TfDzEBzhAcku2JhOX4GXz7w/Yb+mjQIFcfUGD8NDAfu/hjv3AiA==
dependencies:
"@develar/schema-utils" "~2.6.5"
"@electron/asar" "3.2.18"
@ -3348,12 +3348,12 @@ dir-compare@^4.2.0:
minimatch "^3.0.5"
p-limit "^3.1.0 "
dmg-builder@26.0.7:
version "26.0.7"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.7.tgz#f1a2d7dcfd7cfdc143cabdaf78e9f94df9ce98a3"
integrity sha512-fsMjG/TmwcC7HzjSNi+3mlEUgo0RrWwq44VB9XKcGtTPPfqfSi3JvhWCCsAWzElZ0OtSO/DnK/TNgSqyaG/Ajw==
dmg-builder@26.0.8:
version "26.0.8"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.8.tgz#53e5455b41b0c53dcac30eee58bb9d839699cad1"
integrity sha512-m2exxy1w/I5XuJ3+AKsInW+odHhXMuyPVFQ4feUnBX/dsyfKcA8f5TesmSWPD4+SoyB3Hgefz9FGLn7CI3+/NQ==
dependencies:
app-builder-lib "26.0.7"
app-builder-lib "26.0.8"
builder-util "26.0.7"
builder-util-runtime "9.3.1"
fs-extra "^10.1.0"
@ -3439,25 +3439,25 @@ ejs@^3.1.8:
dependencies:
jake "^10.8.5"
electron-builder-squirrel-windows@26.0.7:
version "26.0.7"
resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.7.tgz#66cb4a0bedea951b61378bd3bad0c60e7c1731ec"
integrity sha512-xNavcnsM55zkfk6gdyhED+eCOMDFK76B+cqYMANMmeoGH4Lcp6jM3nob6CPXrEsXc0yNMVa7enR3wkRsE5IpaA==
electron-builder-squirrel-windows@26.0.8:
version "26.0.8"
resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.8.tgz#0ed66c409dbaba864b1ab6feccbc3aa107d90382"
integrity sha512-rkhrZFeGr5XrILkhIlnfB4wepaY0o8Q26qLabB4+jqFqZxAdDT9lwclo6A5nZBze7Bbi8ZAk9Q50RgSfhBzrIA==
dependencies:
app-builder-lib "26.0.7"
app-builder-lib "26.0.8"
builder-util "26.0.7"
electron-winstaller "5.4.0"
electron-builder@26.0.7:
version "26.0.7"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.7.tgz#4f6724f41735b919514cd1b7462be7eb2d37078a"
integrity sha512-nVSaWw3dMLGGLrI/7WSifYzNGNseIpvmFwBRwi2E8tOUkcqN+em+3qYeRq8k/AYHRDcrmj6UCJJT6rBo+bikfw==
electron-builder@26.0.8:
version "26.0.8"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.8.tgz#bce826a878b194b5cfd17fcebda1e5e539d4ff3d"
integrity sha512-7Heomwy2C9OUJQOYN+zdPSVhIEmaw59v6cPYZWx/FvGX4UbcH5HT2AdjxAzLkcMTAbwVwt1TqmJr9LPs6SYvEA==
dependencies:
app-builder-lib "26.0.7"
app-builder-lib "26.0.8"
builder-util "26.0.7"
builder-util-runtime "9.3.1"
chalk "^4.1.2"
dmg-builder "26.0.7"
dmg-builder "26.0.8"
fs-extra "^10.1.0"
is-ci "^3.0.0"
lazy-val "^1.0.5"