Robin Townsend
2750d64495
Merge branch 'develop' into event-tile-preview-fixes
2021-06-16 18:27:10 -04:00
Robin Townsend
79bf7bee56
Fix EventTilePreview display names
...
Because of 91df392a2a
, we now need to
additionally set rawDisplayName to properly fake our display name for an
event.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 18:23:44 -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
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
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
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
Balázs Meskó
7bc305f0d4
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2979 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-06-15 14:40:13 +00:00
Germain Souquet
adc4bd14c0
Disable comment-on-alert
2021-06-15 15:19:47 +01:00
Germain
520763a045
Merge pull request #6189 from matrix-org/gsouquet/disable-comments-on-forks
...
Disable comment-on-alert for PR coming from a fork
2021-06-15 15:06:30 +01:00
Germain Souquet
8dbc5bddc0
Disable comment-on-alert for PR coming from a fork
2021-06-15 14:47:45 +01:00
Germain
bef20dde48
Merge pull request #6177 from matrix-org/gsouquet/benchmark-tracking
2021-06-15 14:17:59 +01:00
Germain
3eca1cbec3
Merge pull request #6187 from matrix-org/gsouquet/update-react-test-utils
...
Upgrade matrix-react-test-utils for React 17 peer deps
2021-06-15 12:45:09 +01:00
Germain Souquet
4a23ebae1e
upgrade matrix-react-test-utils for react 17 peer deps
2021-06-15 12:00:44 +01:00
Germain Souquet
7310d35d7f
Merge branch 'develop' into gsouquet/benchmark-tracking
2021-06-15 11:45:11 +01:00
Germain Souquet
011a2f2bb6
Remove test data for develop pipeline
2021-06-15 10:59:57 +01:00
Germain Souquet
d5f7f524e1
Slow down registration process
2021-06-15 10:24:07 +01:00
Germain Souquet
2b2e83b9e7
Fix github token
2021-06-15 10:10:22 +01:00
Germain Souquet
55a9915c55
Upgrade github-action-benchmark
2021-06-15 10:01:05 +01:00
Germain Souquet
6f6a128587
try auto push
2021-06-15 09:27:44 +01:00
Germain Souquet
646416c8ec
try deployment to gh-pages
2021-06-15 08:59:51 +01:00
Michael Telatynski
419baebde9
Merge pull request #6186 from SimonBrandner/fix/irc-layout-display-name/17645
...
Fix display name overlaps on the IRC layout
2021-06-15 08:10:38 +01:00
Šimon Brandner
d08495bde6
Fix display name overlap
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-15 06:30:22 +02:00
Michael Telatynski
6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566
2021-06-14 23:27:51 +01:00
Michael Telatynski
2fd8cc414c
Merge pull request #6111 from matrix-org/t3chguy/fix/17365
2021-06-14 22:57:14 +01:00
Michael Telatynski
539465ecb4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
Michael Telatynski
430ec8cecd
Clear selected rooms after operation in manage space rooms
2021-06-14 22:18:18 +01:00
Michael Telatynski
f8eea2ae23
Fix word wrap in space descriptions
2021-06-14 22:18:02 +01:00
Michael Telatynski
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username
2021-06-14 21:34:01 +01:00
Travis Ralston
d4c039a332
Merge pull request #6183 from matrix-org/travis/fix-types
...
Move various createRoom types to the js-sdk
2021-06-14 13:51:37 -06:00
Travis Ralston
951fbf4a1a
fix import
2021-06-14 13:38:43 -06:00
Travis Ralston
2eafe132b8
Move various createRoom types to the js-sdk
2021-06-14 13:31:58 -06:00