Commit Graph

34033 Commits (c7d823d1972ee2ec6751582aa06319cd3254be0a)

Author SHA1 Message Date
Michael Telatynski f38cd38bd3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
 Conflicts:
	src/components/structures/TimelinePanel.js
	src/components/views/context_menus/MessageContextMenu.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
2021-06-17 15:31:06 +01:00
Michael Telatynski 017e0ba40f fix more private field accesses in tests 2021-06-17 15:23:29 +01:00
Michael Telatynski 2e73647a85 Fix tests by updating private field names and spies 2021-06-17 15:18:52 +01:00
J. Ryan Stinnett 07a0c3e450
Merge pull request #6211 from matrix-org/jryans/reply-scroll-release
[Release] Keep composer reply when scrolling away from a highlighted event
2021-06-17 15:12:54 +01:00
Germain Souquet 1597b2a971 Keep composer reply when scrolling away from a highlighted event 2021-06-17 15:07:59 +01:00
J. Ryan Stinnett e69b2fb3be
Merge pull request #6210 from matrix-org/jryans/reply-preview-li-release
[Release] Remove stray bullet point in reply preview
2021-06-17 15:04:44 +01:00
J. Ryan Stinnett 1fcfec6a94
Merge pull request #6209 from matrix-org/jryans/nested-reply-perf-release
[Release] Stop requesting null next replies from the server
2021-06-17 15:04:36 +01:00
Germain Souquet 0367b5bcce remove stray bullet point in reply preview 2021-06-17 15:02:18 +01:00
J. Ryan Stinnett 7c6161d83a Stop requesting null next replies from the server
A recent change (47e007e08f) introduced a
regression where we failed to check whether a reply thread has a next reply.
This meant that we would end up sending `/context/undefined` requests to the
server for every reply thread on every room view.

Fixes https://github.com/vector-im/element-web/issues/17563
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6079
2021-06-17 15:00:13 +01:00
Michael Telatynski 3e38d92fa4 Fix up some more type defs 2021-06-17 14:49:27 +01:00
J. Ryan Stinnett 9f83846ecc Remove redundant word from GitHub Actions workflow 2021-06-17 14:35:33 +01:00
Michael Telatynski 02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Michael Telatynski f929d2ee5f Typescript fixes due to MatrixEvent being TSified 2021-06-17 14:06:03 +01:00
Michael Telatynski 97e6599780
Merge pull request #6207 from matrix-org/t3chguy/ts/5
Fix types in SlashCommands
2021-06-17 12:15:16 +01:00
Michael Telatynski cce4ccb157 Fix types in SlashCommands which assumed something was a promise but it wasn't 2021-06-17 11:37:06 +01:00
Germain 782adbc41e
Merge pull request #6190 from matrix-org/gsouquet/performance-tracking-markers 2021-06-17 10:27:33 +01:00
Germain 48e090abcc
Remove unnecessary comment 2021-06-17 10:20:43 +01:00
J. Ryan Stinnett 6e827ad4c9
Merge pull request #6204 from robintown/forward-dialog-display-name
Fix forward dialog message preview display names
2021-06-17 10:10:54 +01:00
Germain 2f1abe251f
Merge pull request #6206 from matrix-org/gsouquet/fix-17672
Remove stray bullet point in reply preview
2021-06-17 08:58:47 +01:00
Germain Souquet 1a08af8ccf remove stray bullet point in reply preview 2021-06-17 08:45:09 +01:00
Robin Townsend ce57b66c91 Fix forward dialog message preview display names
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 18:17:25 -04:00
J. Ryan Stinnett ad3aefad35
Merge pull request #6203 from matrix-org/jryans/nested-reply-perf
Stop requesting null next replies from the server
2021-06-16 20:17:53 +01:00
J. Ryan Stinnett 8f02ca8ce9 Stop requesting null next replies from the server
A recent change (47e007e08f) introduced a
regression where we failed to check whether a reply thread has a next reply.
This meant that we would end up sending `/context/undefined` requests to the
server for every reply thread on every room view.

Fixes https://github.com/vector-im/element-web/issues/17563
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6079
2021-06-16 18:04:41 +01:00
Michael Telatynski ccf30ed94c
Merge pull request #6202 from matrix-org/t3chguy/fix/17669 2021-06-16 12:46:44 +01:00
Michael Telatynski ab964339d2 Add another setState skip to prevent redundant state updates 2021-06-16 12:11:17 +01:00
Michael Telatynski 626d575820 tidy AuxPanel TS 2021-06-16 12:07:58 +01:00
Michael Telatynski d87325ae6a Small cleanup around the room status bar and auxpanel to prevent redundant state updates 2021-06-16 12:06:41 +01:00
Michael Telatynski e3a6ce13cd Fix tight-loop update issue caused by a broken shouldComponentUpdate 2021-06-16 12:04:37 +01:00
Michael Telatynski deb2e8d679 Remove unused methods 2021-06-16 12:04:01 +01:00
Germain Souquet 9f8d04ab9a Fix passing variable down to evaluate context 2021-06-16 11:39:04 +01:00
Germain 40d384d9f9
Merge pull request #6200 from matrix-org/gsouquet/fix-17632 2021-06-16 10:21:02 +01:00
Germain Souquet 069e2e13cf Migrate MessageTimestamp to TypeScript 2021-06-16 10:01:30 +01:00
Germain Souquet a5d608f2af Keep composer reply when scrolling away from a highlighted event 2021-06-16 10:01:23 +01:00
David Baker 3162d144e2
Merge pull request #6194 from matrix-org/dbkr/already_in_call
Cache virtual/native room mappings when they're created
2021-06-16 08:55:44 +01:00
Germain 1f15097e9d
Merge pull request #6191 from matrix-org/gsouquet/ci-disable-perf-comments
Disable comment-on-alert
2021-06-16 08:50:38 +01:00
Travis Ralston 7e434d8844
Merge pull request #6195 from matrix-org/dependabot/npm_and_yarn/postcss-7.0.36
Bump postcss from 7.0.35 to 7.0.36
2021-06-15 17:25:50 -06:00
Travis Ralston d13611736a Update MSC number references for voice messages
as per https://github.com/matrix-org/matrix-doc/pull/3245
2021-06-15 17:24:56 -06:00
Travis Ralston ea46df0d48 Partially restore immutable event objects at the rendering layer
This is primarily to fix some extremely rare edge cases in local echo, but also restores the accuracy of some comments in the stack regarding immutable event objects (which were made mutable many years ago).

This shouldn't have any impact on the daily usage of the app, only adding a measured 0ms of latency to the stack.
2021-06-15 14:23:19 -06:00
David Baker 38c5972d3e Merge remote-tracking branch 'origin/develop' into dbkr/already_in_call 2021-06-15 19:20:29 +01:00
dependabot[bot] 6ee55bb03c
Bump postcss from 7.0.35 to 7.0.36
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-15 16:08:33 +00:00
David Baker f1cd086ae2 Cache virtual/native room mappings when they're created
Otherwise we look up the mapping immediately afterwards and the
remote echo of the account data hasn't come back yet, so we get
nothing.

Fixes "You're already in a call with this person" bug with virtual
rooms.
2021-06-15 16:27:18 +01:00
RiotRobot 2eb7d35ea1 v3.24.0-rc.1 2021-06-15 16:22:34 +01:00
RiotRobot cdb9d3a41b Prepare changelog for v3.24.0-rc.1 2021-06-15 16:22:33 +01:00
RiotRobot b3912dc5b8 Upgrade matrix-js-sdk to 12.0.0-rc.1 2021-06-15 16:16:42 +01:00
J. Ryan Stinnett 416563d919
Merge pull request #6192 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-06-15 15:42:30 +01:00
Weblate 12f8e5b278 Merge branch 'origin/develop' into Weblate. 2021-06-15 14:40:39 +00:00
Besnik Bleta 6d56c9eab4 Translated using Weblate (Albanian)
Currently translated at 99.7% (2972 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-06-15 14:40:33 +00:00
m4sk1n 24bdcf48a9 Translated using Weblate (Polish)
Currently translated at 73.2% (2181 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
2021-06-15 14:40:31 +00:00
Victor Grousset 6adbc90127 Translated using Weblate (Esperanto)
Currently translated at 99.9% (2978 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
2021-06-15 14:40:17 +00:00
lvre 5509fe455e Translated using Weblate (Portuguese (Brazil))
Currently translated at 94.0% (2803 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2021-06-15 14:40:16 +00:00