98e0200b4a
Function name
2021-06-17 14:21:50 -06:00
a687391b98
Switch order
2021-06-17 14:21:01 -06:00
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
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
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username
2021-06-14 21:34:01 +01:00
951fbf4a1a
fix import
2021-06-14 13:38:43 -06:00
2eafe132b8
Move various createRoom types to the js-sdk
2021-06-14 13:31:58 -06:00
e260e8671f
Inline display name into return
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-11 15:14:16 +02:00
b1824ce579
fix HTML tag for Event Tile when not rendered in a list
2021-06-11 11:34:53 +01:00
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
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
9731e275f8
cater for an undefined MatrixClient on rooms
2021-06-10 12:15:55 +01:00
6606a1142d
Update unencrypted room warning copy
2021-06-10 11:29:10 +01:00
7f3173f170
Implement unencrypted warning slate in rooms
2021-06-10 11:14:43 +01:00
4f649f290c
Migrate RoomSettingsDialog to TypeScript
2021-06-10 10:46:54 +01:00
c2d1eb3e8e
Merge branch 'develop' into gsouquet-e2ee-warning
2021-06-10 10:25:20 +01:00
b4cb275ca1
Fix expanding last collapsed sticky session when zoomed in
2021-06-09 17:59:41 +01:00
91a88f25a8
Merge pull request #6168 from matrix-org/gsouquet/fix-17586
...
Revert refreshStickyHeaders optimisations
2021-06-09 16:34:11 +01:00
c6972c4535
Fix spelling
2021-06-09 15:53:38 +01:00
e566704bdf
Remove redundant early return
2021-06-09 15:48:30 +01:00
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
927de02a8e
Revert refreshStickyHeaders optimisations
2021-06-09 14:59:55 +01:00
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
f34a2e61bc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
2021-06-08 16:54:49 +01:00
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553
2021-06-08 16:45:35 +01:00
93eb9feaa7
iterate PR based on feedback
2021-06-08 16:42:58 +01:00
f84ee22769
Add comment
2021-06-08 16:36:53 +01:00
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
90a58380fd
Make it translateable
...
And also the other one that I copied from
2021-06-08 16:15:20 +01:00
bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username
2021-06-08 17:14:42 +02:00
26a030abcd
Better handling for widgets that fail to load
2021-06-08 12:40:38 +01:00
b00ad63a35
Fix whitespace nitpick
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-06-07 19:16:00 -04:00
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
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571
...
Fix Stickerpicker context menu
2021-06-07 22:21:19 +01:00
b39c615abc
Reorder
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-07 19:44:58 +02:00
4185185cdc
Reduce number of DOM elements
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-07 19:42:48 +02:00
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
6d80cd5913
Merge pull request #6149 from SimonBrandner/fix/jumps-image-view
2021-06-07 15:19:45 +01:00
20a3dd67d6
Some more styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-07 16:12:06 +02:00
255f996710
landscape -> imageIsNotFlipped
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-07 15:46:03 +02:00
b5d271759f
Why would I format this myself if eslint can do it for me?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-07 15:43:43 +02:00
2e47a1176f
Get rid of weird rotation prop
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-07 15:39:11 +02:00
0918ebad0a
calculateZoomAndRotate -> setZoomAndRotation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-07 15:28:37 +02:00
5880cb3b5f
Better wording
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-07 15:26:54 +02:00
67c9fe1e07
Revert "Update curly braces styling"
...
This reverts commit ba0f6766ca
2021-06-07 15:25:57 +02:00
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps
2021-06-07 13:12:11 +01:00
b60feab7d2
Merge pull request #6147 from robintown/easier-image-panning
2021-06-07 12:47:43 +01:00
a3a6f3fa31
Merge pull request #6154 from matrix-org/gsouquet/fix-files-scroll-token
2021-06-07 12:44:59 +01:00
Travis Ralston