Skip to content

Commit d397360

Browse files
su-exsu-ex
committed
Merge tag 'v1.11.3' into sc
* Improve auth aria attributes and semantics ([\element-hq#22948](element-hq#22948)). * Device manager - New device tile info design ([\element-hq#9122](matrix-org/matrix-react-sdk#9122)). Contributed by @kerryarchibald. * Device manager generic settings subsection component ([\element-hq#9147](matrix-org/matrix-react-sdk#9147)). Contributed by @kerryarchibald. * Migrate the hidden read receipts flag to new "send read receipts" option ([\element-hq#9141](matrix-org/matrix-react-sdk#9141)). * Live location sharing - share location at most every 5 seconds ([\element-hq#9148](matrix-org/matrix-react-sdk#9148)). Contributed by @kerryarchibald. * Increase max length of voice messages to 15m ([\element-hq#9133](matrix-org/matrix-react-sdk#9133)). Fixes element-hq#18620. * Move pin drop out of labs ([\element-hq#9135](matrix-org/matrix-react-sdk#9135)). * Start DM on first message ([\element-hq#8612](matrix-org/matrix-react-sdk#8612)). Fixes element-hq#14736. * Remove "Add Space" button from RoomListHeader when user cannot create spaces ([\element-hq#9129](matrix-org/matrix-react-sdk#9129)). * The Welcome Home Screen: Dedicated Download Apps Dialog ([\element-hq#9120](matrix-org/matrix-react-sdk#9120)). Fixes element-hq#22921. Contributed by @justjanne. * The Welcome Home Screen: "Submit Feedback" pane ([\element-hq#9090](matrix-org/matrix-react-sdk#9090)). Fixes element-hq#22918. Contributed by @justjanne. * New User Onboarding Task List ([\element-hq#9083](matrix-org/matrix-react-sdk#9083)). Fixes element-hq#22919. Contributed by @justjanne. * Add support for disabling spell checking ([\element-hq#8604](matrix-org/matrix-react-sdk#8604)). Fixes element-hq#21901. * Live location share - leave maximised map open when beacons expire ([\element-hq#9098](matrix-org/matrix-react-sdk#9098)). Contributed by @kerryarchibald. * Some slash-commands (`/myroomnick`) have temporarily been disabled before the first message in a DM is sent. ([\element-hq#9193](matrix-org/matrix-react-sdk#9193)). * Use stable reference for active tab in tabbedView ([\#9145](matrix-org/matrix-react-sdk#9145)). Contributed by @kerryarchibald. * Fix pillification sometimes doubling up ([\element-hq#9152](matrix-org/matrix-react-sdk#9152)). Fixes element-hq#23036. * Fix highlights not being applied to plaintext messages ([\element-hq#9126](matrix-org/matrix-react-sdk#9126)). Fixes element-hq#22787. * Fix dismissing edit composer when change was undone ([\element-hq#9109](matrix-org/matrix-react-sdk#9109)). Fixes element-hq#22932. * 1-to-1 DM rooms with bots now act like DM rooms instead of multi-user-rooms before ([\element-hq#9124](matrix-org/matrix-react-sdk#9124)). Fixes element-hq#22894. * Apply inline start padding to selected lines on modern layout only ([\element-hq#9006](matrix-org/matrix-react-sdk#9006)). Fixes element-hq#22768. Contributed by @luixxiul. * Peek into world-readable rooms from spotlight ([\element-hq#9115](matrix-org/matrix-react-sdk#9115)). Fixes element-hq#22862. * Use default styling on nested numbered lists due to MD being sensitive ([\element-hq#9110](matrix-org/matrix-react-sdk#9110)). Fixes element-hq#22935. * Fix replying using chat effect commands ([\element-hq#9101](matrix-org/matrix-react-sdk#9101)). Fixes element-hq#22824.
2 parents 5f387fe + 33caca8 commit d397360

21 files changed

+1285
-1574
lines changed

‎.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ module.exports = {
2323
"plugin:matrix-org/typescript",
2424
"plugin:matrix-org/react",
2525
],
26+
// NOTE: These rules are frozen and new rules should not be added here.
27+
// New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
2628
rules: {
2729
// Things we do that break the ideal style
2830
"prefer-promise-reject-errors": "off",

‎.github/renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"github>matrix-org/renovate-config-element-web"
5+
]
6+
}

‎.github/workflows/static_analysis.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,19 @@ jobs:
6363

6464
- name: Run Linter
6565
run: "yarn run lint:style"
66+
67+
analyse_dead_code:
68+
name: "Analyse Dead Code"
69+
runs-on: ubuntu-latest
70+
steps:
71+
- uses: actions/checkout@v2
72+
73+
- uses: actions/setup-node@v3
74+
with:
75+
cache: 'yarn'
76+
77+
- name: Install Deps
78+
run: "scripts/layered.sh"
79+
80+
- name: Dead Code Analysis
81+
run: "yarn run analyse:unused-exports"

‎.github/workflows/triage-labelled.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ jobs:
9393
runs-on: ubuntu-latest
9494
if: >
9595
contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') ||
96+
(contains(github.event.issue.labels.*.name, 'A-Threads') &&
97+
(contains(github.event.issue.labels.*.name, 'S-Major') ||
98+
contains(github.event.issue.labels.*.name, 'S-Critical'))) ||
9699
contains(github.event.issue.labels.*.name, 'Team: Delight') ||
97100
contains(github.event.issue.labels.*.name, 'Z-NewUserJourney')
98101
steps:

‎CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
Changes in [1.11.3](https://github.com/vector-im/element-web/releases/tag/v1.11.3) (2022-08-16)
2+
===============================================================================================
3+
4+
## ✨ Features
5+
* Improve auth aria attributes and semantics ([\#22948](https://github.com/vector-im/element-web/pull/22948)).
6+
* Device manager - New device tile info design ([\#9122](https://github.com/matrix-org/matrix-react-sdk/pull/9122)). Contributed by @kerryarchibald.
7+
* Device manager generic settings subsection component ([\#9147](https://github.com/matrix-org/matrix-react-sdk/pull/9147)). Contributed by @kerryarchibald.
8+
* Migrate the hidden read receipts flag to new "send read receipts" option ([\#9141](https://github.com/matrix-org/matrix-react-sdk/pull/9141)).
9+
* Live location sharing - share location at most every 5 seconds ([\#9148](https://github.com/matrix-org/matrix-react-sdk/pull/9148)). Contributed by @kerryarchibald.
10+
* Increase max length of voice messages to 15m ([\#9133](https://github.com/matrix-org/matrix-react-sdk/pull/9133)). Fixes #18620.
11+
* Move pin drop out of labs ([\#9135](https://github.com/matrix-org/matrix-react-sdk/pull/9135)).
12+
* Start DM on first message ([\#8612](https://github.com/matrix-org/matrix-react-sdk/pull/8612)). Fixes #14736.
13+
* Remove "Add Space" button from RoomListHeader when user cannot create spaces ([\#9129](https://github.com/matrix-org/matrix-react-sdk/pull/9129)).
14+
* The Welcome Home Screen: Dedicated Download Apps Dialog ([\#9120](https://github.com/matrix-org/matrix-react-sdk/pull/9120)). Fixes #22921. Contributed by @justjanne.
15+
* The Welcome Home Screen: "Submit Feedback" pane ([\#9090](https://github.com/matrix-org/matrix-react-sdk/pull/9090)). Fixes #22918. Contributed by @justjanne.
16+
* New User Onboarding Task List ([\#9083](https://github.com/matrix-org/matrix-react-sdk/pull/9083)). Fixes #22919. Contributed by @justjanne.
17+
* Add support for disabling spell checking ([\#8604](https://github.com/matrix-org/matrix-react-sdk/pull/8604)). Fixes #21901.
18+
* Live location share - leave maximised map open when beacons expire ([\#9098](https://github.com/matrix-org/matrix-react-sdk/pull/9098)). Contributed by @kerryarchibald.
19+
20+
## 🐛 Bug Fixes
21+
* Some slash-commands (`/myroomnick`) have temporarily been disabled before the first message in a DM is sent. ([\#9193](https://github.com/matrix-org/matrix-react-sdk/pull/9193)).
22+
* Use stable reference for active tab in tabbedView ([\#9145](https://github.com/matrix-org/matrix-react-sdk/pull/9145)). Contributed by @kerryarchibald.
23+
* Fix pillification sometimes doubling up ([\#9152](https://github.com/matrix-org/matrix-react-sdk/pull/9152)). Fixes #23036.
24+
* Fix highlights not being applied to plaintext messages ([\#9126](https://github.com/matrix-org/matrix-react-sdk/pull/9126)). Fixes #22787.
25+
* Fix dismissing edit composer when change was undone ([\#9109](https://github.com/matrix-org/matrix-react-sdk/pull/9109)). Fixes #22932.
26+
* 1-to-1 DM rooms with bots now act like DM rooms instead of multi-user-rooms before ([\#9124](https://github.com/matrix-org/matrix-react-sdk/pull/9124)). Fixes #22894.
27+
* Apply inline start padding to selected lines on modern layout only ([\#9006](https://github.com/matrix-org/matrix-react-sdk/pull/9006)). Fixes #22768. Contributed by @luixxiul.
28+
* Peek into world-readable rooms from spotlight ([\#9115](https://github.com/matrix-org/matrix-react-sdk/pull/9115)). Fixes #22862.
29+
* Use default styling on nested numbered lists due to MD being sensitive ([\#9110](https://github.com/matrix-org/matrix-react-sdk/pull/9110)). Fixes #22935.
30+
* Fix replying using chat effect commands ([\#9101](https://github.com/matrix-org/matrix-react-sdk/pull/9101)). Fixes #22824.
31+
132
Changes in [1.11.2](https://github.com/vector-im/element-web/releases/tag/v1.11.2) (2022-08-03)
233
===============================================================================================
334

‎Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ FROM nginx:alpine
2727

2828
COPY --from=builder /src/webapp /app
2929

30-
# Insert wasm type into Nginx mime.types file so they load correctly.
31-
RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types
32-
3330
# Override default nginx config
3431
COPY /nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
3532

‎docs/labs.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ To enable message previews for reactions in DMs only, enable `feature_roomlist_p
112112
Allows users to receive encrypted messages by creating a device that is stored
113113
encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697).
114114

115-
## Hidden read receipts (`feature_hidden_read_receipts`)
116-
117-
Enables sending hidden read receipts as per [MSC2285](https://github.com/matrix-org/matrix-doc/pull/2285)
118-
119115
## Breadcrumbs v2 (`feature_breadcrumbs_v2`)
120116

121117
Instead of showing the horizontal list of breadcrumbs under the filter field, the new UX is an interactive context menu
@@ -150,14 +146,6 @@ If no right panel state is known for the room or it was closed on the last room
150146
visit, it will default to the room member list. Otherwise, the saved card last
151147
used in that room is shown.
152148

153-
## Show current profile of users on historical messages (`feature_use_only_current_profiles`)
154-
155-
An experimental flag to determine how the app would behave if a user's current display
156-
name and avatar (profile) were shown on historical messages instead of the profile details
157-
at the time when the message was sent.
158-
159-
When enabled, historical messages will use the current profile for the sender.
160-
161149
## Pin drop location sharing (`feature_location_share_pin_drop`) [In Development]
162150

163151
Enables sharing a pin drop location to the timeline.
@@ -195,4 +183,4 @@ have [MSC3827](https://github.com/matrix-org/matrix-spec-proposals/pull/3827) en
195183

196184
## Favourite Messages (`feature_favourite_messages`) [In Development]
197185

198-
Enables users to bookmark a message or content for a later reference.
186+
Enables users to bookmark a message or content for a later reference.

‎element.io/app/deploy.py

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

‎package.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.11.2",
3+
"version": "1.11.3",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -61,8 +61,8 @@
6161
"gfm.css": "^1.1.2",
6262
"jsrsasign": "^10.5.25",
6363
"katex": "^0.12.0",
64-
"matrix-js-sdk": "19.2.0",
65-
"matrix-react-sdk": "3.51.0",
64+
"matrix-js-sdk": "19.3.0",
65+
"matrix-react-sdk": "3.52.0",
6666
"matrix-widget-api": "^0.1.0-beta.18",
6767
"prop-types": "^15.7.2",
6868
"react": "17.0.2",
@@ -91,7 +91,7 @@
9191
"@sentry/webpack-plugin": "^1.18.1",
9292
"@svgr/webpack": "^5.5.0",
9393
"@types/flux": "^3.1.9",
94-
"@types/jest": "^27.0.2",
94+
"@types/jest": "^28.0.0",
9595
"@types/modernizr": "^3.5.3",
9696
"@types/node": "^14.14.22",
9797
"@types/react": "17.0.14",
@@ -102,7 +102,7 @@
102102
"@typescript-eslint/parser": "^5.6.0",
103103
"allchange": "^1.0.6",
104104
"autoprefixer": "^9.8.6",
105-
"babel-jest": "^26.6.3",
105+
"babel-jest": "^28.0.0",
106106
"babel-loader": "^8.2.2",
107107
"chokidar": "^3.5.1",
108108
"concurrently": "^5.3.0",
@@ -111,17 +111,18 @@
111111
"dotenv": "^10.0.0",
112112
"eslint": "8.9.0",
113113
"eslint-config-google": "^0.14.0",
114+
"eslint-plugin-deprecate": "^0.7.0",
114115
"eslint-plugin-import": "^2.25.4",
115-
"eslint-plugin-matrix-org": "^0.4.0",
116+
"eslint-plugin-matrix-org": "^0.6.1",
116117
"eslint-plugin-react": "^7.28.0",
117118
"eslint-plugin-react-hooks": "^4.3.0",
118119
"extract-text-webpack-plugin": "^4.0.0-beta.0",
119120
"fake-indexeddb": "^3.1.2",
120121
"file-loader": "^5.1.0",
121122
"fs-extra": "^0.30.0",
122123
"html-webpack-plugin": "^4.5.2",
123-
"jest": "^26.6.3",
124-
"jest-environment-jsdom-sixteen": "^1.0.3",
124+
"jest": "^28.0.0",
125+
"jest-environment-jsdom": "^28.1.3",
125126
"jest-raw-loader": "^1.0.1",
126127
"jest-sonar-reporter": "^2.0.0",
127128
"json-loader": "^0.5.7",
@@ -144,7 +145,6 @@
144145
"postcss-preset-env": "^6.7.0",
145146
"postcss-scss": "^2.1.1",
146147
"postcss-simple-vars": "^5.0.2",
147-
"postcss-strip-inline-comments": "^0.1.5",
148148
"raw-loader": "^4.0.2",
149149
"rimraf": "^3.0.2",
150150
"semver": "^7.3.7",
@@ -169,7 +169,10 @@
169169
"@types/react": "17.0.14"
170170
},
171171
"jest": {
172-
"testEnvironment": "jest-environment-jsdom-sixteen",
172+
"testEnvironment": "jsdom",
173+
"testEnvironmentOptions": {
174+
"url": "http://localhost/"
175+
},
173176
"testMatch": [
174177
"<rootDir>/test/**/*-test.[tj]s?(x)"
175178
],

0 commit comments

Comments
 (0)