Commit Graph
13825 Commits
Author SHA1 Message Date
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
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
Michael TelatynskiandGitHub 6b4f63df2a Merge pull request #6184 from matrix-org/t3chguy/rs/5566 2021-06-14 23:27:51 +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 TelatynskiandGitHub 91df392a2a Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01: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
Šimon Brandner e260e8671f Inline display name into return
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-11 15:14:16 +02:00
Germain Souquet b1824ce579 fix HTML tag for Event Tile when not rendered in a list 2021-06-11 11:34:53 +01:00
GermainandGitHub 88e337b89c Merge pull request #5929 from matrix-org/gsouquet-e2ee-warning 2021-06-10 14:58:31 +01:00
79b8fbc2a9 Add indentation for unencrypted warning text
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-06-10 14:21:48 +01:00
GermainandGitHub 0a6cd6a758 Merge pull request #6171 from matrix-org/gsouquet/fix-17505
Fix expanding last collapsed sticky session when zoomed in
2021-06-10 12:44:57 +01:00
Germain Souquet 9731e275f8 cater for an undefined MatrixClient on rooms 2021-06-10 12:15:55 +01:00
Germain Souquet 6606a1142d Update unencrypted room warning copy 2021-06-10 11:29:10 +01:00
Germain Souquet 7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Germain Souquet 4f649f290c Migrate RoomSettingsDialog to TypeScript 2021-06-10 10:46:54 +01:00
Germain Souquet c2d1eb3e8e Merge branch 'develop' into gsouquet-e2ee-warning 2021-06-10 10:25:20 +01:00
Germain Souquet b4cb275ca1 Fix expanding last collapsed sticky session when zoomed in 2021-06-09 17:59:41 +01:00
GermainandGitHub 91a88f25a8 Merge pull request #6168 from matrix-org/gsouquet/fix-17586
Revert refreshStickyHeaders optimisations
2021-06-09 16:34:11 +01:00
J. Ryan StinnettandGitHub 9aaf506ad5 Merge pull request #6169 from matrix-org/jryans/rebuild-the-sky
Restore read receipt animation from event to event
2021-06-09 16:16:17 +01:00
J. Ryan Stinnett c6972c4535 Fix spelling 2021-06-09 15:53:38 +01:00
J. Ryan Stinnett e566704bdf Remove redundant early return 2021-06-09 15:48:30 +01:00
J. Ryan Stinnett b43315c6c1 Restore read receipt animation from event to event
This restores expected read receipt animation by always including the positioned
parent of read receipts. I imagine there's something smarter we could be doing,
but for now, at least least get back to expected behaviour.

Fixes https://github.com/vector-im/element-web/issues/17561
2021-06-09 15:46:10 +01:00
Germain Souquet 927de02a8e Revert refreshStickyHeaders optimisations 2021-06-09 14:59:55 +01:00
Germain Souquet ceed6ecbe8 Restore Page Up/Down key bindings when focusing the composer 2021-06-09 14:03:31 +01:00
GermainandGitHub 8334a2ba60 Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Michael TelatynskiandGitHub 2938bfbadf Merge pull request #6162 from matrix-org/t3chguy/fix/17596
Fix upgrade to element home button in top left menu
2021-06-08 17:48:45 +01:00
Michael Telatynski 90982f9b3f Fix upgrade to element home button in top left menu 2021-06-08 17:31:08 +01:00
Michael Telatynski f34a2e61bc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-06-08 16:54:49 +01:00
Michael TelatynskiandGitHub 34cc494a8e Merge pull request #6140 from matrix-org/t3chguy/fix/17553 2021-06-08 16:45:35 +01:00
Michael Telatynski 93eb9feaa7 iterate PR based on feedback 2021-06-08 16:42:58 +01:00
Michael Telatynski f84ee22769 Add comment 2021-06-08 16:36:53 +01:00
David BakerandGitHub 399be4fa5d Merge pull request #6161 from matrix-org/dbkr/widget_load_error
Better handling for widgets that fail to load
2021-06-08 16:28:44 +01:00
David Baker 90a58380fd Make it translateable
And also the other one that I copied from
2021-06-08 16:15:20 +01:00
Šimon Brandner bf77a4a2ab Merge remote-tracking branch 'upstream/develop' into show-username 2021-06-08 17:14:42 +02:00
David Baker 26a030abcd Better handling for widgets that fail to load 2021-06-08 12:40:38 +01:00
Robin Townsend b00ad63a35 Fix whitespace nitpick
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:16:00 -04:00
Robin Townsend a8dab04d5e Remove mystery dot from forward dialog preview
It was a bullet point, since EventTiles now get created as li by default
:P

Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:10:45 -04:00
Robin Townsend b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael TelatynskiandGitHub ced6c43147 Merge pull request #6152 from matrix-org/t3chguy/fix/17571
Fix Stickerpicker context menu
2021-06-07 22:21:19 +01:00
Michael TelatynskiandGitHub 801b5f9c1a Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning
Add warning to private space creation flow
2021-06-07 22:21:07 +01:00
Šimon Brandner b39c615abc Reorder
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:44:58 +02:00
Šimon Brandner 4185185cdc Reduce number of DOM elements
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:42:48 +02:00
Šimon Brandner 025148d9fc Merge branch 'develop' into show-username
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
Germain Souquet 187a367111 Add prop to alwaysShowTimestamps on TimelinePanel 2021-06-07 17:11:14 +01:00
Michael TelatynskiandGitHub 6d80cd5913 Merge pull request #6149 from SimonBrandner/fix/jumps-image-view 2021-06-07 15:19:45 +01:00
Šimon Brandner 20a3dd67d6 Some more styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 16:12:06 +02:00