Skip to content

Commit ca7987d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into synodim
2 parents 8cc88e6 + 1df72ce commit ca7987d

File tree

13 files changed

+206
-365
lines changed

13 files changed

+206
-365
lines changed

.env.example

Lines changed: 0 additions & 16 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
Changes in [1.11.82](https://github.com/element-hq/element-web/releases/tag/v1.11.82) (2024-10-22)
2+
==================================================================================================
3+
## ✨ Features
4+
5+
* Deduplicate more icons using Compound Design Tokens ([#132](https://github.com/element-hq/matrix-react-sdk/pull/132)). Contributed by @t3chguy.
6+
* Always show link new device flow even if unsupported ([#147](https://github.com/element-hq/matrix-react-sdk/pull/147)). Contributed by @t3chguy.
7+
* Update design of files list in right panel ([#144](https://github.com/element-hq/matrix-react-sdk/pull/144)). Contributed by @t3chguy.
8+
* Remove feature\_dehydration ([#138](https://github.com/element-hq/matrix-react-sdk/pull/138)). Contributed by @florianduros.
9+
* Upgrade emojibase-bindings and remove local handling of emoticon variations ([#127](https://github.com/element-hq/matrix-react-sdk/pull/127)). Contributed by @langleyd.
10+
* Add support for rendering media captions ([#43](https://github.com/element-hq/matrix-react-sdk/pull/43)). Contributed by @tulir.
11+
* Replace composer icons with Compound variants ([#123](https://github.com/element-hq/matrix-react-sdk/pull/123)). Contributed by @t3chguy.
12+
* Tweak default right panel size to be 320px except for maximised widgets at 420px ([#110](https://github.com/element-hq/matrix-react-sdk/pull/110)). Contributed by @t3chguy.
13+
* Add a pinned message badge under a pinned message ([#118](https://github.com/element-hq/matrix-react-sdk/pull/118)). Contributed by @florianduros.
14+
* Ditch right panel tabs and re-add close button ([#99](https://github.com/element-hq/matrix-react-sdk/pull/99)). Contributed by @t3chguy.
15+
* Force verification even for refreshed clients ([#44](https://github.com/element-hq/matrix-react-sdk/pull/44)). Contributed by @dbkr.
16+
* Update emoji text, border and background colour in timeline ([#119](https://github.com/element-hq/matrix-react-sdk/pull/119)). Contributed by @florianduros.
17+
* Disable ICE fallback based on well-known configuration ([#111](https://github.com/element-hq/matrix-react-sdk/pull/111)). Contributed by @t3chguy.
18+
* Remove legacy room header and promote beta room header ([#105](https://github.com/element-hq/matrix-react-sdk/pull/105)). Contributed by @t3chguy.
19+
* Respect `io.element.jitsi` `useFor1To1Calls` in well-known ([#112](https://github.com/element-hq/matrix-react-sdk/pull/112)). Contributed by @t3chguy.
20+
* Use Compound close icon in favour of mishmash of x/close icons ([#108](https://github.com/element-hq/matrix-react-sdk/pull/108)). Contributed by @t3chguy.
21+
22+
## 🐛 Bug Fixes
23+
24+
* Correct typo in option documentation ([#28148](https://github.com/element-hq/element-web/pull/28148)). Contributed by @AndrewKvalheim.
25+
* Revert #124 and #135 ([#139](https://github.com/element-hq/matrix-react-sdk/pull/139)). Contributed by @dbkr.
26+
* Add aria-label to e2e icon ([#136](https://github.com/element-hq/matrix-react-sdk/pull/136)). Contributed by @florianduros.
27+
* Fix bell icons on room list hover being black squares ([#135](https://github.com/element-hq/matrix-react-sdk/pull/135)). Contributed by @dbkr.
28+
* Fix vertical overflow on the mobile register screen ([#137](https://github.com/element-hq/matrix-react-sdk/pull/137)). Contributed by @langleyd.
29+
* Allow to unpin redacted event ([#98](https://github.com/element-hq/matrix-react-sdk/pull/98)). Contributed by @florianduros.
30+
31+
32+
133
Changes in [1.11.81](https://github.com/element-hq/element-web/releases/tag/v1.11.81) (2024-10-15)
234
==================================================================================================
335
This release fixes High severity vulnerability CVE-2024-47771 / GHSA-963w-49j9-gxj6

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,6 @@ internet. So please don't depend on resources (JS libs, CSS, images, fonts)
206206
hosted by external CDNs or servers but instead please package all dependencies
207207
into Element itself.
208208

209-
CSS hot-reload is available as an opt-in development feature. You can enable it
210-
by defining a `CSS_HOT_RELOAD` environment variable, in a `.env` file in the root
211-
of the repository. See `.env.example` for documentation and an example.
212-
213209
# Setting up a dev environment
214210

215211
Much of the functionality in Element is actually in the `matrix-react-sdk` and

docs/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ complete re-branding/private labeling, a more personalised experience can be ach
154154
2. `description`: Required. The description to use for the notice.
155155
3. `show_once`: Optional. If true then the notice will only be shown once per device.
156156
18. `help_url`: The URL to point users to for help with the app, defaults to `https://element.io/help`.
157-
19. `help_encrption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
157+
19. `help_encryption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
158158
20. `force_verification`: If true, users must verify new logins (eg. with another device / their security key)
159159

160160
### `desktop_builds` and `mobile_builds`

docs/labs.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ This is useful while we experiment with encryption and to make calling compatibl
110110

111111
Enables rendering of MD / HTML in room topics.
112112

113-
## New room header & details (`feature_new_room_decoration_ui`) [In Development]
114-
115-
Refactors visually the room header and room sidebar
116-
117113
## Enable the notifications panel in the room header (`feature_notifications`)
118114

119115
Unreliable in encrypted rooms.

element.io/develop/config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"privacy_policy_url": "https://element.io/cookie-policy",
5050
"features": {
5151
"threadsActivityCentre": true,
52-
"feature_new_room_decoration_ui": true,
5352
"feature_video_rooms": true,
5453
"feature_group_calls": true,
5554
"feature_element_call_video_rooms": true

package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.11.81",
3+
"version": "1.11.82",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -70,20 +70,20 @@
7070
"@types/react-dom": "17.0.25",
7171
"@types/react": "17.0.82",
7272
"@vector-im/compound-design-tokens": "1.8.0",
73-
"@vector-im/compound-web": "5.5.0",
73+
"@vector-im/compound-web": "7.0.0",
7474
"@floating-ui/react": "0.26.11",
7575
"@radix-ui/react-id": "1.1.0"
7676
},
7777
"dependencies": {
7878
"@formatjs/intl-segmenter": "^11.5.7",
7979
"@matrix-org/react-sdk-module-api": "^2.3.0",
8080
"@vector-im/compound-design-tokens": "^1.8.0",
81-
"@vector-im/compound-web": "^5.5.0",
81+
"@vector-im/compound-web": "^7.0.0",
8282
"jsrsasign": "^11.0.0",
8383
"katex": "^0.16.0",
8484
"lodash": "^4.17.21",
85-
"matrix-js-sdk": "34.8.0",
86-
"matrix-react-sdk": "3.113.0",
85+
"matrix-js-sdk": "34.9.0",
86+
"matrix-react-sdk": "3.114.0",
8787
"matrix-widget-api": "^1.8.2",
8888
"react": "17.0.2",
8989
"react-dom": "17.0.2",
@@ -198,8 +198,6 @@
198198
"raw-loader": "^4.0.2",
199199
"rimraf": "^6.0.0",
200200
"semver": "^7.5.2",
201-
"string-replace-loader": "3",
202-
"style-loader": "4",
203201
"stylelint": "^16.1.0",
204202
"stylelint-config-standard": "^36.0.0",
205203
"stylelint-scss": "^6.0.0",

src/vector/devcss.ts

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/vector/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@
7575
<img src="<%= require('matrix-react-sdk/res/img/warning.svg').default %>" aria-hidden alt="" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
7676
<img src="<%= require('matrix-react-sdk/res/img/e2e/warning.svg').default %>" aria-hidden alt="" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
7777
<img src="<%= require('matrix-react-sdk/res/img/feather-customised/warning-triangle.svg').default %>" aria-hidden alt="" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
78-
<img src="<%= require('matrix-react-sdk/res/img/format/bold.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
79-
<img src="<%= require('matrix-react-sdk/res/img/format/code.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
80-
<img src="<%= require('matrix-react-sdk/res/img/format/italics.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
81-
<img src="<%= require('matrix-react-sdk/res/img/format/quote.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
82-
<img src="<%= require('matrix-react-sdk/res/img/format/strikethrough.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
78+
<img src="<%= require('@vector-im/compound-design-tokens/icons/bold.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
79+
<img src="<%= require('@vector-im/compound-design-tokens/icons/inline-code.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
80+
<img src="<%= require('@vector-im/compound-design-tokens/icons/italic.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
81+
<img src="<%= require('@vector-im/compound-design-tokens/icons/quote.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
82+
<img src="<%= require('@vector-im/compound-design-tokens/icons/strikethrough.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
8383

8484
<!-- let CSS themes pass constants to the app -->
8585
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>

src/vector/index.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@ import "./modernizr";
2222
// in webpack.config.js
2323
require("katex/dist/katex.css");
2424

25-
/**
26-
* This require is necessary only for purposes of CSS hot-reload, as otherwise
27-
* webpack has some incredible problems figuring out which CSS files should be
28-
* hot-reloaded, even with proper hints for the loader.
29-
*
30-
* On production build it's going to be an empty module, so don't worry about that.
31-
*/
32-
require("./devcss");
3325
require("./localstorage-fix");
3426

3527
async function settled(...promises: Array<Promise<any>>): Promise<void> {

0 commit comments

Comments
 (0)