Skip to content

Commit 297bfac

Browse files
committed
Merge tag 'v1.8.5' into develop
* Add bubble highlight styling ([\element-hq#6582](matrix-org/matrix-react-sdk#6582)). Fixes element-hq#18295 and element-hq#18295. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Create narrow mode for Composer ([\#6682](matrix-org/matrix-react-sdk#6682)). Fixes element-hq#18533 and element-hq#18533. * Prefer matrix.to alias links over room id in spaces & share ([\element-hq#6745](matrix-org/matrix-react-sdk#6745)). Fixes element-hq#18796 and element-hq#18796. * Stop automatic playback of voice messages if a non-voice message is encountered ([\element-hq#6728](matrix-org/matrix-react-sdk#6728)). Fixes element-hq#18850 and element-hq#18850. * Show call length during a call ([\element-hq#6700](matrix-org/matrix-react-sdk#6700)). Fixes element-hq#18566 and element-hq#18566. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Serialize and retry mass-leave when leaving space ([\element-hq#6737](matrix-org/matrix-react-sdk#6737)). Fixes element-hq#18789 and element-hq#18789. * Improve form handling in and around space creation ([\#6739](matrix-org/matrix-react-sdk#6739)). Fixes element-hq#18775 and element-hq#18775. * Split autoplay GIFs and videos into different settings ([\element-hq#6726](matrix-org/matrix-react-sdk#6726)). Fixes element-hq#5771 and element-hq#5771. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Add autoplay for voice messages ([\element-hq#6710](matrix-org/matrix-react-sdk#6710)). Fixes element-hq#18804, element-hq#18715, element-hq#18714 element-hq#17961 and element-hq#18804. * Allow to use basic html to format invite messages ([\#6703](matrix-org/matrix-react-sdk#6703)). Fixes element-hq#15738 and element-hq#15738. Contributed by [skolmer](https://github.com/skolmer). * Allow widgets, when eligible, to interact with more rooms as per MSC2762 ([\element-hq#6684](matrix-org/matrix-react-sdk#6684)). * Remove arbitrary limits from send/receive events for widgets ([\element-hq#6719](matrix-org/matrix-react-sdk#6719)). Fixes element-hq#17994 and element-hq#17994. * Reload suggested rooms if we see the state change down /sync ([\element-hq#6715](matrix-org/matrix-react-sdk#6715)). Fixes element-hq#18761 and element-hq#18761. * When creating private spaces, make the initial rooms restricted if supported ([\element-hq#6721](matrix-org/matrix-react-sdk#6721)). Fixes element-hq#18722 and element-hq#18722. * Threading exploration work ([\element-hq#6658](matrix-org/matrix-react-sdk#6658)). Fixes element-hq#18532 and element-hq#18532. * Default to `Don't leave any` when leaving a space ([\element-hq#6697](matrix-org/matrix-react-sdk#6697)). Fixes element-hq#18592 and element-hq#18592. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Special case redaction event sending from widgets per MSC2762 ([\element-hq#6686](matrix-org/matrix-react-sdk#6686)). Fixes element-hq#18573 and element-hq#18573. * Add active speaker indicators ([\element-hq#6639](matrix-org/matrix-react-sdk#6639)). Fixes element-hq#17627 and element-hq#17627. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Increase general app performance by optimizing layers ([\element-hq#6644](matrix-org/matrix-react-sdk#6644)). Fixes element-hq#18730 and element-hq#18730. Contributed by [Palid](https://github.com/Palid). * Fix autocomplete not having y-scroll ([\element-hq#6802](matrix-org/matrix-react-sdk#6802)). * Fix emoji picker and stickerpicker not appearing correctly when opened ([\element-hq#6801](matrix-org/matrix-react-sdk#6801)). * Debounce read marker update on scroll ([\element-hq#6774](matrix-org/matrix-react-sdk#6774)). * Fix Space creation wizard go to my first room button behaviour ([\element-hq#6748](matrix-org/matrix-react-sdk#6748)). Fixes element-hq#18764 and element-hq#18764. * Fix scroll being stuck at bottom ([\element-hq#6751](matrix-org/matrix-react-sdk#6751)). Fixes element-hq#18903 and element-hq#18903. * Fix widgets not remembering identity verification when asked to. ([\element-hq#6742](matrix-org/matrix-react-sdk#6742)). Fixes element-hq#15631 and element-hq#15631. * Add missing pluralisation i18n strings for Spaces ([\element-hq#6738](matrix-org/matrix-react-sdk#6738)). Fixes element-hq#18780 and element-hq#18780. * Make ForgotPassword UX slightly more user friendly ([\#6636](matrix-org/matrix-react-sdk#6636)). Fixes element-hq#11531 and element-hq#11531. Contributed by [Palid](https://github.com/Palid). * Don't context switch room on SpaceStore ready as it can break permalinks ([\element-hq#6730](matrix-org/matrix-react-sdk#6730)). Fixes element-hq#17974 and element-hq#17974. * Fix explore rooms button not working during space creation wizard ([\element-hq#6729](matrix-org/matrix-react-sdk#6729)). Fixes element-hq#18762 and element-hq#18762. * Fix bug where one party's media would sometimes not be shown ([\element-hq#6731](matrix-org/matrix-react-sdk#6731)). * Only make the initial space rooms suggested by default ([\element-hq#6714](matrix-org/matrix-react-sdk#6714)). Fixes element-hq#18760 and element-hq#18760. * Replace fake username in EventTilePreview with a proper loading state ([\element-hq#6702](matrix-org/matrix-react-sdk#6702)). Fixes element-hq#15897 and element-hq#15897. Contributed by [skolmer](https://github.com/skolmer). * Don't send prehistorical events to widgets during decryption at startup ([\element-hq#6695](matrix-org/matrix-react-sdk#6695)). Fixes element-hq#18060 and element-hq#18060. * When creating subspaces properly set restricted join rule ([\element-hq#6725](matrix-org/matrix-react-sdk#6725)). Fixes element-hq#18797 and element-hq#18797. * Fix the Image View not openning for some pinned messages ([\element-hq#6723](matrix-org/matrix-react-sdk#6723)). Fixes element-hq#18422 and element-hq#18422. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Show autocomplete sections vertically ([\element-hq#6722](matrix-org/matrix-react-sdk#6722)). Fixes element-hq#18860 and element-hq#18860. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Fix EmojiPicker filtering to lower case emojibase data strings ([\element-hq#6717](matrix-org/matrix-react-sdk#6717)). Fixes element-hq#18686 and element-hq#18686. * Clear currentRoomId when viewing home page, fixing document title ([\element-hq#6716](matrix-org/matrix-react-sdk#6716)). Fixes element-hq#18668 and element-hq#18668. * Fix membership updates to Spaces not applying in real-time ([\element-hq#6713](matrix-org/matrix-react-sdk#6713)). Fixes element-hq#18737 and element-hq#18737. * Don't show a double stacked invite modals when inviting to Spaces ([\element-hq#6698](matrix-org/matrix-react-sdk#6698)). Fixes element-hq#18745 and element-hq#18745. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Remove non-functional DuckDuckGo Autocomplete Provider ([\element-hq#6712](matrix-org/matrix-react-sdk#6712)). Fixes element-hq#18778 and element-hq#18778. * Filter members on `MemberList` load ([\element-hq#6708](matrix-org/matrix-react-sdk#6708)). Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Fix improper voice messages being produced in Firefox and sometimes other browsers. ([\element-hq#6696](matrix-org/matrix-react-sdk#6696)). Fixes element-hq#18587 and element-hq#18587. * Fix client forgetting which capabilities a widget was approved for ([\element-hq#6685](matrix-org/matrix-react-sdk#6685)). Fixes element-hq#18786 and element-hq#18786. * Fix left panel widgets not remembering collapsed state ([\element-hq#6687](matrix-org/matrix-react-sdk#6687)). Fixes element-hq#17803 and element-hq#17803. * Fix changelog link colour back to blue ([\element-hq#6692](matrix-org/matrix-react-sdk#6692)). Fixes element-hq#18726 and element-hq#18726. * Soften codeblock border color ([\element-hq#6564](matrix-org/matrix-react-sdk#6564)). Fixes element-hq#18367 and element-hq#18367. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Pause ringing more aggressively ([\element-hq#6691](matrix-org/matrix-react-sdk#6691)). Fixes element-hq#18588 and element-hq#18588. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Fix command autocomplete ([\element-hq#6680](matrix-org/matrix-react-sdk#6680)). Fixes element-hq#18670 and element-hq#18670. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Don't re-sort the room-list based on profile/status changes ([\element-hq#6595](matrix-org/matrix-react-sdk#6595)). Fixes #110 and #110. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Fix codeblock formatting with syntax highlighting on ([\element-hq#6681](matrix-org/matrix-react-sdk#6681)). Fixes element-hq#18739 element-hq#18365 and element-hq#18739. Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Add padding to the Add button in the notification settings ([\element-hq#6665](matrix-org/matrix-react-sdk#6665)). Fixes element-hq#18706 and element-hq#18706. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
2 parents 9475480 + 7a72547 commit 297bfac

File tree

13 files changed

+664
-512
lines changed

13 files changed

+664
-512
lines changed

.env.example

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# To enable CSS hot-reload, set the following variable to 1.
22
CSS_HOT_RELOAD=1
3+
# To use the annoying and inconsistent full page error dialog, set this to 1.
4+
FULL_PAGE_ERRORS=0
35
# To use a single theme, uncomment the line with the theme you want to hot-reload.
46
MATRIX_THEMES='light'
57
#MATRIX_THEMES='dark'
6-
#MATRIX_THEMES='light-legacy'
7-
#MATRIX_THEMES='dark-legacy'
8+
#MATRIX_THEMES='legacy-light'
9+
#MATRIX_THEMES='legacy-dark'
810
#MATRIX_THEMES='light-custom'
911
#MATRIX_THEMES='dark-custom'
1012
# You can also enable multiple themes by using a comma-separated list.

.github/ISSUE_TEMPLATE/bug-desktop.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@ body:
2121
validations:
2222
required: true
2323
- type: textarea
24-
id: what-happened
24+
id: result
2525
attributes:
2626
label: What happened?
2727
placeholder: Tell us what went wrong
28-
validations:
29-
required: true
30-
- type: textarea
31-
id: expected-result
32-
attributes:
33-
label: What did you expect?
34-
placeholder: Tell us what you expected to happen
28+
value: |
29+
### What did you expect?
30+
31+
### What happened?
3532
validations:
3633
required: true
3734
- type: input
@@ -57,6 +54,14 @@ body:
5754
placeholder: e.g. From https://element.io/get-started
5855
validations:
5956
required: false
57+
- type: input
58+
id: homeserver
59+
attributes:
60+
label: Homeserver
61+
description: Which server is your account registered on?
62+
placeholder: e.g. matrix.org
63+
validations:
64+
required: false
6065
- type: dropdown
6166
id: rageshake
6267
attributes:

.github/ISSUE_TEMPLATE/bug-web.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@ body:
2121
validations:
2222
required: true
2323
- type: textarea
24-
id: what-happened
24+
id: result
2525
attributes:
2626
label: What happened?
2727
placeholder: Tell us what went wrong
28-
validations:
29-
required: true
30-
- type: textarea
31-
id: expected-result
32-
attributes:
33-
label: What did you expect?
34-
placeholder: Tell us what you expected to happen
28+
value: |
29+
### What did you expect?
30+
31+
### What happened?
3532
validations:
3633
required: true
3734
- type: input
@@ -57,6 +54,14 @@ body:
5754
placeholder: e.g. develop.element.io, app.element.io
5855
validations:
5956
required: false
57+
- type: input
58+
id: homeserver
59+
attributes:
60+
label: Homeserver
61+
description: Which server is your account registered on?
62+
placeholder: e.g. matrix.org
63+
validations:
64+
required: false
6065
- type: dropdown
6166
id: rageshake
6267
attributes:

.github/workflows/issues_to_projects.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,18 @@ jobs:
1919
project-url: "https://github.com/orgs/vector-im/projects/14"
2020
column-name: "📥 Inbox"
2121
label-name: "X-Needs-Design"
22+
23+
move_spaces_issues:
24+
name: Move Spaces issues to Delight project board
25+
runs-on: ubuntu-latest
26+
if: >
27+
contains(github.event.issue.labels.*.name, 'A-Spaces') ||
28+
contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
29+
contains(github.event.issue.labels.*.name, 'A-Subspaces')
30+
steps:
31+
- uses: konradpabjan/[email protected]
32+
with:
33+
action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
34+
project-url: "https://github.com/orgs/vector-im/projects/6"
35+
column-name: "📥 Inbox"
36+
label-name: "A-Spaces"

.github/workflows/triage-priority-bugs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
- uses: alex-page/[email protected]
2121
with:
2222
project: Web App Team
23-
column: Priority bugs
23+
column: P1
2424
repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
2525

CHANGELOG.md

Lines changed: 118 additions & 4 deletions
Large diffs are not rendered by default.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM node:14-buster as builder
55
# images of element-web develop.
66
ARG USE_CUSTOM_SDKS=true
77
ARG REACT_SDK_REPO="https://github.com/williamkray/matrix-react-sdk.git"
8-
ARG REACT_SDK_BRANCH="wreck/v3.29.1-wrecked"
8+
ARG REACT_SDK_BRANCH="wreck/v3.30.0-wrecked"
99
ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
1010
ARG JS_SDK_BRANCH="master"
1111

docs/labs.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,11 @@ and notification noises are suppressed. Not perfect, but can help reduce noise.
133133
## Hidden read receipts (`feature_hidden_read_receipts`)
134134

135135
Enables sending hidden read receipts as per [MSC2285](https://github.com/matrix-org/matrix-doc/pull/2285)
136+
137+
## New layout switcher (with message bubbles) (`feature_new_layout_switcher`)
138+
139+
Adds a "Message layout" section under `Settings -> Appearance`, where the user can select their preferred message layout (e.g. IRC or Modern). Additionally, adds a new "Message bubbles" layout.
140+
141+
## Pseudonymous Analytics opt-in
142+
143+
Opts in to collection of pseudonymous analytics data via Posthog. See https://github.com/matrix-org/matrix-react-sdk/pull/6495

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.8.4",
3+
"version": "1.8.5",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -61,9 +61,9 @@
6161
"highlight.js": "^10.5.0",
6262
"jsrsasign": "^10.2.0",
6363
"katex": "^0.12.0",
64-
"matrix-js-sdk": "12.4.1",
65-
"matrix-react-sdk": "3.29.1",
66-
"matrix-widget-api": "^0.1.0-beta.15",
64+
"matrix-js-sdk": "12.5.0",
65+
"matrix-react-sdk": "3.30.0",
66+
"matrix-widget-api": "^0.1.0-beta.16",
6767
"prop-types": "^15.7.2",
6868
"react": "^17.0.2",
6969
"react-dom": "^17.0.2",
@@ -98,7 +98,7 @@
9898
"@types/sanitize-html": "^2.3.1",
9999
"@typescript-eslint/eslint-plugin": "^4.17.0",
100100
"@typescript-eslint/parser": "^4.17.0",
101-
"allchange": "^1.0.0",
101+
"allchange": "^1.0.3",
102102
"autoprefixer": "^9.8.6",
103103
"babel-jest": "^26.6.3",
104104
"babel-loader": "^8.2.2",

src/i18n/strings/ga.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
"Go to element.io": "Téigh go element.io",
3434
"Open user settings": "Oscail socruithe úsáideora",
3535
"Open": "Oscail",
36-
"Use %(brand)s on mobile": "Úsáid %(brand)s ar guthán póca"
36+
"Use %(brand)s on mobile": "Úsáid %(brand)s ar guthán póca",
37+
"Switch to space by number": "Athraigh go spás de réir uimhreach"
3738
}

0 commit comments

Comments
 (0)