Commit graph

33262 commits

Author SHA1 Message Date
Michael Telatynski
a9d0699488
Merge pull request #6062 from matrix-org/t3chguy/fix/17280
Show DMs in space for invited members too, to match Android impl
2021-05-19 12:41:46 +01:00
Michael Telatynski
88d3706c04 mock getMembers on mkStubRoom 2021-05-19 12:34:27 +01:00
Michael Telatynski
f985918859
Merge pull request #6057 from matrix-org/t3chguy/fix/17350
Support filtering by alias in add existing to space dialog
2021-05-19 12:29:00 +01:00
Michael Telatynski
bde95e313d
Merge pull request #6064 from matrix-org/t3chguy/fix/rs5084
Fix issue when a room without a name or alias is marked as suggested
2021-05-19 12:28:41 +01:00
Michael Telatynski
9b01e1575d
Merge pull request #6055 from matrix-org/t3chguy/fix/17332
Fix space room hierarchy not updating when removing a room
2021-05-19 12:28:11 +01:00
J. Ryan Stinnett
d597781919
Merge pull request #6060 from matrix-org/revert-6024-travis/roomlist-corruption
Revert "Try putting room list handling behind a lock"
2021-05-19 12:25:44 +01:00
Michael Telatynski
78a8c9e10e Fix issue when a room without a name or alias is marked as suggested 2021-05-19 10:46:11 +01:00
Germain
f7d0afcd28
Performance monitoring measurements (#6041) 2021-05-19 10:07:02 +01:00
Michael Telatynski
e18120f412 Show DMs in space for invited members too, to match Android impl 2021-05-19 08:55:56 +01:00
Travis Ralston
ec7c1ab9f0
Revert "Try putting room list handling behind a lock" 2021-05-18 15:40:09 -06:00
Germain
cf384c2a54
Merge pull request #6052 from matrix-org/gsouquet/decrypt-relations 2021-05-18 17:21:13 +01:00
J. Ryan Stinnett
69920c6c91
Merge pull request #6059 from matrix-org/jryans/log-lang-errors
Add error detail when languges fail to load
2021-05-18 17:00:25 +01:00
J. Ryan Stinnett
fc6ff86173 Add error detail when languges fail to load
This will at least log the path that's failing with status code, so we can
better confirm the issue.

Related to https://github.com/vector-im/element-web/issues/9422
2021-05-18 16:34:01 +01:00
Germain Souquet
0e221ae548 Start decryption process if needed 2021-05-18 16:24:38 +01:00
Germain Souquet
454df8947b Add mock for new client method 2021-05-18 13:46:47 +01:00
Michael Telatynski
edb2026780 Support any alias not just first 2021-05-18 13:31:53 +01:00
Michael Telatynski
655010844a Switch to using QueryMatcher for add existing to space dialog
This helps it support filtering by alias
2021-05-18 13:27:34 +01:00
Germain Souquet
f9f10de0da use renamed decrypt event method 2021-05-18 13:01:38 +01:00
Michael Telatynski
367ad1583d
Merge pull request #6053 from matrix-org/t3chguy/fix/17338
Add space invaders chat effect
2021-05-18 12:14:40 +01:00
Michael Telatynski
177adb9684 fix copy-pasta 2021-05-18 11:58:15 +01:00
Michael Telatynski
16b60d1524
Merge pull request #6051 from matrix-org/t3chguy/fix/17313
Create SpaceProvider and hide Spaces from the RoomProvider autocompleter
2021-05-18 11:55:20 +01:00
Michael Telatynski
2732280923 Fix space room hierarchy not updating when removing a room 2021-05-18 11:54:45 +01:00
Germain Souquet
1cfd4b6e1a Use client.decryptEvent to avoid accessing js-sdk private members 2021-05-18 11:41:20 +01:00
J. Ryan Stinnett
b6d9c4e6ad
Merge pull request #6049 from aaronraimist/redacted-unread
Don't mark a room as unread when redacted event is present
2021-05-18 11:00:42 +01:00
Michael Telatynski
b5a612cd0f Add space invaders chat effect 2021-05-18 10:29:10 +01:00
Michael Telatynski
afd9843722 Fix broken string interpolation in chat effects warning 2021-05-18 10:28:37 +01:00
Michael Telatynski
1166e76928 Extract and deduplicate chat effect interfaces 2021-05-18 10:28:15 +01:00
Germain Souquet
871c48f69b stop assuming that decryption happens ahead of time 2021-05-18 10:02:21 +01:00
Michael Telatynski
f87f0704b9 i18n 2021-05-18 09:42:35 +01:00
Michael Telatynski
19a94d55bd Create SpaceProvider and hide Spaces from the RoomProvider autocompleter 2021-05-18 09:39:01 +01:00
Aaron Raimist
3a2c1af70c
Don't mark a room as unread when redacted event is present
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-05-18 00:01:11 -05:00
Travis Ralston
4929e3f3ed
Merge pull request #6023 from matrix-org/travis/msc2873
Add support for MSC2873: Client information for Widgets
2021-05-17 16:36:00 -06:00
Travis Ralston
7cdca77f39 Update widget-api 2021-05-17 16:27:48 -06:00
Travis Ralston
6ccb0d487a Merge branch 'develop' into travis/msc2873 2021-05-17 16:27:20 -06:00
Travis Ralston
3308368ac6
Merge pull request #5960 from matrix-org/travis/msc2876
Support UI for MSC2762: Widgets reading events from rooms
2021-05-17 16:26:53 -06:00
Michael Telatynski
9182bff86e
Merge pull request #6047 from robintown/fix-notification-panel
Fix crash on opening notification panel
2021-05-17 17:46:50 +01:00
Robin Townsend
d3f1754dfd Fix crash on opening notification panel
The check for pending edits needed a null guard, since the notification
panel uses MessagePanel but is not associated with a specific room.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-17 12:24:41 -04:00
Germain
f67ba57da5
Merge pull request #6046 from matrix-org/gsouquet/sync-perf 2021-05-17 15:16:50 +01:00
Germain Souquet
7e846b8532 remove unused import 2021-05-17 15:05:20 +01:00
Germain Souquet
c67f31144f remove custom LoggedInView::shouldComponentUpdate logic 2021-05-17 14:45:41 +01:00
RiotRobot
12a9ce1a94 Reset matrix-js-sdk back to develop branch 2021-05-17 13:50:34 +01:00
RiotRobot
9d46fa7b99 Resetting package fields for development 2021-05-17 13:50:24 +01:00
RiotRobot
f5a6864ca9 Merge branch 'master' into develop 2021-05-17 13:50:23 +01:00
RiotRobot
3673292c34 v3.21.0 2021-05-17 13:49:00 +01:00
RiotRobot
6b884a50dc Prepare changelog for v3.21.0 2021-05-17 13:48:59 +01:00
RiotRobot
6c066ee401 Upgrade matrix-js-sdk to 11.0.0 2021-05-17 13:33:45 +01:00
Michael Telatynski
6d06326bce
Merge pull request #6045 from matrix-org/t3chguy/fix/17318
Fix edge cases with the new add reactions prompt button
2021-05-17 11:44:55 +01:00
Michael Telatynski
6e5847ea6b Fix right clicking on add reactions prompt button behaviour 2021-05-17 10:01:56 +01:00
Michael Telatynski
a22a1918e1 Fix add reactions prompt button showing up even if all reactions have been removed 2021-05-17 10:01:43 +01:00
Michael Telatynski
f0a0d7f998 Fix add reactions prompt button jumping timeline if font set lower than default 2021-05-17 10:01:24 +01:00